Generate all projects if ommited

+ Add spreadsheet test

Apple/IWork.cpp

@@ -1,141 +0,0 @@
-#include "IWork.h"
-#include "../DesktopEditor/common/File.h"
-#include "../DesktopEditor/common/Directory.h"
-
-#include <libetonyek/libetonyek.h>
-#include <libodfgen/OdtGenerator.hxx>
-#include <libodfgen/OdsGenerator.hxx>
-#include <libodfgen/OdpGenerator.hxx>
-#include <libodfgen/test/StringDocumentHandler.hxx>
-
-#include <memory>
-#include <fstream>
-
-class CIWorkFile_Private
-{
-public:
-	std::wstring m_sTempDirectory;
-
-public:
-	CIWorkFile_Private()
-	{
-	}
-	~CIWorkFile_Private()
-	{
-	}
-};
-
-CIWorkFile::CIWorkFile()
-{
-	m_internal = new CIWorkFile_Private();
-}
-
-CIWorkFile::~CIWorkFile()
-{
-	delete m_internal;
-}
-
-#if !defined(_WIN32) && !defined(_WIN64)
-	#define DATA_TYPE_INPUTFILE std::string
-#else
-	#define DATA_TYPE_INPUTFILE std::wstring
-#endif
-
-bool GetRVNGInputStream(const DATA_TYPE_INPUTFILE& sFile, std::shared_ptr<librevenge::RVNGInputStream>& oRVNGInputStream, libetonyek::EtonyekDocument::Type& oDocumentType)
-{
-	oRVNGInputStream.reset(new librevenge::RVNGFileStream(sFile.c_str()));
-
-	oDocumentType = libetonyek::EtonyekDocument::TYPE_UNKNOWN;
-	const libetonyek::EtonyekDocument::Confidence confidence = libetonyek::EtonyekDocument::isSupported(oRVNGInputStream.get(), &oDocumentType);
-
-	return libetonyek::EtonyekDocument::CONFIDENCE_NONE != confidence;
-}
-
-IWorkFileType CIWorkFile::GetType(const std::wstring& sFile) const
-{
-	//TODO:: так как на данный момент мы работает только напрямую с файлом, то работа с директорией нам пока не нужна
-	if (NSDirectory::PathIsDirectory(sFile))
-		return IWorkFileType::None;
-
-	std::shared_ptr<librevenge::RVNGInputStream> input;
-	libetonyek::EtonyekDocument::Type oDocumentType;
-
-	#if !defined(_WIN32) && !defined(_WIN64)
-	std::string sFileA = U_TO_UTF8(sFile);
-	if (!GetRVNGInputStream(sFileA, input, oDocumentType))
-		return IWorkFileType::None;
-	#else
-	if (!GetRVNGInputStream(sFile, input, oDocumentType))
-		return IWorkFileType::None;
-	#endif
-
-	switch (oDocumentType)
-	{
-	case libetonyek::EtonyekDocument::TYPE_PAGES:
-		return IWorkFileType::Pages;
-	case libetonyek::EtonyekDocument::TYPE_NUMBERS:
-		return IWorkFileType::Numbers;
-	case libetonyek::EtonyekDocument::TYPE_KEYNOTE:
-		return IWorkFileType::Keynote;
-	default:
-		break;
-	}
-
-	return IWorkFileType::None;
-}
-
-template<class Generator>
-int Convert(const std::wstring& wsOutputFile, std::shared_ptr<librevenge::RVNGInputStream>& ptrInput, const std::wstring& wsPassword = L"", const std::wstring& wsTempDirectory = L"")
-{
-	StringDocumentHandler content;
-	Generator generator;
-	generator.addDocumentHandler(&content, ODF_FLAT_XML);
-
-	bool bRes = libetonyek::EtonyekDocument::parse(ptrInput.get(), &generator);
-	if (!bRes)
-		return 1;
-
-	const std::string sOutputFileA = U_TO_UTF8(wsOutputFile);
-	std::ofstream output(sOutputFileA.c_str());
-	output << content.cstr();
-
-	if (output.bad())
-		return -1;
-
-	return 0;
-}
-
-int CIWorkFile::Convert2Odf(const std::wstring& sFile, const std::wstring& sOutputFile) const
-{
-	//TODO:: так как на данный момент мы работает только напрямую с файлом, то работа с директорией нам пока не нужна
-	if (NSDirectory::PathIsDirectory(sFile))
-		return -1;
-
-	std::shared_ptr<librevenge::RVNGInputStream> input;
-	libetonyek::EtonyekDocument::Type oDocumentType;
-
-	#if !defined(_WIN32) && !defined(_WIN64)
-		std::string sFileA = U_TO_UTF8(sFile);
-		if (!GetRVNGInputStream(sFileA, input, oDocumentType))
-			return -1;
-	#else
-		if (!GetRVNGInputStream(sFile, input, oDocumentType))
-			return -1;
-	#endif
-
-	switch (oDocumentType)
-	{
-	case libetonyek::EtonyekDocument::TYPE_PAGES:   return Convert<OdtGenerator>(sOutputFile, input);
-	case libetonyek::EtonyekDocument::TYPE_NUMBERS: return Convert<OdsGenerator>(sOutputFile, input);
-	case libetonyek::EtonyekDocument::TYPE_KEYNOTE: return Convert<OdpGenerator>(sOutputFile, input);
-	default:
-		break;
-	}
-
-	return -1;
-}
-
-void CIWorkFile::SetTmpDirectory(const std::wstring& sFolder)
-{
-	m_internal->m_sTempDirectory = sFolder;
-}

Apple/IWork.h

@@ -1,36 +0,0 @@
-#ifndef _IWORKFILE_IWORKFILE_H
-#define _IWORKFILE_IWORKFILE_H
-
-#include <string>
-
-#ifndef IWORK_USE_DYNAMIC_LIBRARY
-#define IWORK_FILE_DECL_EXPORT
-#else
-#include "../DesktopEditor/common/base_export.h"
-#define IWORK_FILE_DECL_EXPORT Q_DECL_EXPORT
-#endif
-
-enum class IWorkFileType
-{
-	Pages   = 0,
-	Numbers = 1,
-	Keynote = 2,
-
-	None    = 255
-};
-
-class CIWorkFile_Private;
-class IWORK_FILE_DECL_EXPORT CIWorkFile
-{
-private:
-	CIWorkFile_Private* m_internal;
-public:
-	CIWorkFile();
-	~CIWorkFile();
-
-	IWorkFileType GetType(const std::wstring& sFile) const;
-	int Convert2Odf(const std::wstring& sFile, const std::wstring& sOutputFile) const;
-	void SetTmpDirectory(const std::wstring& sFolder);
-};
-
-#endif // _IWORKFILE_IWORKFILE_H

Apple/IWork.pro

@@ -1,46 +0,0 @@
-QT -= core
-QT -= gui
-
-VERSION = 0.0.0.1
-TARGET = IWorkFile
-TEMPLATE = lib
-
-CONFIG += shared
-CONFIG += plugin
-
-DEFINES += IWORK_USE_DYNAMIC_LIBRARY
-
-CORE_ROOT_DIR = $$PWD/..
-PWD_ROOT_DIR = $$PWD
-include($$CORE_ROOT_DIR/Common/base.pri)
-
-ADD_DEPENDENCY(kernel, UnicodeConverter)
-
-INCLUDEPATH += \
-	$$PWD
-
-core_android:DEFINES += NOT_USE_PTHREAD_CANCEL USE_FILE32API
-
-# BOOST
-CONFIG += core_boost_regex
-include($$CORE_ROOT_DIR/Common/3dParty/boost/boost.pri)
-
-# ZLIB
-CONFIG += build_all_zlib build_zlib_as_sources
-include($$PWD/../OfficeUtils/OfficeUtils.pri)
-
-# LIBXML
-CONFIG += core_static_link_xml_full
-CONFIG += core_only_libxml
-include($$PWD/../DesktopEditor/xml/build/qt/libxml2.pri)
-
-#
-include($$CORE_ROOT_DIR/Common/3dParty/apple/apple.pri)
-
-# TEST
-HEADERS += $$ODF_LIB_ROOT/test/StringDocumentHandler.h
-SOURCES += $$ODF_LIB_ROOT/test/StringDocumentHandler.cxx
-
-SOURCES += IWork.cpp
-
-HEADERS += IWork.h

Apple/test/main.cpp

@@ -1,45 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2023
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
- * street, Riga, Latvia, EU, LV-1050.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-
-#include "../IWork.h"
-#include "../../DesktopEditor/common/File.h"
-
-int main(int argc, char *argv[])
-{
-	CIWorkFile oFile;
-
-	std::wstring sExamplesDir = NSFile::GetProcessDirectory() + L"/../examples";
-	oFile.Convert2Odf(sExamplesDir + L"/new.pages", sExamplesDir + L"/out_new.odt");
-	oFile.Convert2Odf(sExamplesDir + L"/old.pages", sExamplesDir + L"/out_old.odt");
-
-	return 0;
-}

Apple/test/test.pro

@@ -1,20 +0,0 @@
-CONFIG -= qt
-QT -= core gui
-
-TARGET = test
-CONFIG   += console
-CONFIG   -= app_bundle
-TEMPLATE = app
-
-CORE_ROOT_DIR = $$PWD/../..
-PWD_ROOT_DIR = $$PWD
-include($$CORE_ROOT_DIR/Common/base.pri)
-
-ADD_DEPENDENCY(UnicodeConverter, kernel, IWorkFile)
-
-core_linux:include($$PWD/../../Common/3dParty/icu/icu.pri)
-core_windows:LIBS += -lgdi32 -ladvapi32 -luser32 -lshell32
-
-SOURCES += main.cpp
-
-DESTDIR = $$PWD/build

Common/3dParty/apple/.gitignore

@@ -1,8 +0,0 @@
-# Ignore everything in this directory
-glm
-mdds
-librevenge
-libodfgen
-libetonyek
-# Except this file
-!.gitignore

Common/3dParty/apple/apple.pri

@@ -1,36 +0,0 @@
-INCLUDEPATH += $$PWD
-
-# LIBREVENGE
-REVENGE_LIB_ROOT = $$PWD/librevenge
-
-INCLUDEPATH += \
-	$$REVENGE_LIB_ROOT/inc
-
-HEADERS += $$files($$REVENGE_LIB_ROOT/inc/*.h, true)
-HEADERS += $$files($$REVENGE_LIB_ROOT/src/lib/*.h, true)
-SOURCES += $$files($$REVENGE_LIB_ROOT/src/lib/*.cpp, true)
-
-# LIBODFGEN
-ODF_LIB_ROOT = $$PWD/libodfgen
-
-INCLUDEPATH += \
-	$$ODF_LIB_ROOT/inc
-
-HEADERS += $$files($$ODF_LIB_ROOT/inc/libodfgen/*.hxx, true)
-HEADERS += $$files($$ODF_LIB_ROOT/src/*.hxx, true)
-SOURCES += $$files($$ODF_LIB_ROOT/src/*.cxx, true)
-
-# LIBETONYEK
-ETONYEK_LIB_ROOT = $$PWD/libetonyek
-
-INCLUDEPATH += \
-	$$ETONYEK_LIB_ROOT/inc \
-	$$ETONYEK_LIB_ROOT/src/lib \
-	$$ETONYEK_LIB_ROOT/src/lib/contexts \
-	$$PWD/mdds/include \
-	$$PWD/glm
-
-HEADERS += $$files($$ETONYEK_LIB_ROOT/inc/libetonyek/*.h, true)
-HEADERS += $$files($$ETONYEK_LIB_ROOT/src/lib/*.h, true)
-SOURCES += $$files($$ETONYEK_LIB_ROOT/src/lib/*.cpp, true)
-

Common/3dParty/apple/fetch.py

@@ -1,121 +0,0 @@
-import sys
-sys.path.append('../../../../build_tools/scripts')
-import base
-import os
-
-if not base.is_dir("glm"):
-    base.cmd("git", ["clone", "https://github.com/g-truc/glm.git"])
-    base.cmd_in_dir("glm", "git", ["checkout", "33b4a621a697a305bc3a7610d290677b96beb181", "--quiet"])
-
-if not base.is_dir("mdds"):
-    base.cmd("git", ["clone", "https://github.com/kohei-us/mdds.git"])
-    base.cmd_in_dir("mdds", "git", ["checkout", "0783158939c6ce4b0b1b89e345ab983ccb0f0ad0"], "--quiet")
-
-    fix_cpp_version  = "#if __cplusplus < 201402L\n"
-    fix_cpp_version += "#ifndef _MSC_VER\n"
-    fix_cpp_version += "namespace std {\n"
-    fix_cpp_version += "  template<bool __v>\n"
-    fix_cpp_version += "  using bool_constant = integral_constant<bool, __v>;\n\n"
-    fix_cpp_version += "  template <class... _Types>\n"
-    fix_cpp_version += "  using void_t = void;\n"
-    fix_cpp_version += "}\n#endif\n"
-    fix_cpp_version += "#endif\n\n"
-    fix_cpp_version += "namespace mdds {"
-
-    base.replaceInFile("./mdds/include/mdds/global.hpp", "namespace mdds {", fix_cpp_version)
-
-if not base.is_dir("librevenge"):
-    base.cmd("git", ["clone", "https://github.com/Distrotech/librevenge.git"])
-    base.cmd_in_dir("librevenge", "git", ["checkout", "becd044b519ab83893ad6398e3cbb499a7f0aaf4", "--quiet"])
-
-    stat_windows = ""
-    stat_windows += "#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG)\n"
-    stat_windows += "#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)\n"
-    stat_windows += "#endif\n"
-    stat_windows += "#if !defined(S_ISDIR) && defined(S_IFMT) && defined(S_IFDIR)\n"
-    stat_windows += "#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)\n"
-    stat_windows += "#endif\n"
-
-    base.replaceInFile("./librevenge/src/lib/RVNGDirectoryStream.cpp", "#include <librevenge-stream/librevenge-stream.h>", 
-                       "#include <librevenge-stream/librevenge-stream.h>\n\n" + stat_windows)
-
-    fix_RVNG_H  = "explicit RVNGFileStream(const char *filename);\n"
-    fix_RVNG_H += "	#if defined(_WIN32) || defined(_WIN64)\n"
-    fix_RVNG_H += "	explicit RVNGFileStream(const wchar_t *filename);\n"
-    fix_RVNG_H += "	#endif\n"
-
-    base.replaceInFile("./librevenge/inc/librevenge-stream/RVNGStreamImplementation.h", "explicit RVNGFileStream(const char *filename);", fix_RVNG_H)
-    
-    fix_RVNG_CPP_include  = "#if defined(_WIN32) || defined(_WIN64)\n"
-    fix_RVNG_CPP_include += "#include <sys/stat.h>\n\n"
-    fix_RVNG_CPP_include += "static __inline int wstat(wchar_t const* const _FileName, struct stat* const _Stat)\n"
-    fix_RVNG_CPP_include += "{\n"
-    fix_RVNG_CPP_include += "	_STATIC_ASSERT(sizeof(struct stat) == sizeof(struct _stat64i32));\n";
-    fix_RVNG_CPP_include += "	return _wstat64i32(_FileName, (struct _stat64i32*)_Stat);\n";
-    fix_RVNG_CPP_include += "}\n"
-    fix_RVNG_CPP_include += "#endif\n\n"
-    fix_RVNG_CPP_include += "namespace librevenge"
-
-    base.replaceInFile("./librevenge/src/lib/RVNGStreamImplementation.cpp", "namespace librevenge", fix_RVNG_CPP_include)
-
-    fix_RVNG_CPP  = "#if defined(_WIN32) || defined(_WIN64)\n"
-    fix_RVNG_CPP += "RVNGFileStream::RVNGFileStream(const wchar_t *filename) :\n"
-    fix_RVNG_CPP += "	RVNGInputStream(),\n"
-    fix_RVNG_CPP += "	d(new RVNGFileStreamPrivate())\n"
-    fix_RVNG_CPP += "{\n"
-    fix_RVNG_CPP += "	d->file = _wfopen(filename, L\"rb\");\n"
-    fix_RVNG_CPP += "	if (!d->file || ferror(d->file))\n"
-    fix_RVNG_CPP += "	{\n"
-    fix_RVNG_CPP += "		delete d;\n"
-    fix_RVNG_CPP += "		d = 0;\n"
-    fix_RVNG_CPP += "		return;\n"
-    fix_RVNG_CPP += "	}\n\n"
-    fix_RVNG_CPP += "	struct stat status;\n"
-    fix_RVNG_CPP += "	const int retval = wstat(filename, &status);\n"
-    fix_RVNG_CPP += "	if ((0 != retval) || !S_ISREG(status.st_mode))\n"
-    fix_RVNG_CPP += "	{\n"
-    fix_RVNG_CPP += "		delete d;\n"
-    fix_RVNG_CPP += "		d = 0;\n"
-    fix_RVNG_CPP += "		return;\n"
-    fix_RVNG_CPP += "	}\n\n"
-    fix_RVNG_CPP += "	fseek(d->file, 0, SEEK_END);\n\n"
-    fix_RVNG_CPP += "	d->streamSize = (unsigned long) ftell(d->file);\n"
-    fix_RVNG_CPP += "	if (d->streamSize == (unsigned long)-1)\n"
-    fix_RVNG_CPP += "		d->streamSize = 0;\n"
-    fix_RVNG_CPP += "	if (d->streamSize > (std::numeric_limits<unsigned long>::max)() / 2)\n"
-    fix_RVNG_CPP += "		d->streamSize = (std::numeric_limits<unsigned long>::max)() / 2;\n"
-    fix_RVNG_CPP += "	fseek(d->file, 0, SEEK_SET);\n"
-    fix_RVNG_CPP += "}\n"
-    fix_RVNG_CPP += "#endif\n\n"
-    fix_RVNG_CPP += "RVNGFileStream::~RVNGFileStream()"
-    
-    base.replaceInFile("./librevenge/src/lib/RVNGStreamImplementation.cpp", "RVNGFileStream::~RVNGFileStream()", fix_RVNG_CPP)
-
-if not base.is_dir("libodfgen"):
-    base.cmd("git", ["clone", "https://github.com/Distrotech/libodfgen.git"])
-    base.cmd_in_dir("libodfgen", "git", ["checkout", "8ef8c171ebe3c5daebdce80ee422cf7bb96aa3bc", "--quiet"])
-
-if not base.is_dir("libetonyek"):
-    base.cmd("git", ["clone", "https://github.com/LibreOffice/libetonyek.git"])
-    base.cmd_in_dir("libetonyek", "git", ["checkout", "cb396b4a9453a457469b62a740d8fb933c9442c3", "--quiet"])
-
-    base.replaceInFile("./libetonyek/src/lib/IWORKTable.cpp", "is_tree_valid", "valid_tree")
-
-cmd_args  = sys.argv[1:]
-use_gperf = False
-
-for arg in cmd_args:
-    if '--gperf' == arg:
-        use_gperf = True
-
-if use_gperf:
-    base_gperf_args = ["--compare-strncmp", "--enum", "--null-strings", "--readonly-tables", "--language", "C++"]
-    base_gperf_files = ["IWORKToken.gperf", "KEY1Token.gperf", "KEY2Token.gperf", "NUM1Token.gperf", "PAG1Token.gperf"]
-
-    for file in base_gperf_files:
-        base.cmd_in_dir("./libetonyek/src/lib", "gperf", base_gperf_args + [file, "--output-file", file[0:file.find(".")] + ".inc"])
-else:
-    base.copy_dir_content("./headers", "./libetonyek/src/lib")
-
-
-

Common/3dParty/apple/headers/KEY1Token.inc

@@ -1,727 +0,0 @@
-/* C++ code produced by gperf version 3.0.1 */
-/* Command-line: gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ --output-file KEY1Token.inc KEY1Token.gperf  */
-/* Computed positions: -k'1,3,6,9,14,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-#line 10 "KEY1Token.gperf"
-
-#if defined __GNUC__
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-using namespace KEY1Token;
-#line 18 "KEY1Token.gperf"
-struct Token
-{
-  const char *name;
-  int id;
-};
-#include <string.h>
-/* maximum key range = 602, duplicates = 0 */
-
-class Perfect_Hash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct Token *in_word_set (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Perfect_Hash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned short asso_values[] =
-    {
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 220, 612,   0, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612,   0,   0,   0,   0,
-        0,   0,  10, 612, 612, 612,   0, 612,  30,  15,
-       55, 612,   5,  60,   5, 612,  10, 612, 612, 612,
-      612, 612, 612, 612, 612,   0, 612,  20, 165, 115,
-       65,   0, 105, 135, 175,  60,   0,   0,  30, 145,
-       10,   5, 155,  10,   5,  30,   5, 200,  15,  20,
-        0, 190,   0, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612, 612, 612, 612, 612,
-      612, 612, 612, 612, 612, 612
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[13]];
-      /*FALLTHROUGH*/
-      case 13:
-      case 12:
-      case 11:
-      case 10:
-      case 9:
-        hval += asso_values[(unsigned char)str[8]];
-      /*FALLTHROUGH*/
-      case 8:
-      case 7:
-      case 6:
-        hval += asso_values[(unsigned char)str[5]];
-      /*FALLTHROUGH*/
-      case 5:
-      case 4:
-      case 3:
-        hval += asso_values[(unsigned char)str[2]];
-      /*FALLTHROUGH*/
-      case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct Token *
-Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 203,
-      MIN_WORD_LENGTH = 1,
-      MAX_WORD_LENGTH = 39,
-      MIN_HASH_VALUE = 10,
-      MAX_HASH_VALUE = 611
-    };
-
-  static const struct Token wordlist[] =
-    {
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0},
-#line 199 "KEY1Token.gperf"
-      {"theme",theme},
-      {(char*)0},
-#line 211 "KEY1Token.gperf"
-      {"tr",tr},
-      {(char*)0},
-#line 196 "KEY1Token.gperf"
-      {"text",text},
-#line 207 "KEY1Token.gperf"
-      {"title",title},
-      {(char*)0},
-#line 198 "KEY1Token.gperf"
-      {"textbox",textbox},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 65 "KEY1Token.gperf"
-      {"element",element},
-      {(char*)0},
-#line 132 "KEY1Token.gperf"
-      {"none",none},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0},
-#line 175 "KEY1Token.gperf"
-      {"size",size},
-      {(char*)0}, {(char*)0},
-#line 209 "KEY1Token.gperf"
-      {"tl",tl},
-      {(char*)0},
-#line 206 "KEY1Token.gperf"
-      {"tile",tile},
-#line 168 "KEY1Token.gperf"
-      {"serie",serie},
-      {(char*)0},
-#line 221 "KEY1Token.gperf"
-      {"version",version},
-      {(char*)0},
-#line 112 "KEY1Token.gperf"
-      {"line",line},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 174 "KEY1Token.gperf"
-      {"showZero",showZero},
-      {(char*)0},
-#line 133 "KEY1Token.gperf"
-      {"notes",notes},
-      {(char*)0},
-#line 188 "KEY1Token.gperf"
-      {"stroke-style",stroke_style},
-      {(char*)0},
-#line 32 "KEY1Token.gperf"
-      {"axes",axes},
-#line 172 "KEY1Token.gperf"
-      {"shape",shape},
-      {(char*)0},
-#line 187 "KEY1Token.gperf"
-      {"stroke-color",stroke_color},
-#line 166 "KEY1Token.gperf"
-      {"sequence",sequence},
-      {(char*)0},
-#line 183 "KEY1Token.gperf"
-      {"start",start},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 182 "KEY1Token.gperf"
-      {"span",span},
-#line 185 "KEY1Token.gperf"
-      {"steps",steps},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 93 "KEY1Token.gperf"
-      {"ident",ident},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 134 "KEY1Token.gperf"
-      {"null",null},
-#line 197 "KEY1Token.gperf"
-      {"text-attributes",text_attributes},
-      {(char*)0},
-#line 130 "KEY1Token.gperf"
-      {"natural-size",natural_size},
-      {(char*)0},
-#line 131 "KEY1Token.gperf"
-      {"node",node},
-#line 111 "KEY1Token.gperf"
-      {"level",level},
-      {(char*)0},
-#line 225 "KEY1Token.gperf"
-      {"visible",visible},
-      {(char*)0}, {(char*)0},
-#line 95 "KEY1Token.gperf"
-      {"image",image},
-      {(char*)0},
-#line 171 "KEY1Token.gperf"
-      {"shadow-style",shadow_style},
-      {(char*)0},
-#line 67 "KEY1Token.gperf"
-      {"end-color",end_color},
-      {(char*)0}, {(char*)0},
-#line 208 "KEY1Token.gperf"
-      {"titleVisible",titleVisible},
-#line 212 "KEY1Token.gperf"
-      {"tracks-master",tracks_master},
-#line 53 "KEY1Token.gperf"
-      {"data",data},
-#line 177 "KEY1Token.gperf"
-      {"slide",slide},
-      {(char*)0}, {(char*)0},
-#line 62 "KEY1Token.gperf"
-      {"div",div},
-#line 195 "KEY1Token.gperf"
-      {"tail",tail},
-#line 170 "KEY1Token.gperf"
-      {"seriesDirection",seriesDirection},
-#line 169 "KEY1Token.gperf"
-      {"series",series},
-      {(char*)0},
-#line 162 "KEY1Token.gperf"
-      {"relative",relative},
-#line 60 "KEY1Token.gperf"
-      {"direction",direction},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 27 "KEY1Token.gperf"
-      {"altLineVisible",altLineVisible},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 173 "KEY1Token.gperf"
-      {"showGrid",showGrid},
-#line 33 "KEY1Token.gperf"
-      {"axis",axis},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 161 "KEY1Token.gperf"
-      {"reference",reference},
-#line 114 "KEY1Token.gperf"
-      {"line-tail-style",line_tail_style},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 73 "KEY1Token.gperf"
-      {"font",font},
-      {(char*)0},
-#line 137 "KEY1Token.gperf"
-      {"offset",offset},
-#line 92 "KEY1Token.gperf"
-      {"id",id},
-      {(char*)0},
-#line 160 "KEY1Token.gperf"
-      {"rect",rect},
-#line 180 "KEY1Token.gperf"
-      {"solid",solid},
-      {(char*)0}, {(char*)0},
-#line 66 "KEY1Token.gperf"
-      {"end",end},
-#line 77 "KEY1Token.gperf"
-      {"font-name",font_name},
-      {(char*)0},
-#line 159 "KEY1Token.gperf"
-      {"radius",radius},
-#line 61 "KEY1Token.gperf"
-      {"display-name",display_name},
-      {(char*)0},
-#line 68 "KEY1Token.gperf"
-      {"file",file},
-      {(char*)0},
-#line 45 "KEY1Token.gperf"
-      {"center",center},
-      {(char*)0}, {(char*)0},
-#line 109 "KEY1Token.gperf"
-      {"left",left},
-      {(char*)0}, {(char*)0},
-#line 51 "KEY1Token.gperf"
-      {"content",content},
-#line 64 "KEY1Token.gperf"
-      {"duration",duration},
-#line 71 "KEY1Token.gperf"
-      {"fill-type",fill_type},
-#line 163 "KEY1Token.gperf"
-      {"right",right},
-#line 139 "KEY1Token.gperf"
-      {"orientation",orientation},
-      {(char*)0}, {(char*)0},
-#line 78 "KEY1Token.gperf"
-      {"font-size",font_size},
-#line 50 "KEY1Token.gperf"
-      {"color",color},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 129 "KEY1Token.gperf"
-      {"name",name},
-#line 28 "KEY1Token.gperf"
-      {"angle",angle},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 215 "KEY1Token.gperf"
-      {"type",type},
-#line 52 "KEY1Token.gperf"
-      {"dash-style",dash_style},
-      {(char*)0}, {(char*)0},
-#line 82 "KEY1Token.gperf"
-      {"gradient",gradient},
-#line 56 "KEY1Token.gperf"
-      {"dataFormatterPrefix",dataFormatterPrefix},
-#line 54 "KEY1Token.gperf"
-      {"dataFormatterHasThousandsSeparators",dataFormatterHasThousandsSeparators},
-#line 135 "KEY1Token.gperf"
-      {"number",number},
-#line 38 "KEY1Token.gperf"
-      {"br",br},
-#line 222 "KEY1Token.gperf"
-      {"vertical",vertical},
-#line 57 "KEY1Token.gperf"
-      {"dataFormatterSuffix",dataFormatterSuffix},
-#line 193 "KEY1Token.gperf"
-      {"table",table},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 24 "KEY1Token.gperf"
-      {"DefaultLegendRelativePosition",DefaultLegendRelativePosition},
-      {(char*)0}, {(char*)0},
-#line 146 "KEY1Token.gperf"
-      {"pattern",pattern},
-      {(char*)0},
-#line 55 "KEY1Token.gperf"
-      {"dataFormatterNumberOfDecimals",dataFormatterNumberOfDecimals},
-      {(char*)0}, {(char*)0},
-#line 165 "KEY1Token.gperf"
-      {"segment",segment},
-      {(char*)0},
-#line 59 "KEY1Token.gperf"
-      {"dict",dict},
-      {(char*)0}, {(char*)0},
-#line 153 "KEY1Token.gperf"
-      {"presentation",presentation},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 35 "KEY1Token.gperf"
-      {"bl",bl},
-#line 126 "KEY1Token.gperf"
-      {"metadata",metadata},
-      {(char*)0},
-#line 86 "KEY1Token.gperf"
-      {"guide",guide},
-      {(char*)0},
-#line 181 "KEY1Token.gperf"
-      {"spacing",spacing},
-#line 120 "KEY1Token.gperf"
-      {"majorTickPositions",majorTickPositions},
-      {(char*)0},
-#line 70 "KEY1Token.gperf"
-      {"fill-style",fill_style},
-      {(char*)0},
-#line 118 "KEY1Token.gperf"
-      {"lock-aspect-ratio",lock_aspect_ratio},
-      {(char*)0},
-#line 44 "KEY1Token.gperf"
-      {"byte-size",byte_size},
-      {(char*)0},
-#line 40 "KEY1Token.gperf"
-      {"bullet",bullet},
-#line 25 "KEY1Token.gperf"
-      {"DefaultLegendSize",DefaultLegendSize},
-#line 128 "KEY1Token.gperf"
-      {"minorTickPositions",minorTickPositions},
-      {(char*)0},
-#line 202 "KEY1Token.gperf"
-      {"tickLabelsAngle",tickLabelsAngle},
-#line 127 "KEY1Token.gperf"
-      {"middle",middle},
-      {(char*)0},
-#line 152 "KEY1Token.gperf"
-      {"pos",pos},
-#line 155 "KEY1Token.gperf"
-      {"prototype-data",prototype_data},
-#line 31 "KEY1Token.gperf"
-      {"array",array},
-      {(char*)0},
-#line 122 "KEY1Token.gperf"
-      {"master-slide",master_slide},
-#line 117 "KEY1Token.gperf"
-      {"location",location},
-#line 176 "KEY1Token.gperf"
-      {"size-technique",size_technique},
-      {(char*)0},
-#line 79 "KEY1Token.gperf"
-      {"font-superscript",font_superscript},
-#line 138 "KEY1Token.gperf"
-      {"opacity",opacity},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 100 "KEY1Token.gperf"
-      {"interBarGap",interBarGap},
-      {(char*)0}, {(char*)0},
-#line 156 "KEY1Token.gperf"
-      {"prototype-drawables",prototype_drawables},
-      {(char*)0},
-#line 58 "KEY1Token.gperf"
-      {"description",description},
-#line 43 "KEY1Token.gperf"
-      {"bullets",bullets},
-      {(char*)0},
-#line 76 "KEY1Token.gperf"
-      {"font-ligatures",font_ligatures},
-      {(char*)0},
-#line 191 "KEY1Token.gperf"
-      {"symbol",symbol},
-#line 154 "KEY1Token.gperf"
-      {"prototype-bullets",prototype_bullets},
-      {(char*)0},
-#line 194 "KEY1Token.gperf"
-      {"tab-stops",tab_stops},
-#line 90 "KEY1Token.gperf"
-      {"horizontal",horizontal},
-      {(char*)0},
-#line 204 "KEY1Token.gperf"
-      {"tickLabelsVisible",tickLabelsVisible},
-      {(char*)0},
-#line 192 "KEY1Token.gperf"
-      {"symbolFillMode",symbolFillMode},
-#line 74 "KEY1Token.gperf"
-      {"font-color",font_color},
-      {(char*)0}, {(char*)0},
-#line 124 "KEY1Token.gperf"
-      {"master-slides",master_slides},
-#line 147 "KEY1Token.gperf"
-      {"pieSliceOffset",pieSliceOffset},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 42 "KEY1Token.gperf"
-      {"bullet-indentation",bullet_indentation},
-      {(char*)0}, {(char*)0},
-#line 87 "KEY1Token.gperf"
-      {"guides",guides},
-      {(char*)0}, {(char*)0},
-#line 88 "KEY1Token.gperf"
-      {"head",head},
-#line 226 "KEY1Token.gperf"
-      {"width",width},
-#line 89 "KEY1Token.gperf"
-      {"hidden",hidden},
-      {(char*)0}, {(char*)0},
-#line 46 "KEY1Token.gperf"
-      {"character",character},
-#line 69 "KEY1Token.gperf"
-      {"fill-color",fill_color},
-#line 81 "KEY1Token.gperf"
-      {"g",g},
-#line 75 "KEY1Token.gperf"
-      {"font-kerning",font_kerning},
-      {(char*)0},
-#line 103 "KEY1Token.gperf"
-      {"justified",justified},
-      {(char*)0},
-#line 116 "KEY1Token.gperf"
-      {"lineVisible",lineVisible},
-#line 107 "KEY1Token.gperf"
-      {"labelVisible",labelVisible},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 119 "KEY1Token.gperf"
-      {"locked",locked},
-#line 189 "KEY1Token.gperf"
-      {"stroke-width",stroke_width},
-      {(char*)0},
-#line 200 "KEY1Token.gperf"
-      {"thumbnail",thumbnail},
-#line 201 "KEY1Token.gperf"
-      {"thumbnails",thumbnails},
-#line 190 "KEY1Token.gperf"
-      {"styles",styles},
-      {(char*)0}, {(char*)0},
-#line 136 "KEY1Token.gperf"
-      {"numberOfPoints",numberOfPoints},
-#line 49 "KEY1Token.gperf"
-      {"chartFrame",chartFrame},
-#line 167 "KEY1Token.gperf"
-      {"sequence-bullet-style",sequence_bullet_style},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 214 "KEY1Token.gperf"
-      {"transition-style",transition_style},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 110 "KEY1Token.gperf"
-      {"legend",legend},
-#line 148 "KEY1Token.gperf"
-      {"pieSlicePercentVisible",pieSlicePercentVisible},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 47 "KEY1Token.gperf"
-      {"character-bullet-style",character_bullet_style},
-      {(char*)0},
-#line 213 "KEY1Token.gperf"
-      {"transformation",transformation},
-#line 224 "KEY1Token.gperf"
-      {"visibility",visibility},
-#line 186 "KEY1Token.gperf"
-      {"string",string},
-      {(char*)0},
-#line 39 "KEY1Token.gperf"
-      {"buildChunkingStyle",buildChunkingStyle},
-      {(char*)0}, {(char*)0},
-#line 184 "KEY1Token.gperf"
-      {"start-color",start_color},
-      {(char*)0},
-#line 210 "KEY1Token.gperf"
-      {"top",top},
-#line 63 "KEY1Token.gperf"
-      {"drawables",drawables},
-#line 179 "KEY1Token.gperf"
-      {"slide-size",slide_size},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 113 "KEY1Token.gperf"
-      {"line-head-style",line_head_style},
-#line 157 "KEY1Token.gperf"
-      {"prototype-plugin",prototype_plugin},
-      {(char*)0}, {(char*)0},
-#line 80 "KEY1Token.gperf"
-      {"font-underline",font_underline},
-      {(char*)0},
-#line 97 "KEY1Token.gperf"
-      {"image-scale",image_scale},
-      {(char*)0},
-#line 106 "KEY1Token.gperf"
-      {"labelPosition",labelPosition},
-      {(char*)0},
-#line 96 "KEY1Token.gperf"
-      {"image-data",image_data},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 145 "KEY1Token.gperf"
-      {"path",path},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0},
-#line 34 "KEY1Token.gperf"
-      {"background-fill-style",background_fill_style},
-#line 158 "KEY1Token.gperf"
-      {"prototype-plugins",prototype_plugins},
-      {(char*)0}, {(char*)0},
-#line 123 "KEY1Token.gperf"
-      {"master-slide-id",master_slide_id},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 178 "KEY1Token.gperf"
-      {"slide-list",slide_list},
-#line 121 "KEY1Token.gperf"
-      {"marker-type",marker_type},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0},
-#line 91 "KEY1Token.gperf"
-      {"http://developer.apple.com/schemas/APXL",NS_URI_KEY},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 98 "KEY1Token.gperf"
-      {"image-bullet-style",image_bullet_style},
-#line 30 "KEY1Token.gperf"
-      {"application-version",application_version},
-      {(char*)0},
-#line 149 "KEY1Token.gperf"
-      {"plugin",plugin},
-#line 151 "KEY1Token.gperf"
-      {"point_at_top",point_at_top},
-#line 104 "KEY1Token.gperf"
-      {"key",key},
-      {(char*)0}, {(char*)0},
-#line 29 "KEY1Token.gperf"
-      {"application-name",application_name},
-      {(char*)0},
-#line 223 "KEY1Token.gperf"
-      {"vertical-alignment",vertical_alignment},
-#line 83 "KEY1Token.gperf"
-      {"gradient-angle",gradient_angle},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0},
-#line 144 "KEY1Token.gperf"
-      {"paragraph-tail-indent",paragraph_tail_indent},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0},
-#line 142 "KEY1Token.gperf"
-      {"paragraph-first-line-indent",paragraph_first_line_indent},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 72 "KEY1Token.gperf"
-      {"floating-content",floating_content},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 150 "KEY1Token.gperf"
-      {"plugin-data",plugin_data},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 36 "KEY1Token.gperf"
-      {"body",body},
-      {(char*)0}, {(char*)0},
-#line 41 "KEY1Token.gperf"
-      {"bullet-characters",bullet_characters},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 143 "KEY1Token.gperf"
-      {"paragraph-head-indent",paragraph_head_indent},
-      {(char*)0}, {(char*)0},
-#line 99 "KEY1Token.gperf"
-      {"inherited",inherited},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 125 "KEY1Token.gperf"
-      {"match-point",match_point},
-      {(char*)0},
-#line 216 "KEY1Token.gperf"
-      {"ui-state",ui_state},
-#line 102 "KEY1Token.gperf"
-      {"is-filled",is_filled},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0},
-#line 115 "KEY1Token.gperf"
-      {"lineOpacity",lineOpacity},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0},
-#line 37 "KEY1Token.gperf"
-      {"bottom",bottom},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0},
-#line 140 "KEY1Token.gperf"
-      {"page-number",page_number},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 205 "KEY1Token.gperf"
-      {"time-stamp",time_stamp},
-      {(char*)0},
-#line 203 "KEY1Token.gperf"
-      {"tickLabelsOpacity",tickLabelsOpacity},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 94 "KEY1Token.gperf"
-      {"id-ref",id_ref},
-      {(char*)0}, {(char*)0},
-#line 141 "KEY1Token.gperf"
-      {"paragraph-alignment",paragraph_alignment},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 164 "KEY1Token.gperf"
-      {"scale-to-fit",scale_to_fit},
-      {(char*)0},
-#line 101 "KEY1Token.gperf"
-      {"interSeriesGap",interSeriesGap},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 219 "KEY1Token.gperf"
-      {"userMaximum",userMaximum},
-      {(char*)0}, {(char*)0},
-#line 217 "KEY1Token.gperf"
-      {"useUserMaximum",useUserMaximum},
-#line 108 "KEY1Token.gperf"
-      {"layerElementsForShadowing",layerElementsForShadowing},
-      {(char*)0},
-#line 105 "KEY1Token.gperf"
-      {"labelOpacity",labelOpacity},
-      {(char*)0}, {(char*)0},
-#line 48 "KEY1Token.gperf"
-      {"chart-prototype",chart_prototype},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0},
-#line 220 "KEY1Token.gperf"
-      {"userMinimum",userMinimum},
-      {(char*)0}, {(char*)0},
-#line 218 "KEY1Token.gperf"
-      {"useUserMinimum",useUserMinimum},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 26 "KEY1Token.gperf"
-      {"altLineOpacity",altLineOpacity},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0},
-#line 85 "KEY1Token.gperf"
-      {"grow-horizontally",grow_horizontally},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 84 "KEY1Token.gperf"
-      {"gridOpacity",gridOpacity}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-
-          if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-#line 227 "KEY1Token.gperf"
-

Common/3dParty/apple/headers/KEY2Token.inc

@@ -1,300 +0,0 @@
-/* C++ code produced by gperf version 3.0.1 */
-/* Command-line: gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ --output-file KEY2Token.inc KEY2Token.gperf  */
-/* Computed positions: -k'1,4,$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-#line 10 "KEY2Token.gperf"
-
-#if defined __GNUC__
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-using namespace KEY2Token;
-#line 18 "KEY2Token.gperf"
-struct Token
-{
-  const char *name;
-  int id;
-};
-#include <string.h>
-/* maximum key range = 140, duplicates = 0 */
-
-class Perfect_Hash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct Token *in_word_set (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Perfect_Hash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141,   5,  65,
-        0, 141,  35,   0, 141,   5, 141,   0, 141, 141,
-      141, 141, 141, 141, 141, 141,   0, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141,   0,  25,   0,
-       15,   0,  55,  10,  10,   5, 141,  15,  20,   0,
-       10,  25,  40, 141,  25,  25,   5,   0,  30,   5,
-      141,  40, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141, 141, 141, 141, 141,
-      141, 141, 141, 141, 141, 141
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[3]];
-      /*FALLTHROUGH*/
-      case 3:
-      case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct Token *
-Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 67,
-      MIN_WORD_LENGTH = 1,
-      MAX_WORD_LENGTH = 46,
-      MIN_HASH_VALUE = 1,
-      MAX_HASH_VALUE = 140
-    };
-
-  static const struct Token wordlist[] =
-    {
-      {(char*)0},
-#line 49 "KEY2Token.gperf"
-      {"c",c},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0},
-#line 65 "KEY2Token.gperf"
-      {"metadata",metadata},
-#line 89 "KEY2Token.gperf"
-      {"type",type},
-#line 84 "KEY2Token.gperf"
-      {"theme",theme},
-#line 58 "KEY2Token.gperf"
-      {"i",i},
-#line 50 "KEY2Token.gperf"
-      {"comment",comment},
-#line 41 "KEY2Token.gperf"
-      {"animationType",animationType},
-#line 66 "KEY2Token.gperf"
-      {"name",name},
-#line 26 "KEY2Token.gperf"
-      {"2005112100",VERSION_STR_3},
-      {(char*)0},
-#line 62 "KEY2Token.gperf"
-      {"master-slide",master_slide},
-      {(char*)0},
-#line 83 "KEY2Token.gperf"
-      {"text",text},
-#line 85 "KEY2Token.gperf"
-      {"theme-list",theme_list},
-#line 28 "KEY2Token.gperf"
-      {"92008102400",VERSION_STR_5},
-      {(char*)0},
-#line 36 "KEY2Token.gperf"
-      {"animationEndOffset",animationEndOffset},
-      {(char*)0},
-#line 39 "KEY2Token.gperf"
-      {"animationStartOffset",animationStartOffset},
-#line 27 "KEY2Token.gperf"
-      {"72007061400",VERSION_STR_4},
-#line 35 "KEY2Token.gperf"
-      {"animationDuration",animationDuration},
-#line 40 "KEY2Token.gperf"
-      {"animationTimingReferent",animationTimingReferent},
-#line 73 "KEY2Token.gperf"
-      {"size",size},
-#line 86 "KEY2Token.gperf"
-      {"title",title},
-      {(char*)0}, {(char*)0},
-#line 55 "KEY2Token.gperf"
-      {"headline",headline},
-#line 53 "KEY2Token.gperf"
-      {"direction",direction},
-#line 52 "KEY2Token.gperf"
-      {"depth",depth},
-#line 78 "KEY2Token.gperf"
-      {"sticky-note",sticky_note},
-#line 34 "KEY2Token.gperf"
-      {"animationDelayAutomaticWith",animationDelayAutomaticWith},
-#line 30 "KEY2Token.gperf"
-      {"animationAuto",animationAuto},
-      {(char*)0},
-#line 67 "KEY2Token.gperf"
-      {"notes",notes},
-#line 54 "KEY2Token.gperf"
-      {"events",events},
-#line 42 "KEY2Token.gperf"
-      {"authors",authors},
-#line 63 "KEY2Token.gperf"
-      {"master-slides",master_slides},
-#line 70 "KEY2Token.gperf"
-      {"page",page},
-#line 74 "KEY2Token.gperf"
-      {"slide",slide},
-#line 80 "KEY2Token.gperf"
-      {"string",string},
-#line 56 "KEY2Token.gperf"
-      {"headlineParagraphStyle",headlineParagraphStyle},
-#line 37 "KEY2Token.gperf"
-      {"animationInterchunkAuto",animationInterchunkAuto},
-      {(char*)0},
-#line 24 "KEY2Token.gperf"
-      {"2004102100",VERSION_STR_2},
-#line 77 "KEY2Token.gperf"
-      {"slide-style",slide_style},
-#line 33 "KEY2Token.gperf"
-      {"animationDelayAutmaticAfter",animationDelayAutomaticAfter},
-#line 61 "KEY2Token.gperf"
-      {"keywords",keywords},
-#line 32 "KEY2Token.gperf"
-      {"animationDelay",animationDelay},
-#line 75 "KEY2Token.gperf"
-      {"slide-list",slide_list},
-      {(char*)0},
-#line 31 "KEY2Token.gperf"
-      {"animationAutoPlay",animationAutoPlay},
-#line 60 "KEY2Token.gperf"
-      {"key",key},
-#line 51 "KEY2Token.gperf"
-      {"decimal-number",number},
-#line 82 "KEY2Token.gperf"
-      {"stylesheet",stylesheet},
-      {(char*)0},
-#line 79 "KEY2Token.gperf"
-      {"sticky-notes",sticky_notes},
-#line 29 "KEY2Token.gperf"
-      {"BGBuildDurationProperty",BGBuildDurationProperty},
-#line 38 "KEY2Token.gperf"
-      {"animationInterchunkDelay",animationInterchunkDelay},
-#line 45 "KEY2Token.gperf"
-      {"build",build},
-#line 68 "KEY2Token.gperf"
-      {"number",number},
-#line 87 "KEY2Token.gperf"
-      {"title-placeholder",title_placeholder},
-#line 69 "KEY2Token.gperf"
-      {"object-placeholder",object_placeholder},
-      {(char*)0},
-#line 64 "KEY2Token.gperf"
-      {"master-ref",master_ref},
-#line 46 "KEY2Token.gperf"
-      {"build-chunk",build_chunk},
-#line 90 "KEY2Token.gperf"
-      {"version",version},
-      {(char*)0}, {(char*)0},
-#line 25 "KEY2Token.gperf"
-      {"2005092101",COMPATIBLE_VERSION_STR_3,},
-      {(char*)0},
-#line 48 "KEY2Token.gperf"
-      {"bullets",bullets},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 47 "KEY2Token.gperf"
-      {"build-chunks",build_chunks},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 72 "KEY2Token.gperf"
-      {"presentation",presentation},
-      {(char*)0},
-#line 76 "KEY2Token.gperf"
-      {"slide-number-placeholder",slide_number_placeholder},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 59 "KEY2Token.gperf"
-      {"info-ref",info_ref},
-      {(char*)0}, {(char*)0},
-#line 57 "KEY2Token.gperf"
-      {"http://developer.apple.com/namespaces/keynote2",NS_URI_KEY},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 88 "KEY2Token.gperf"
-      {"title-placeholder-ref",title_placeholder_ref},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 43 "KEY2Token.gperf"
-      {"body-placeholder",body_placeholder},
-      {(char*)0}, {(char*)0},
-#line 81 "KEY2Token.gperf"
-      {"style-ref",style_ref},
-      {(char*)0},
-#line 71 "KEY2Token.gperf"
-      {"parent-build-ref",parent_build_ref},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 44 "KEY2Token.gperf"
-      {"body-placeholder-ref",body_placeholder_ref}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-
-          if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-#line 91 "KEY2Token.gperf"
-

Common/3dParty/apple/headers/NUM1Token.inc

@@ -1,151 +0,0 @@
-/* C++ code produced by gperf version 3.0.1 */
-/* Command-line: gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ --output-file NUM1Token.inc NUM1Token.gperf  */
-/* Computed positions: -k'$' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-#line 10 "NUM1Token.gperf"
-
-#if defined __GNUC__
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-using namespace NUM1Token;
-#line 18 "NUM1Token.gperf"
-struct Token
-{
-  const char *name;
-  int id;
-};
-#include <string.h>
-/* maximum key range = 34, duplicates = 0 */
-
-class Perfect_Hash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct Token *in_word_set (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Perfect_Hash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41,  0, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41,  0, 41, 41, 41, 41, 41, 41, 41, 41,
-       0, 10, 41, 41, 41,  0,  0, 41, 41, 41,
-      41,  5, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41
-    };
-  return len + asso_values[(unsigned char)str[len - 1]];
-}
-
-const struct Token *
-Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 10,
-      MIN_WORD_LENGTH = 7,
-      MAX_WORD_LENGTH = 40,
-      MIN_HASH_VALUE = 7,
-      MAX_HASH_VALUE = 40
-    };
-
-  static const struct Token wordlist[] =
-    {
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 29 "NUM1Token.gperf"
-      {"version",version},
-#line 25 "NUM1Token.gperf"
-      {"document",document},
-#line 30 "NUM1Token.gperf"
-      {"workspace",workspace},
-#line 28 "NUM1Token.gperf"
-      {"stylesheet",stylesheet},
-#line 24 "NUM1Token.gperf"
-      {"92008102400",VERSION_STR_2},
-      {(char*)0}, {(char*)0},
-#line 32 "NUM1Token.gperf"
-      {"workspace-name",workspace_name},
-#line 33 "NUM1Token.gperf"
-      {"workspace-style",workspace_style},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 27 "NUM1Token.gperf"
-      {"page-info",page_info},
-#line 31 "NUM1Token.gperf"
-      {"workspace-array",workspace_array},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 26 "NUM1Token.gperf"
-      {"http://developer.apple.com/namespaces/ls",NS_URI_LS}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-
-          if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-#line 34 "NUM1Token.gperf"
-

Common/3dParty/apple/headers/PAG1Token.inc

@@ -1,209 +0,0 @@
-/* C++ code produced by gperf version 3.0.1 */
-/* Command-line: gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ --output-file PAG1Token.inc PAG1Token.gperf  */
-/* Computed positions: -k'1,6' */
-
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-
-#line 10 "PAG1Token.gperf"
-
-#if defined __GNUC__
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-
-using namespace PAG1Token;
-#line 18 "PAG1Token.gperf"
-struct Token
-{
-  const char *name;
-  int id;
-};
-#include <string.h>
-/* maximum key range = 51, duplicates = 0 */
-
-class Perfect_Hash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct Token *in_word_set (const char *str, unsigned int len);
-};
-
-inline unsigned int
-Perfect_Hash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 25, 55,  0, 55, 10,
-      55, 55, 55, 55, 55, 55, 55, 10, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-       5, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55,  5, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55,  5, 25, 15,
-      20,  0, 20, 15,  5, 55, 55,  5, 10, 55,
-       0, 15,  5, 55,  0,  0,  0, 55,  5, 10,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55, 55, 55, 55, 55,
-      55, 55, 55, 55, 55, 55
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[5]];
-      /*FALLTHROUGH*/
-      case 5:
-      case 4:
-      case 3:
-      case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval;
-}
-
-const struct Token *
-Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 31,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 40,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 54
-    };
-
-  static const struct Token wordlist[] =
-    {
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 38 "PAG1Token.gperf"
-      {"note",note},
-#line 49 "PAG1Token.gperf"
-      {"rpage",rpage},
-#line 39 "PAG1Token.gperf"
-      {"number",number},
-      {(char*)0}, {(char*)0},
-#line 41 "PAG1Token.gperf"
-      {"page",page},
-#line 52 "PAG1Token.gperf"
-      {"stylesheet",stylesheet},
-#line 33 "PAG1Token.gperf"
-      {"header",header},
-#line 51 "PAG1Token.gperf"
-      {"slprint-info",slprint_info},
-      {(char*)0},
-#line 47 "PAG1Token.gperf"
-      {"prototype",prototype},
-#line 44 "PAG1Token.gperf"
-      {"page-scale",page_scale},
-#line 37 "PAG1Token.gperf"
-      {"layout",layout},
-      {(char*)0}, {(char*)0},
-#line 27 "PAG1Token.gperf"
-      {"cell",cell},
-#line 40 "PAG1Token.gperf"
-      {"order",order},
-#line 43 "PAG1Token.gperf"
-      {"page-height",page_height},
-#line 53 "PAG1Token.gperf"
-      {"textbox",textbox},
-      {(char*)0},
-#line 28 "PAG1Token.gperf"
-      {"date",date},
-#line 45 "PAG1Token.gperf"
-      {"page-width",page_width},
-#line 31 "PAG1Token.gperf"
-      {"footer",footer},
-#line 54 "PAG1Token.gperf"
-      {"version",version},
-#line 29 "PAG1Token.gperf"
-      {"document",document},
-#line 26 "PAG1Token.gperf"
-      {"body",body},
-#line 42 "PAG1Token.gperf"
-      {"page-group",page_group},
-#line 24 "PAG1Token.gperf"
-      {"92008102400",VERSION_STR_4},
-#line 25 "PAG1Token.gperf"
-      {"SLCreationDateProperty",SLCreationDateProperty},
-#line 50 "PAG1Token.gperf"
-      {"section-prototypes",section_prototypes},
-#line 35 "PAG1Token.gperf"
-      {"kSFWPFootnoteGapProperty",kSFWPFootnoteGapProperty},
-#line 36 "PAG1Token.gperf"
-      {"kSFWPFootnoteKindProperty",kSFWPFootnoteKindProperty},
-#line 48 "PAG1Token.gperf"
-      {"publication-info",publication_info},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 46 "PAG1Token.gperf"
-      {"print-info",print_info},
-      {(char*)0}, {(char*)0},
-#line 32 "PAG1Token.gperf"
-      {"footnote",footnote},
-      {(char*)0},
-#line 34 "PAG1Token.gperf"
-      {"http://developer.apple.com/namespaces/sl",NS_URI_SL},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 30 "PAG1Token.gperf"
-      {"drawables",drawables}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-
-          if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-#line 55 "PAG1Token.gperf"
-

Common/3dParty/boost/boost_ios.sh

@@ -259,17 +259,20 @@ buildBoost()
         echo Building Boost for iPhone
         # Install this one so we can copy the headers for the frameworks...
         ./b2 -j16 --build-dir=iphone-build --stagedir=iphone-build/stage \
+            cxxflags="" \
             --prefix=$PREFIXDIR toolset=darwin architecture=arm target-os=iphone \
             macosx-version=iphone-${IOS_SDK_VERSION} define=_LITTLE_ENDIAN \
             link=static stage
         ./b2 -j16 --build-dir=iphone-build --stagedir=iphone-build/stage \
             --prefix=$PREFIXDIR toolset=darwin architecture=arm \
+            cxxflags="" \
             target-os=iphone macosx-version=iphone-${IOS_SDK_VERSION} \
             define=_LITTLE_ENDIAN link=static install
         doneSection
 
         echo Building Boost for iPhoneSimulator
         ./b2 -j16 --build-dir=iphonesim-build --stagedir=iphonesim-build/stage \
+            cxxflags="" \
             toolset=darwin-${IOS_SDK_VERSION}~iphonesim architecture=x86 \
             target-os=iphone macosx-version=iphonesim-${IOS_SDK_VERSION} \
             link=static stage

Common/3dParty/harfbuzz/test/main.cpp

@@ -1,818 +0,0 @@
-// https://android.googlesource.com/platform/external/harfbuzz/+/ics-mr0/contrib/tables/script-properties.h
-
-/*
- * https://unicode.org/reports/tr29/
-
-As far as a user is concerned, the underlying representation of text is not important,
-but it is important that an editing interface present a uniform implementation of what
-the user thinks of as characters. Grapheme clusters can be treated as units, by default,
-for processes such as the formatting of drop caps, as well as the implementation of text
-selection, arrow key movement or backspacing through text, and so forth. For example,
-when a grapheme cluster is represented internally by a character sequence consisting of
-base character + accents, then using the right arrow key would skip from the start of the
-base character to the end of the last accent.
-
-This document defines a default specification for grapheme clusters. It may be customized
- for particular languages, operations, or other situations. For example, arrow key movement
-could be tailored by language, or could use knowledge specific to particular fonts to move
-in a more granular manner, in circumstances where it would be useful to edit individual
-components. This could apply, for example, to the complex editorial requirements for the
-Northern Thai script Tai Tham (Lanna). Similarly, editing a grapheme cluster element by
-element may be preferable in some circumstances. For example, on a given system the backspace
-key might delete by code point, while the delete key may delete an entire cluster.
- * */
-
-#include "../../../core/DesktopEditor/common/File.h"
-#include "../../../core/DesktopEditor/raster/BgraFrame.h"
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_GLYPH_H
-#include FT_OUTLINE_H
-
-#include <hb-ft.h>
-#include <hb-ot.h>
-#include <hb.h>
-
-class CDrawer
-{
-public:
-	CBgraFrame m_oFrame;
-	BYTE *pixels;
-	int width;
-	int height;
-	int pitch;
-	BYTE Rshift;
-	BYTE Gshift;
-	BYTE Bshift;
-	BYTE Ashift;
-
-public:
-	CDrawer(int w, int h)
-	{
-		width = w;
-		height = h;
-		pitch = 4 * width;
-		m_oFrame.put_Width(width);
-		m_oFrame.put_Height(height);
-		m_oFrame.put_Stride(pitch);
-
-		int size = 4 * width * height;
-		BYTE *pPixels = new BYTE[size];
-		for (int i = 0; i < size; i += 4)
-		{
-			pPixels[i] = 0xFF;
-			pPixels[i + 1] = 0xFF;
-			pPixels[i + 2] = 0xFF;
-			pPixels[i + 3] = 0xFF;
-		}
-		pixels = pPixels;
-		m_oFrame.put_Data(pPixels);
-
-		Bshift = 24;
-		Gshift = 16;
-		Rshift = 8;
-		Ashift = 0;
-	}
-	void Save()
-	{
-		m_oFrame.SaveFile(NSFile::GetProcessDirectory() + L"/output.png", 4);
-	}
-};
-
-#define NUM_EXAMPLES 3
-
-/* fonts */
-const char *fonts_paths[NUM_EXAMPLES] = {
-	"C:/Windows/Fonts/calibri.ttf",
-	//"C:/Windows/Fonts/arial.ttf",
-	"C:/Users/korol/AppData/Local/Microsoft/Windows/Fonts/ArabicTest.ttf",
-	"C:/Windows/Fonts/simsun.ttc"
-};
-
-#define NUM_GLYPH_TYPES 5
-const char *num_glyph_types[NUM_GLYPH_TYPES] = {"UNCLASSIFIED", "BASE_GLYPH", "LIGATURE", "MARK", "COMPONENT"};
-
-/* tranlations courtesy of google */
-const char *texts[NUM_EXAMPLES] = {
-	"fi",
-	"لا لآ لأ لا",
-	"懶惰的姜貓"
-};
-
-const hb_direction_t text_directions[NUM_EXAMPLES] = {
-	HB_DIRECTION_LTR,
-	HB_DIRECTION_RTL,
-	HB_DIRECTION_TTB,
-};
-
-const int text_skip[NUM_EXAMPLES] = {
-	0,
-	0,
-	1,
-};
-
-/* XXX: These are not correct, though it doesn't seem to break anything
- *      regardless of their value. */
-const char *languages[NUM_EXAMPLES] = {
-	"en",
-	"ar",
-	"ch",
-};
-
-const hb_script_t scripts[NUM_EXAMPLES] = {
-	HB_SCRIPT_LATIN,
-	HB_SCRIPT_ARABIC,
-	HB_SCRIPT_HAN,
-};
-
-enum
-{
-	ENGLISH = 0,
-	ARABIC,
-	CHINESE
-};
-
-typedef struct _spanner_baton_t
-{
-	/* rendering part - assumes 32bpp surface */
-	uint32_t *pixels;					// set to the glyph's origin.
-	uint32_t *first_pixel, *last_pixel; // bounds check
-	uint32_t pitch;
-	uint32_t rshift;
-	uint32_t gshift;
-	uint32_t bshift;
-	uint32_t ashift;
-
-	/* sizing part */
-	int min_span_x;
-	int max_span_x;
-	int min_y;
-	int max_y;
-} spanner_baton_t;
-
-/* This spanner is write only, suitable for write-only mapped buffers,
-   but can cause dark streaks where glyphs overlap, like in arabic scripts.
-
-   Note how spanners don't clip against surface width - resize the window
-   and see what it leads to. */
-void spanner_wo(int y, int count, const FT_Span *spans, void *user)
-{
-	spanner_baton_t *baton = (spanner_baton_t *)user;
-	uint32_t *scanline = baton->pixels - y * ((int)baton->pitch / 4);
-	if (scanline < baton->first_pixel)
-		return;
-	for (int i = 0; i < count; i++)
-	{
-		uint32_t color = ((spans[i].coverage / 2) << baton->rshift) | ((spans[i].coverage / 2) << baton->gshift) | ((spans[i].coverage / 2) << baton->bshift);
-
-		uint32_t *start = scanline + spans[i].x;
-		if (start + spans[i].len > baton->last_pixel)
-			return;
-
-		for (int x = 0; x < spans[i].len; x++)
-			*start++ = color;
-	}
-}
-
-/* This spanner does read/modify/write, trading performance for accuracy.
-   The color here is simply half coverage value in all channels,
-   effectively mid-gray.
-   Suitable for when artifacts mostly do come up and annoy.
-   This might be optimized if one does rmw only for some values of x.
-   But since the whole buffer has to be rw anyway, and the previous value
-   is probably still in the cache, there's little point to. */
-void spanner_rw(int y, int count, const FT_Span *spans, void *user)
-{
-	spanner_baton_t *baton = (spanner_baton_t *)user;
-	uint32_t *scanline = baton->pixels - y * ((int)baton->pitch / 4);
-	if (scanline < baton->first_pixel)
-		return;
-
-	for (int i = 0; i < count; i++)
-	{
-		uint32_t color = ((spans[i].coverage / 2) << baton->rshift) | ((spans[i].coverage / 2) << baton->gshift) | ((spans[i].coverage / 2) << baton->bshift);
-		uint32_t *start = scanline + spans[i].x;
-		if (start + spans[i].len > baton->last_pixel)
-			return;
-
-		for (int x = 0; x < spans[i].len; x++)
-			*start++ |= color;
-	}
-}
-
-/*  This spanner is for obtaining exact bounding box for the string.
-	Unfortunately this can't be done without rendering it (or pretending to).
-	After this runs, we get min and max values of coordinates used.
-*/
-void spanner_sizer(int y, int count, const FT_Span *spans, void *user)
-{
-	spanner_baton_t *baton = (spanner_baton_t *)user;
-
-	if (y < baton->min_y)
-		baton->min_y = y;
-	if (y > baton->max_y)
-		baton->max_y = y;
-	for (int i = 0; i < count; i++)
-	{
-		if (spans[i].x + spans[i].len > baton->max_span_x)
-			baton->max_span_x = spans[i].x + spans[i].len;
-		if (spans[i].x < baton->min_span_x)
-			baton->min_span_x = spans[i].x;
-	}
-}
-
-FT_SpanFunc spanner = spanner_wo;
-
-void ftfdump(FT_Face ftf)
-{
-	for (int i = 0; i < ftf->num_charmaps; i++)
-	{
-		printf(
-			"%d: %s %s %c%c%c%c plat=%hu id=%hu\n", i, ftf->family_name, ftf->style_name, ftf->charmaps[i]->encoding >> 24, (ftf->charmaps[i]->encoding >> 16) & 0xff,
-			(ftf->charmaps[i]->encoding >> 8) & 0xff, (ftf->charmaps[i]->encoding) & 0xff, ftf->charmaps[i]->platform_id, ftf->charmaps[i]->encoding_id);
-	}
-}
-
-/*  See http://www.microsoft.com/typography/otspec/name.htm
-	for a list of some possible platform-encoding pairs.
-	We're interested in 0-3 aka 3-1 - UCS-2.
-	Otherwise, fail. If a font has some unicode map, but lacks
-	UCS-2 - it is a broken or irrelevant font. What exactly
-	Freetype will select on face load (it promises most wide
-	unicode, and if that will be slower that UCS-2 - left as
-	an excercise to check. */
-int force_ucs2_charmap(FT_Face ftf)
-{
-	for (int i = 0; i < ftf->num_charmaps; i++)
-		if (((ftf->charmaps[i]->platform_id == 0) && (ftf->charmaps[i]->encoding_id == 3)) || ((ftf->charmaps[i]->platform_id == 3) && (ftf->charmaps[i]->encoding_id == 1)))
-			return FT_Set_Charmap(ftf, ftf->charmaps[i]);
-	return -1;
-}
-
-void hline(CDrawer *s, int min_x, int max_x, int y, uint32_t color)
-{
-	if (y < 0)
-		y = 0;
-	uint32_t *pix = (uint32_t *)s->pixels + (y * s->pitch) / 4 + min_x;
-	uint32_t *end = (uint32_t *)s->pixels + (y * s->pitch) / 4 + max_x;
-
-	while (pix - 1 != end)
-		*pix++ = color;
-}
-
-void vline(CDrawer *s, int min_y, int max_y, int x, uint32_t color)
-{
-	if (min_y < 0)
-		min_y = 0;
-
-	uint32_t *pix = (uint32_t *)s->pixels + (min_y * s->pitch) / 4 + x;
-	uint32_t *end = (uint32_t *)s->pixels + (max_y * s->pitch) / 4 + x;
-
-	while (pix - s->pitch / 4 != end)
-	{
-		*pix = color;
-		pix += s->pitch / 4;
-	}
-}
-
-void assert(const bool &valid)
-{
-	// TODO:
-}
-
-#define MAIN_CC_NO_PRIVATE_API
-#ifndef MAIN_CC_NO_PRIVATE_API
-/* Only this part of this mini app uses private API */
-#include "hb-open-file.hh"
-#include "hb-ot-layout-gdef-table.hh"
-#include "hb-ot-layout-gsubgpos.hh"
-#include "hb-static.cc"
-
-using namespace OT;
-
-static void print_layout_info_using_private_api(hb_blob_t *blob)
-{
-	const char *font_data = hb_blob_get_data(blob, nullptr);
-	hb_blob_t *font_blob = hb_sanitize_context_t().sanitize_blob<OpenTypeFontFile>(blob);
-	const OpenTypeFontFile *sanitized = font_blob->as<OpenTypeFontFile>();
-	if (!font_blob->data)
-	{
-		printf("Sanitization of the file wasn't successful. Exit");
-		exit(1);
-	}
-	const OpenTypeFontFile &ot = *sanitized;
-
-	switch (ot.get_tag())
-	{
-	case OpenTypeFontFile::TrueTypeTag:
-		printf("OpenType font with TrueType outlines\n");
-		break;
-	case OpenTypeFontFile::CFFTag:
-		printf("OpenType font with CFF (Type1) outlines\n");
-		break;
-	case OpenTypeFontFile::TTCTag:
-		printf("TrueType Collection of OpenType fonts\n");
-		break;
-	case OpenTypeFontFile::TrueTag:
-		printf("Obsolete Apple TrueType font\n");
-		break;
-	case OpenTypeFontFile::Typ1Tag:
-		printf("Obsolete Apple Type1 font in SFNT container\n");
-		break;
-	case OpenTypeFontFile::DFontTag:
-		printf("DFont Mac Resource Fork\n");
-		break;
-	default:
-		printf("Unknown font format\n");
-		break;
-	}
-
-	unsigned num_faces = hb_face_count(blob);
-	printf("%d font(s) found in file\n", num_faces);
-	for (unsigned n_font = 0; n_font < num_faces; ++n_font)
-	{
-		const OpenTypeFontFace &font = ot.get_face(n_font);
-		printf("Font %d of %d:\n", n_font, num_faces);
-
-		unsigned num_tables = font.get_table_count();
-		printf("  %d table(s) found in font\n", num_tables);
-		for (unsigned n_table = 0; n_table < num_tables; ++n_table)
-		{
-			const OpenTypeTable &table = font.get_table(n_table);
-			printf("  Table %2d of %2d: %.4s (0x%08x+0x%08x)\n", n_table, num_tables, (const char *)table.tag, (unsigned)table.offset, (unsigned)table.length);
-
-			switch (table.tag)
-			{
-
-			case HB_OT_TAG_GSUB:
-			case HB_OT_TAG_GPOS:
-			{
-
-				const GSUBGPOS &g = *reinterpret_cast<const GSUBGPOS *>(font_data + table.offset);
-
-				unsigned num_scripts = g.get_script_count();
-				printf("    %d script(s) found in table\n", num_scripts);
-				for (unsigned n_script = 0; n_script < num_scripts; ++n_script)
-				{
-					const Script &script = g.get_script(n_script);
-					printf("    Script %2d of %2d: %.4s\n", n_script, num_scripts, (const char *)g.get_script_tag(n_script));
-
-					if (!script.has_default_lang_sys())
-						printf("      No default language system\n");
-					int num_langsys = script.get_lang_sys_count();
-					printf("      %d language system(s) found in script\n", num_langsys);
-					for (int n_langsys = script.has_default_lang_sys() ? -1 : 0; n_langsys < num_langsys; ++n_langsys)
-					{
-						const LangSys &langsys = n_langsys == -1 ? script.get_default_lang_sys() : script.get_lang_sys(n_langsys);
-						if (n_langsys == -1)
-							printf("      Default Language System\n");
-						else
-							printf("      Language System %2d of %2d: %.4s\n", n_langsys, num_langsys, (const char *)script.get_lang_sys_tag(n_langsys));
-						if (!langsys.has_required_feature())
-							printf("        No required feature\n");
-						else
-							printf("        Required feature index: %d\n", langsys.get_required_feature_index());
-
-						unsigned num_features = langsys.get_feature_count();
-						printf("        %d feature(s) found in language system\n", num_features);
-						for (unsigned n_feature = 0; n_feature < num_features; ++n_feature)
-						{
-							printf("        Feature index %2d of %2d: %d\n", n_feature, num_features, langsys.get_feature_index(n_feature));
-						}
-					}
-				}
-
-				unsigned num_features = g.get_feature_count();
-				printf("    %d feature(s) found in table\n", num_features);
-				for (unsigned n_feature = 0; n_feature < num_features; ++n_feature)
-				{
-					const Feature &feature = g.get_feature(n_feature);
-					unsigned num_lookups = feature.get_lookup_count();
-					printf("    Feature %2d of %2d: %c%c%c%c\n", n_feature, num_features, HB_UNTAG(g.get_feature_tag(n_feature)));
-
-					printf("        %d lookup(s) found in feature\n", num_lookups);
-					for (unsigned n_lookup = 0; n_lookup < num_lookups; ++n_lookup)
-					{
-						printf("        Lookup index %2d of %2d: %d\n", n_lookup, num_lookups, feature.get_lookup_index(n_lookup));
-					}
-				}
-
-				unsigned num_lookups = g.get_lookup_count();
-				printf("    %d lookup(s) found in table\n", num_lookups);
-				for (unsigned n_lookup = 0; n_lookup < num_lookups; ++n_lookup)
-				{
-					const Lookup &lookup = g.get_lookup(n_lookup);
-					printf("    Lookup %2d of %2d: type %d, props 0x%04X\n", n_lookup, num_lookups, lookup.get_type(), lookup.get_props());
-				}
-			}
-			break;
-
-			case GDEF::tableTag:
-			{
-
-				const GDEF &gdef = *reinterpret_cast<const GDEF *>(font_data + table.offset);
-
-				printf("    Has %sglyph classes\n", gdef.has_glyph_classes() ? "" : "no ");
-				printf("    Has %smark attachment types\n", gdef.has_mark_attachment_types() ? "" : "no ");
-				printf("    Has %sattach points\n", gdef.has_attach_points() ? "" : "no ");
-				printf("    Has %slig carets\n", gdef.has_lig_carets() ? "" : "no ");
-				printf("    Has %smark sets\n", gdef.has_mark_sets() ? "" : "no ");
-
-				hb_position_t caret_array[16];
-				unsigned int caret_count = 16;
-
-				unsigned int num_carets = gdef.get_lig_carets(nullptr, HB_DIRECTION_LTR, 302, 0, &caret_count, caret_array);
-				int y = 0;
-				++y;
-
-				break;
-			}
-			}
-		}
-	}
-}
-/* end of private API use */
-#endif
-
-struct hb_feature_test {
-	hb_tag_t tag;
-	uint32_t value;
-};
-
-int main(int argc, char *argv[])
-{
-	// hb_blob_t* blobFileTest = hb_blob_create_from_file("C:/Windows/Fonts/calibri.ttf");
-	// print_layout_info_using_private_api(blobFileTest);
-
-	int ptSize = 40 * 64;
-	int device_hdpi = 72;
-	int device_vdpi = 72;
-
-	/* Init freetype */
-	FT_Library ft_library;
-	assert(!FT_Init_FreeType(&ft_library));
-
-	/* Load our fonts */
-	FT_Face ft_face[NUM_EXAMPLES];
-	assert(!FT_New_Face(ft_library, fonts_paths[0], 0, &ft_face[ENGLISH]));
-	assert(!FT_Set_Char_Size(ft_face[ENGLISH], 0, ptSize, device_hdpi, device_vdpi));
-	ftfdump(ft_face[ENGLISH]); // wonderful world of encodings ...
-	// force_ucs2_charmap(ft_face[ENGLISH]); // which we ignore.
-
-	assert(!FT_New_Face(ft_library, fonts_paths[1], 0, &ft_face[ARABIC]));
-	assert(!FT_Set_Char_Size(ft_face[ARABIC], 0, ptSize, device_hdpi, device_vdpi));
-	ftfdump(ft_face[ARABIC]);
-	// force_ucs2_charmap(ft_face[ARABIC]);
-
-	assert(!FT_New_Face(ft_library, fonts_paths[2], 0, &ft_face[CHINESE]));
-	assert(!FT_Set_Char_Size(ft_face[CHINESE], 0, ptSize, device_hdpi, device_vdpi));
-	ftfdump(ft_face[CHINESE]);
-	// force_ucs2_charmap(ft_face[CHINESE]);
-
-	/* Get our harfbuzz font structs */
-	hb_font_t *hb_ft_font[NUM_EXAMPLES];
-	hb_ft_font[ENGLISH] = hb_ft_font_create(ft_face[ENGLISH], NULL);
-
-	// hb_blob_t* blobFile = hb_blob_create_from_file(sFont1.c_str());
-	// hb_face_t* faceFile = hb_face_create(blobFile, 0);
-	// hb_ft_font[ENGLISH] = hb_font_create(faceFile);
-
-	hb_ft_font[ARABIC] = hb_ft_font_create(ft_face[ARABIC], NULL);
-	hb_ft_font[CHINESE] = hb_ft_font_create(ft_face[CHINESE], NULL);
-
-	hb_ft_font_set_funcs(hb_ft_font[ENGLISH]);
-	hb_ft_font_set_funcs(hb_ft_font[ARABIC]);
-	hb_ft_font_set_funcs(hb_ft_font[CHINESE]);
-
-	/** Setup our SDL window **/
-	int width = 800;
-	int height = 600;
-	int bpp = 32;
-
-	CDrawer oDrawer(width, height);
-
-	/* Create a buffer for harfbuzz to use */
-	hb_buffer_t *buf = hb_buffer_create();
-	for (int i = 0; i < NUM_EXAMPLES; ++i)
-	{
-		if (text_skip[i])
-			continue;
-
-		hb_buffer_set_direction(buf, text_directions[i]); /* or LTR */
-		hb_buffer_set_script(buf, scripts[i]);			  /* see hb-unicode.h */
-		hb_buffer_set_language(buf, hb_language_from_string(languages[i], strlen(languages[i])));
-		// hb_buffer_set_cluster_level (buf, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES);
-		// hb_buffer_set_cluster_level (buf, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);
-		hb_buffer_set_cluster_level(buf, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_GRAPHEMES);
-
-		hb_feature_test features[] {
-			{HB_TAG('r','l','i','g'), 1},
-			{HB_TAG('l','i','g','a'), 0},
-			{HB_TAG('c','l','i','g'), 1},
-			{HB_TAG('h','l','i','g'), 1},
-			{HB_TAG('d','l','i','g'), 1},
-			{HB_TAG('k','e','r','n'), 2},
-			{0, 0}
-		};
-
-		int userfeatures_count = 0;
-		hb_feature_t userfeatures[100];
-
-		hb_feature_test* current_feature = features;
-		while (current_feature->tag != 0)
-		{
-			if (current_feature->value != 2)
-			{
-				userfeatures[userfeatures_count].tag   = current_feature->tag;
-				userfeatures[userfeatures_count].value = current_feature->value;
-				userfeatures[userfeatures_count].start = HB_FEATURE_GLOBAL_START;
-				userfeatures[userfeatures_count].end   = HB_FEATURE_GLOBAL_END;
-				userfeatures_count++;
-			}
-			current_feature++;
-		}
-
-		/* Layout the text */
-		hb_buffer_add_utf8(buf, texts[i], strlen(texts[i]), 0, strlen(texts[i]));
-
-		// detect script by codes
-		hb_buffer_guess_segment_properties(buf);
-
-		// const char*const pHbShapers[] = { "graphite2", "coretext_aat", "ot", "fallback", nullptr };
-		// bool ok = hb_shape_full(hb_ft_font[i], buf, userfeatures, userfeatures_count, pHbShapers);
-
-		hb_shape(hb_ft_font[i], buf, (userfeatures_count != 0) ? userfeatures : NULL, userfeatures_count);
-
-		unsigned int glyph_count;
-		hb_glyph_info_t *glyph_info = hb_buffer_get_glyph_infos(buf, &glyph_count);
-		hb_glyph_position_t *glyph_pos = hb_buffer_get_glyph_positions(buf, &glyph_count);
-
-#if 1
-		hb_position_t caret_array[16];
-		unsigned int caret_count = 16;
-
-		unsigned int num_carets = hb_ot_layout_get_ligature_carets(hb_ft_font[i], text_directions[i], glyph_info[0].codepoint, -1, &caret_count, caret_array);
-#endif
-
-		/* set up rendering via spanners */
-		spanner_baton_t stuffbaton;
-
-		FT_Raster_Params ftr_params;
-		ftr_params.target = 0;
-		ftr_params.flags = FT_RASTER_FLAG_DIRECT | FT_RASTER_FLAG_AA;
-		ftr_params.user = &stuffbaton;
-		ftr_params.black_spans = 0;
-		ftr_params.bit_set = 0;
-		ftr_params.bit_test = 0;
-
-		/* Calculate string bounding box in pixels */
-		ftr_params.gray_spans = spanner_sizer;
-
-		/* See http://www.freetype.org/freetype2/docs/glyphs/glyphs-3.html */
-
-		int max_x = INT_MIN; // largest coordinate a pixel has been set at, or the pen was advanced to.
-		int min_x = INT_MAX; // smallest coordinate a pixel has been set at, or the pen was advanced to.
-		int max_y = INT_MIN; // this is max topside bearing along the string.
-		int min_y = INT_MAX; // this is max value of (height - topbearing) along the string.
-		/*  Naturally, the above comments swap their meaning between horizontal and vertical scripts,
-			since the pen changes the axis it is advanced along.
-			However, their differences still make up the bounding box for the string.
-			Also note that all this is in FT coordinate system where y axis points upwards.
-		 */
-
-		int sizer_x = 0;
-		int sizer_y = 0; /* in FT coordinate system. */
-
-		printf("----------------------------------------------------\n");
-		for (unsigned j = 0; j < glyph_count; ++j)
-		{
-			hb_ot_layout_glyph_class_t glyph_type = hb_ot_layout_get_glyph_class(hb_font_get_face(hb_ft_font[i]), glyph_info[j].codepoint);
-			hb_glyph_flags_t glyph_type_flags = hb_glyph_info_get_glyph_flags(&glyph_info[j]);
-			printf(
-				"glyph(%s, flags: %d): gid:%d, cluster:%d, [%d, %d, %d, %d, %d]\n", num_glyph_types[glyph_type], glyph_type_flags, (int)glyph_info[j].codepoint, (int)glyph_info[j].cluster,
-				glyph_pos[j].x_advance, glyph_pos[j].y_advance, glyph_pos[j].x_offset, glyph_pos[j].y_offset, glyph_pos[j].var);
-		}
-
-		FT_Error fterr;
-		for (unsigned j = 0; j < glyph_count; ++j)
-		{
-			if ((fterr = FT_Load_Glyph(ft_face[i], glyph_info[j].codepoint, 0)))
-			{
-				printf("load %08x failed fterr=%d.\n", glyph_info[j].codepoint, fterr);
-			}
-			else
-			{
-				if (ft_face[i]->glyph->format != FT_GLYPH_FORMAT_OUTLINE)
-				{
-					printf("glyph->format = %4s\n", (char *)&ft_face[i]->glyph->format);
-				}
-				else
-				{
-					int gx = sizer_x + (glyph_pos[j].x_offset / 64);
-					int gy = sizer_y + (glyph_pos[j].y_offset / 64); // note how the sign differs from the rendering pass
-
-					stuffbaton.min_span_x = INT_MAX;
-					stuffbaton.max_span_x = INT_MIN;
-					stuffbaton.min_y = INT_MAX;
-					stuffbaton.max_y = INT_MIN;
-
-					if ((fterr = FT_Outline_Render(ft_library, &ft_face[i]->glyph->outline, &ftr_params)))
-						printf("FT_Outline_Render() failed err=%d\n", fterr);
-
-					if (stuffbaton.min_span_x != INT_MAX)
-					{
-						/* Update values if the spanner was actually called. */
-						if (min_x > stuffbaton.min_span_x + gx)
-							min_x = stuffbaton.min_span_x + gx;
-
-						if (max_x < stuffbaton.max_span_x + gx)
-							max_x = stuffbaton.max_span_x + gx;
-
-						if (min_y > stuffbaton.min_y + gy)
-							min_y = stuffbaton.min_y + gy;
-
-						if (max_y < stuffbaton.max_y + gy)
-							max_y = stuffbaton.max_y + gy;
-					}
-					else
-					{
-						/* The spanner wasn't called at all - an empty glyph, like space. */
-						if (min_x > gx)
-							min_x = gx;
-						if (max_x < gx)
-							max_x = gx;
-						if (min_y > gy)
-							min_y = gy;
-						if (max_y < gy)
-							max_y = gy;
-					}
-				}
-			}
-
-			sizer_x += glyph_pos[j].x_advance / 64;
-			sizer_y += glyph_pos[j].y_advance / 64; // note how the sign differs from the rendering pass
-		}
-		/* Still have to take into account last glyph's advance. Or not? */
-		if (min_x > sizer_x)
-			min_x = sizer_x;
-		if (max_x < sizer_x)
-			max_x = sizer_x;
-		if (min_y > sizer_y)
-			min_y = sizer_y;
-		if (max_y < sizer_y)
-			max_y = sizer_y;
-
-		/* The bounding box */
-		int bbox_w = max_x - min_x;
-		int bbox_h = max_y - min_y;
-
-		/* Two offsets below position the bounding box with respect to the 'origin',
-			which is sort of origin of string's first glyph.
-
-			baseline_offset - offset perpendecular to the baseline to the topmost (horizontal),
-							  or leftmost (vertical) pixel drawn.
-
-			baseline_shift  - offset along the baseline, from the first drawn glyph's origin
-							  to the leftmost (horizontal), or topmost (vertical) pixel drawn.
-
-			Thus those offsets allow positioning the bounding box to fit the rendered string,
-			as they are in fact offsets from the point given to the renderer, to the top left
-			corner of the bounding box.
-
-			NB: baseline is defined as y==0 for horizontal and x==0 for vertical scripts.
-			(0,0) here is where the first glyph's origin ended up after shaping, not taking
-			into account glyph_pos[0].xy_offset (yeah, my head hurts too).
-		*/
-
-		int baseline_offset;
-		int baseline_shift;
-
-		if (HB_DIRECTION_IS_HORIZONTAL(hb_buffer_get_direction(buf)))
-		{
-			baseline_offset = max_y;
-			baseline_shift = min_x;
-		}
-		if (HB_DIRECTION_IS_VERTICAL(hb_buffer_get_direction(buf)))
-		{
-			baseline_offset = min_x;
-			baseline_shift = max_y;
-		}
-
-		/* The pen/baseline start coordinates in window coordinate system
-			- with those text placement in the window is controlled.
-			- note that for RTL scripts pen still goes LTR */
-		int x = 0, y = 50 + i * 75;
-		if (i == ENGLISH)
-		{
-			x = 20;
-		} /* left justify */
-		if (i == ARABIC)
-		{
-			x = width - bbox_w - 20;
-		} /* right justify */
-		if (i == CHINESE)
-		{
-			x = width / 2 - bbox_w / 2;
-		} /* center, and for TTB script h_advance is half-width. */
-
-		/* Draw baseline and the bounding box */
-		/* The below is complicated since we simultaneously
-		   convert to the window coordinate system. */
-		int left, right, top, bottom;
-
-		if (HB_DIRECTION_IS_HORIZONTAL(hb_buffer_get_direction(buf)))
-		{
-			/* bounding box in window coordinates without offsets */
-			left = x;
-			right = x + bbox_w;
-			top = y - bbox_h;
-			bottom = y;
-
-			/* apply offsets */
-			left += baseline_shift;
-			right += baseline_shift;
-			top -= baseline_offset - bbox_h;
-			bottom -= baseline_offset - bbox_h;
-
-			/* draw the baseline */
-			hline(&oDrawer, x, x + bbox_w, y, 0x0000ff00);
-		}
-
-		if (HB_DIRECTION_IS_VERTICAL(hb_buffer_get_direction(buf)))
-		{
-			left = x;
-			right = x + bbox_w;
-			top = y;
-			bottom = y + bbox_h;
-
-			left += baseline_offset;
-			right += baseline_offset;
-			top -= baseline_shift;
-			bottom -= baseline_shift;
-
-			vline(&oDrawer, y, y + bbox_h, x, 0x0000ff00);
-		}
-
-		/* +1/-1 are for the bbox borders be the next pixel outside the bbox itself */
-		hline(&oDrawer, left - 1, right + 1, top - 1, 0xffff0000);
-		hline(&oDrawer, left - 1, right + 1, bottom + 1, 0xffff0000);
-		vline(&oDrawer, top - 1, bottom + 1, left - 1, 0xffff0000);
-		vline(&oDrawer, top - 1, bottom + 1, right + 1, 0xffff0000);
-
-		/* set rendering spanner */
-		ftr_params.gray_spans = spanner;
-
-		/* initialize rendering part of the baton */
-		stuffbaton.pixels = NULL;
-		stuffbaton.first_pixel = (uint32_t *)oDrawer.pixels;
-		stuffbaton.last_pixel = (uint32_t *)(((uint8_t *)oDrawer.pixels) + oDrawer.pitch * oDrawer.height);
-		stuffbaton.pitch = oDrawer.pitch;
-		stuffbaton.rshift = oDrawer.Rshift;
-		stuffbaton.gshift = oDrawer.Gshift;
-		stuffbaton.bshift = oDrawer.Bshift;
-
-		/* render */
-		for (unsigned j = 0; j < glyph_count; ++j)
-		{
-			if ((fterr = FT_Load_Glyph(ft_face[i], glyph_info[j].codepoint, 0)))
-			{
-				printf("load %08x failed fterr=%d.\n", glyph_info[j].codepoint, fterr);
-			}
-			else
-			{
-				if (ft_face[i]->glyph->format != FT_GLYPH_FORMAT_OUTLINE)
-				{
-					printf("glyph->format = %4s\n", (char *)&ft_face[i]->glyph->format);
-				}
-				else
-				{
-					int gx = x + (glyph_pos[j].x_offset / 64);
-					int gy = y - (glyph_pos[j].y_offset / 64);
-
-					stuffbaton.pixels = (uint32_t *)(((uint8_t *)oDrawer.pixels) + gy * oDrawer.pitch) + gx;
-
-					if ((fterr = FT_Outline_Render(ft_library, &ft_face[i]->glyph->outline, &ftr_params)))
-						printf("FT_Outline_Render() failed err=%d\n", fterr);
-				}
-			}
-
-			x += glyph_pos[j].x_advance / 64;
-			y -= glyph_pos[j].y_advance / 64;
-		}
-
-		/* clean up the buffer, but don't kill it just yet */
-		hb_buffer_clear_contents(buf);
-	}
-
-	/* Cleanup */
-	hb_buffer_destroy(buf);
-	for (int i = 0; i < NUM_EXAMPLES; ++i)
-		hb_font_destroy(hb_ft_font[i]);
-
-	FT_Done_FreeType(ft_library);
-
-	oDrawer.Save();
-
-	return 0;
-}

Common/3dParty/harfbuzz/test/test.pro

@@ -1,19 +0,0 @@
-CONFIG -= qt
-TARGET = test
-TEMPLATE = app
-CONFIG += console
-CONFIG -= app_bundle
-
-CORE_ROOT_DIR = $$PWD/../../../../../core
-PWD_ROOT_DIR = $$PWD
-include($$CORE_ROOT_DIR/Common/base.pri)
-
-include($$CORE_ROOT_DIR/DesktopEditor/graphics/pro/freetype.pri)
-include($$CORE_ROOT_DIR/Common/3dParty/harfbuzz/harfbuzz.pri)
-
-SOURCES += main.cpp
-
-ADD_DEPENDENCY(UnicodeConverter, kernel, graphics)
-DESTDIR = $$PWD/build
-
-

Common/3dParty/html/css/src/CCompiledStyle.cpp

@@ -18,14 +18,14 @@ namespace NSCSS
 {
 	typedef std::map<std::wstring, std::wstring>::const_iterator styles_iterator;
 
-	CCompiledStyle::CCompiledStyle() : m_nDpi(96), m_UnitMeasure(Point), m_dCoreFontSize(DEFAULT_FONT_SIZE)
+	CCompiledStyle::CCompiledStyle() : m_nDpi(96), m_UnitMeasure(Point)
 	{}
 
 	CCompiledStyle::CCompiledStyle(const CCompiledStyle& oStyle) :
 		m_arParentsStyles(oStyle.m_arParentsStyles), m_sId(oStyle.m_sId),
-		m_nDpi(oStyle.m_nDpi), m_UnitMeasure(oStyle.m_UnitMeasure), m_dCoreFontSize(oStyle.m_dCoreFontSize),
+		m_nDpi(oStyle.m_nDpi), m_UnitMeasure(oStyle.m_UnitMeasure),
 		m_oFont(oStyle.m_oFont), m_oMargin(oStyle.m_oMargin), m_oPadding(oStyle.m_oPadding), m_oBackground(oStyle.m_oBackground),
-		m_oText(oStyle.m_oText), m_oBorder(oStyle.m_oBorder), m_oDisplay(oStyle.m_oDisplay), m_oTransform(oStyle.m_oTransform){}
+		m_oText(oStyle.m_oText), m_oBorder(oStyle.m_oBorder), m_oDisplay(oStyle.m_oDisplay){}
 
 	CCompiledStyle::~CCompiledStyle()
 	{
@@ -44,7 +44,6 @@ namespace NSCSS
 		m_oPadding      += oElement.m_oPadding;
 		m_oText         += oElement.m_oText;
 		m_oDisplay      += oElement.m_oDisplay;
-		m_oTransform    += oElement.m_oTransform;
 
 		if (!oElement.m_sId.empty())
 			m_sId += L'+' + oElement.m_sId;
@@ -67,7 +66,6 @@ namespace NSCSS
 		m_oPadding      = oElement.m_oPadding;
 		m_oText         = oElement.m_oText;
 		m_oDisplay      = oElement.m_oDisplay;
-		m_oTransform    = oElement.m_oTransform;
 
 		return *this;
 	}
@@ -80,8 +78,7 @@ namespace NSCSS
 		       m_oMargin         == oStyle.m_oMargin         &&
 		       m_oPadding        == oStyle.m_oPadding        &&
 		       m_oText           == oStyle.m_oText           &&
-		       m_oDisplay        == oStyle.m_oDisplay        &&
-		       m_oTransform      == oStyle.m_oTransform;
+		       m_oDisplay        == oStyle.m_oDisplay;
 	}
 
 	void CCompiledStyle::StyleEquation(CCompiledStyle &oFirstStyle, CCompiledStyle &oSecondStyle)
@@ -93,7 +90,6 @@ namespace NSCSS
 		NSProperties::CText      ::Equation(oFirstStyle.m_oText,       oSecondStyle.m_oText);
 		NSProperties::CBorder    ::Equation(oFirstStyle.m_oBorder,     oSecondStyle.m_oBorder);
 		NSProperties::CDisplay   ::Equation(oFirstStyle.m_oDisplay,    oSecondStyle.m_oDisplay);
-		NSProperties::CTransform ::Equation(oFirstStyle.m_oTransform,  oSecondStyle.m_oTransform);
 	}
 
 	void CCompiledStyle::SetDpi(const unsigned short &uiDpi)
@@ -120,10 +116,7 @@ namespace NSCSS
 	void CCompiledStyle::AddStyle(const std::map<std::wstring, std::wstring>& mStyle, const unsigned int unLevel, const bool& bHardMode)
 	{
 		const bool bIsThereBorder = (m_oBorder.Empty()) ? false : true;
-		const double dParentFontSize = (!m_oFont.GetSize().Empty()) ? m_oFont.GetSize().ToDouble(NSCSS::Point) : DEFAULT_FONT_SIZE;
-
-		if (0 == unLevel)
-			m_dCoreFontSize = dParentFontSize;
+		const double dFontSize = (!m_oFont.GetSize().Empty()) ? m_oFont.GetSize().ToDouble(NSCSS::Point) : DEFAULT_FONT_SIZE;
 
 		for (std::pair<std::wstring, std::wstring> pPropertie : mStyle)
 		{
@@ -135,15 +128,15 @@ namespace NSCSS
 				CASE(L"font"):
 				{
 					m_oFont.SetValue(pPropertie.second, unLevel, bHardMode);
-					m_oFont.UpdateSize(dParentFontSize, m_dCoreFontSize);
-					m_oFont.UpdateLineHeight(dParentFontSize, m_dCoreFontSize);
+					m_oFont.UpdateSize(dFontSize);
+					m_oFont.UpdateLineHeight(dFontSize);
 					break;
 				}
 				CASE(L"font-size"):
 				CASE(L"font-size-adjust"):
 				{
 					m_oFont.SetSize(pPropertie.second, unLevel, bHardMode);
-					m_oFont.UpdateSize(dParentFontSize, m_dCoreFontSize);
+					m_oFont.UpdateSize(dFontSize);
 					break;
 				}
 				CASE(L"font-stretch"):
@@ -183,7 +176,7 @@ namespace NSCSS
 						break;
 
 					m_oMargin.SetValues(pPropertie.second, unLevel, bHardMode);
-					m_oMargin.UpdateAll(dParentFontSize, m_dCoreFontSize);
+					m_oMargin.UpdateAll(dFontSize);
 					break;
 				}
 				CASE(L"margin-top"):
@@ -203,7 +196,7 @@ namespace NSCSS
 						break;
 
 					m_oMargin.SetRight(pPropertie.second, unLevel, bHardMode);
-					m_oMargin.UpdateRight(dParentFontSize, m_dCoreFontSize);
+					m_oMargin.UpdateRight(dFontSize);
 					break;
 				}
 				CASE(L"margin-bottom"):
@@ -213,7 +206,7 @@ namespace NSCSS
 						break;
 
 					m_oMargin.SetBottom(pPropertie.second, unLevel, bHardMode);
-					m_oMargin.UpdateBottom(dParentFontSize, m_dCoreFontSize);
+					m_oMargin.UpdateBottom(dFontSize);
 					break;
 				}
 				CASE(L"margin-left"):
@@ -224,7 +217,7 @@ namespace NSCSS
 						break;
 
 					m_oMargin.SetLeft(pPropertie.second, unLevel, bHardMode);
-					m_oMargin.UpdateLeft(dParentFontSize, m_dCoreFontSize);
+					m_oMargin.UpdateLeft(dFontSize);
 					break;
 				}
 				//PADDING
@@ -232,35 +225,35 @@ namespace NSCSS
 				CASE(L"mso-padding-alt"):
 				{
 					m_oPadding.SetValues(pPropertie.second, unLevel, bHardMode);
-					m_oPadding.UpdateAll(dParentFontSize, m_dCoreFontSize);
+					m_oPadding.UpdateAll(dFontSize);
 					break;
 				}
 				CASE(L"padding-top"):
 				CASE(L"mso-padding-top-alt"):
 				{
 					m_oPadding.SetTop(pPropertie.second, unLevel, bHardMode);
-					m_oPadding.UpdateTop(dParentFontSize, m_dCoreFontSize);
+					m_oPadding.UpdateTop(dFontSize);
 					break;
 				}
 				CASE(L"padding-right"):
 				CASE(L"mso-padding-right-alt"):
 				{
 					m_oPadding.SetRight(pPropertie.second, unLevel, bHardMode);
-					m_oPadding.UpdateRight(dParentFontSize, m_dCoreFontSize);
+					m_oPadding.UpdateRight(dFontSize);
 					break;
 				}
 				CASE(L"padding-bottom"):
 				CASE(L"mso-padding-bottom-alt"):
 				{
 					m_oPadding.SetBottom(pPropertie.second, unLevel, bHardMode);
-					m_oPadding.UpdateBottom(dParentFontSize, m_dCoreFontSize);
+					m_oPadding.UpdateBottom(dFontSize);
 					break;
 				}
 				CASE(L"padding-left"):
 				CASE(L"mso-padding-left-alt"):
 				{
 					m_oPadding.SetLeft(pPropertie.second, unLevel, bHardMode);
-					m_oPadding.UpdateLeft(dParentFontSize, m_dCoreFontSize);
+					m_oPadding.UpdateLeft(dFontSize);
 					break;
 				}
 				// TEXT
@@ -435,12 +428,6 @@ namespace NSCSS
 					m_oDisplay.SetVAlign(pPropertie.second, unLevel, bHardMode);
 					break;
 				}
-				//TRANSFORM
-				CASE(L"transform"):
-				{
-					m_oTransform.SetMatrix(pPropertie.second, unLevel, bHardMode);
-					break;
-				}
 				default: AddOtherStyle(pPropertie, unLevel, bHardMode);
 			}
 		}

Common/3dParty/html/css/src/CCompiledStyle.h

@@ -22,7 +22,6 @@ namespace NSCSS
 		unsigned short int m_nDpi;
 		UnitMeasure m_UnitMeasure;
 
-		double m_dCoreFontSize;
 	public:
 		NSProperties::CFont       m_oFont;
 		NSProperties::CIndent     m_oMargin;
@@ -31,12 +30,11 @@ namespace NSCSS
 		NSProperties::CText       m_oText;
 		NSProperties::CBorder     m_oBorder;
 		NSProperties::CDisplay    m_oDisplay;
-		NSProperties::CTransform  m_oTransform;
 
 		CCompiledStyle();
 		CCompiledStyle(const CCompiledStyle& oStyle);
 
-		virtual ~CCompiledStyle();
+		~CCompiledStyle();
 
 		void SetDpi(const unsigned short& uiDpi);
 		void SetUnitMeasure(const UnitMeasure& enUnitMeasure);

Common/3dParty/html/css/src/CCssCalculator.cpp

@@ -13,14 +13,14 @@ namespace NSCSS
 		delete m_pInternal;
 	}
 
-	CCompiledStyle CCssCalculator::GetCompiledStyle(const std::vector<CNode> &arSelectors) const
+	CCompiledStyle CCssCalculator::GetCompiledStyle(const std::vector<CNode> &arSelectors, const bool& bIsSettings, const UnitMeasure& unitMeasure) const
 	{
-		return m_pInternal->GetCompiledStyle(arSelectors);
+		return m_pInternal->GetCompiledStyle(arSelectors, bIsSettings, unitMeasure);
 	}
 
-	bool CCssCalculator::GetCompiledStyle(CCompiledStyle &oStyle, const std::vector<CNode> &arSelectors) const
+	bool CCssCalculator::GetCompiledStyle(CCompiledStyle &oStyle, const std::vector<CNode> &arSelectors, const bool &bIsSettings, const UnitMeasure &unitMeasure) const
 	{
-		return m_pInternal->GetCompiledStyle(oStyle, arSelectors);
+		return m_pInternal->GetCompiledStyle(oStyle, arSelectors, bIsSettings, unitMeasure);
 	}
 
 	std::wstring CCssCalculator::CalculateStyleId(const CNode& oNode)
@@ -48,11 +48,26 @@ namespace NSCSS
 		m_pInternal->AddStylesFromFile(wsFileName);
 	}
 
+	void CCssCalculator::SetUnitMeasure(const UnitMeasure& nType)
+	{
+		m_pInternal->SetUnitMeasure(nType);
+	}
+
 	void CCssCalculator::SetDpi(const unsigned short int& nValue)
 	{
 		m_pInternal->SetDpi(nValue);
 	}
 
+	void CCssCalculator::SetBodyTree(const CTree &oTree)
+	{
+		m_pInternal->SetBodyTree(oTree);
+	}
+
+	UnitMeasure CCssCalculator::GetUnitMeasure() const
+	{
+		return m_pInternal->GetUnitMeasure();
+	}
+
 	std::wstring CCssCalculator::GetEncoding() const
 	{
 		return m_pInternal->GetEncoding();
@@ -63,26 +78,6 @@ namespace NSCSS
 		return m_pInternal->GetDpi();
 	}
 
-	void CCssCalculator::ClearPageData()
-	{
-		m_pInternal->ClearPageData();
-	}
-
-	void CCssCalculator::ClearEmbeddedStyles()
-	{
-		m_pInternal->ClearEmbeddedStyles();
-	}
-
-	void CCssCalculator::ClearAllowedStyleFiles()
-	{
-		m_pInternal->ClearAllowedStyleFiles();
-	}
-
-	void CCssCalculator::ClearStylesFromFile(const std::wstring& wsFilePath)
-	{
-		m_pInternal->ClearStylesFromFile(wsFilePath);
-	}
-
 	void CCssCalculator::Clear()
 	{
 		m_pInternal->Clear();

Common/3dParty/html/css/src/CCssCalculator.h

@@ -19,8 +19,8 @@ namespace NSCSS
 		CCssCalculator();
 		~CCssCalculator();
 
-		CCompiledStyle GetCompiledStyle(const std::vector<CNode> &arSelectors) const;
-		bool GetCompiledStyle(CCompiledStyle& oStyle, const std::vector<CNode> &arSelectors) const;
+		CCompiledStyle GetCompiledStyle(const std::vector<CNode> &arSelectors, const bool& bIsSettings = false, const UnitMeasure& unitMeasure = Point) const;
+		bool GetCompiledStyle(CCompiledStyle& oStyle, const std::vector<CNode> &arSelectors, const bool& bIsSettings = false, const UnitMeasure& unitMeasure = Point) const;
 
 		std::wstring CalculateStyleId(const CNode& oNode);
 		bool CalculatePageStyle(NSProperties::CPage& oPageData, const std::vector<CNode> &arSelectors);
@@ -30,15 +30,14 @@ namespace NSCSS
 		void AddStyles        (const std::wstring& wsStyle);
 		void AddStylesFromFile(const std::wstring& wsFileName);
 
+		void SetUnitMeasure(const UnitMeasure& nType);
 		void SetDpi(const unsigned short int& nValue);
+		void SetBodyTree(const CTree &oTree);
 
+		UnitMeasure GetUnitMeasure() const;
 		std::wstring GetEncoding()   const;
 		unsigned short int GetDpi()  const;
 
-		void ClearPageData();
-		void ClearEmbeddedStyles();
-		void ClearAllowedStyleFiles();
-		void ClearStylesFromFile(const std::wstring& wsFilePath);
 		void Clear();
 	};
 }

Common/3dParty/html/css/src/CCssCalculator_Private.h

@@ -3,9 +3,11 @@
 
 #include <vector>
 #include <map>
-#include <set>
+#include <list>
+#include <functional>
 #include "CElement.h"
-#include "StyleProperties.h"
+#include "ConstValues.h"
+#include "CUnitMeasureConverter.h"
 #include "../../katana-parser/src/katana.h"
 
 #ifdef CSS_CALCULATOR_WITH_XHTML
@@ -14,43 +16,16 @@
 
 namespace NSCSS
 {
-	class CStyleStorage
+	class CCssCalculator_Private
 	{
-	public:
-		CStyleStorage();
-		~CStyleStorage();
+		unsigned short int m_nDpi;
+		unsigned short int m_nCountNodes;
+		UnitMeasure m_UnitMeasure;
 
-		void Clear();
+		std::list<std::wstring> m_arFiles;
 
-		void AddStyles(const std::string& sStyle);
-		void AddStyles(const std::wstring& wsStyle);
-		void AddStylesFromFile(const std::wstring& wsFileName);
+		std::map<std::wstring, CElement*> m_mData;
 
-		void ClearEmbeddedStyles();
-		void ClearAllowedStyleFiles();
-		void ClearStylesFromFile(const std::wstring& wsFileName);
-
-		#ifdef CSS_CALCULATOR_WITH_XHTML
-		void AddPageData(const std::wstring& wsPageName, const std::wstring& wsStyles);
-		void SetPageData(NSProperties::CPage& oPage, const std::map<std::wstring, std::wstring>& mData, unsigned int unLevel, bool bHardMode = false);
-		std::map<std::wstring, std::wstring> GetPageData(const std::wstring& wsPageName);
-		void ClearPageData();
-		#endif
-
-		const CElement* FindElement(const std::wstring& wsSelector);
-	private:
-		typedef struct
-		{
-			std::wstring m_wsStyleFilepath;
-			std::map<std::wstring, CElement*> m_mStyleData;
-		} TStyleFileData;
-
-		std::set<std::wstring> m_arEmptyStyleFiles;
-		std::set<std::wstring> m_arAllowedStyleFiles;
-		std::vector<TStyleFileData*> m_arStyleFiles;
-		std::map<std::wstring, CElement*> m_mEmbeddedStyleData;
-
-		#ifdef CSS_CALCULATOR_WITH_XHTML
 		typedef struct
 		{
 			std::vector<std::wstring>            m_wsNames;
@@ -58,14 +33,29 @@ namespace NSCSS
 		} TPageData;
 
 		std::vector<TPageData> m_arPageDatas;
+
+		std::map<StatistickElement, unsigned int> *m_mStatictics; // Количество повторений свойств id и style у селекторов
+
+		#ifdef CSS_CALCULATOR_WITH_XHTML
+		std::map<std::vector<CNode>, CCompiledStyle> m_mUsedStyles;
+		
+		std::map<std::wstring, std::wstring> GetPageData(const std::wstring& wsPageName);
+		void SetPageData(NSProperties::CPage& oPage, const std::map<std::wstring, std::wstring>& mData, unsigned int unLevel, bool bHardMode = false);
+
+		std::vector<std::wstring> CalculateAllNodes(const std::vector<CNode>& arSelectors);
+
+		void FindPrevAndKindElements(const CElement* pElement, const std::vector<std::wstring>& arNextNodes, std::vector<CElement*>& arFindedElements, const std::wstring& wsName, const std::vector<std::wstring>& arClasses = {});
+		std::vector<CElement*> FindElements(std::vector<std::wstring>& arNodes, std::vector<std::wstring>& arNextNodes, bool bIsSettings);
 		#endif
-	private:
-		void AddStyles(const std::string& sStyle, std::map<std::wstring, CElement*>& mStyleData);
 
-		void GetStylesheet(const KatanaStylesheet* oStylesheet, std::map<std::wstring, CElement*>& mStyleData);
-		void GetRule(const KatanaRule* oRule, std::map<std::wstring, CElement*>& mStyleData);
+		std::wstring m_sEncoding;
 
-		void GetStyleRule(const KatanaStyleRule* oRule, std::map<std::wstring, CElement*>& mStyleData);
+		void AddPageData(const std::wstring& wsPageName, const std::wstring& wsStyles);
+
+		void GetStylesheet(const KatanaStylesheet* oStylesheet);
+		void GetRule(const KatanaRule* oRule);
+
+		void GetStyleRule(const KatanaStyleRule* oRule);
 
 		std::wstring GetValueList(const KatanaArray* oValues);
 
@@ -75,60 +65,36 @@ namespace NSCSS
 		std::map<std::wstring, std::wstring> GetDeclarationList(const KatanaArray* oDeclarations) const;
 		std::pair<std::wstring, std::wstring> GetDeclaration(const KatanaDeclaration* oDecl) const;
 
-		void GetOutputData(KatanaOutput* oOutput, std::map<std::wstring, CElement*>& mStyleData);
+		void GetOutputData(KatanaOutput* oOutput);
 
-		const CElement* FindSelectorFromStyleData(const std::wstring& wsSelector, const std::map<std::wstring, CElement*>& mStyleData);
-	};
-
-	class CCssCalculator_Private
-	{
-		unsigned short int m_nDpi;
-		unsigned short int m_nCountNodes;
-
-		CStyleStorage m_oStyleStorage;
-
-		#ifdef CSS_CALCULATOR_WITH_XHTML
-		std::map<std::vector<CNode>, CCompiledStyle> m_mUsedStyles;
-
-		void SetPageData(NSProperties::CPage& oPage, const std::map<std::wstring, std::wstring>& mData, unsigned int unLevel, bool bHardMode = false);
-		std::map<std::wstring, std::wstring> GetPageData(const std::wstring &wsPageName);
-		#endif
-
-		void FindPrevAndKindElements(const CElement* pElement, const std::vector<std::wstring>& arNextNodes, std::vector<const CElement*>& arFindedElements, const std::wstring& wsName, const std::vector<std::wstring>& arClasses = {});
-
-		std::wstring m_sEncoding;
 	public:
 		CCssCalculator_Private();
 		~CCssCalculator_Private();
 
 		#ifdef CSS_CALCULATOR_WITH_XHTML
-		CCompiledStyle GetCompiledStyle(const std::vector<CNode> &arSelectors);
-		bool GetCompiledStyle(CCompiledStyle& oStyle, const std::vector<CNode> &arSelectors);
+		CCompiledStyle GetCompiledStyle(const std::vector<CNode> &arSelectors, const bool& bIsSettings = false, const UnitMeasure& unitMeasure = Point);
+		bool GetCompiledStyle(CCompiledStyle& oStyle, const std::vector<CNode> &arSelectors, const bool& bIsSettings = false, const UnitMeasure& unitMeasure = Point);
 
 		std::wstring CalculateStyleId(const CNode& oNode);
 		bool CalculatePageStyle(NSProperties::CPage& oPageData, const std::vector<CNode> &arSelectors);
-
-		void ClearPageData();
 		#endif
 
-		std::vector<std::wstring> CalculateAllNodes(const std::vector<CNode>& arSelectors);
-		std::vector<const CElement*> FindElements(std::vector<std::wstring>& arNodes, std::vector<std::wstring>& arNextNodes);
-
 		void AddStyles(const std::string& sStyle);
 		void AddStyles(const std::wstring& wsStyle);
 		void AddStylesFromFile(const std::wstring& wsFileName);
 
+		void SetUnitMeasure(const UnitMeasure& nType);
 		void SetDpi(unsigned short int nValue);
+		void SetBodyTree(const CTree &oTree);
 
+		UnitMeasure GetUnitMeasure() const;
 		std::wstring GetEncoding() const;
 		unsigned short int GetDpi() const;
 
-		void ClearEmbeddedStyles();
-		void ClearAllowedStyleFiles();
-		void ClearStylesFromFile(const std::wstring& wsFilePath);
-		void Clear();
-	};
+		const std::map<std::wstring, CElement*>* GetData() const;
 
-	inline bool IsTableElement(const std::wstring& wsNameTag);
+		void Clear();
+
+	};
 }
 #endif // CCSSCALCULATOR_PRIVATE_H

Common/3dParty/html/css/src/CElement.cpp

@@ -40,7 +40,6 @@ namespace NSCSS
 	{
 		m_sSelector = sSelector;
 		m_sFullSelector = m_sSelector;
-		UpdateWeight();
 	}
 
 	void NSCSS::CElement::AddPropertie(const std::wstring &sName, const std::wstring& sValue)
@@ -68,7 +67,6 @@ namespace NSCSS
 
 		m_arPrevElements.push_back(oPrevElement);
 		oPrevElement->m_sFullSelector += L' ' + m_sFullSelector;
-		UpdateWeight();
 	}
 
 	void CElement::AddKinElement(CElement *oKinElement)
@@ -78,7 +76,6 @@ namespace NSCSS
 
 		m_arKinElements.push_back(oKinElement);
 		oKinElement->m_sFullSelector += m_sFullSelector;
-		oKinElement->UpdateWeight();
 	}
 
 	std::map<std::wstring, std::wstring> CElement::GetStyle() const
@@ -233,14 +230,11 @@ namespace NSCSS
 		return NULL;
 	}
 
-	void CElement::UpdateWeight()
+	std::vector<unsigned short> CElement::GetWeight()
 	{
 		if (m_arWeight.empty())
 			m_arWeight = NS_STATIC_FUNCTIONS::GetWeightSelector(m_sFullSelector);
-	}
 
-	std::vector<unsigned short> CElement::GetWeight() const
-	{
 		return m_arWeight;
 	}
 

Common/3dParty/html/css/src/CElement.h

@@ -44,8 +44,7 @@ namespace NSCSS
 
 		CElement *FindPrevElement(const std::wstring& sSelector) const;
 
-		void UpdateWeight();
-		std::vector<unsigned short int> GetWeight() const;
+		std::vector<unsigned short int> GetWeight();
 		void IncreasedWeight();
 	};
 }

Common/3dParty/html/css/src/ConstValues.cpp

@@ -2,6 +2,29 @@
 
 namespace NSCSS
 {
+	bool StatistickElement::operator<(const StatistickElement &oStatistickElement) const
+	{
+		return sValue < oStatistickElement.sValue;
+	}
+
+	void CTree::Clear()
+	{
+		m_arrChild.clear();
+		m_oNode.Clear();
+	}
+
+	void CTree::CountingNumberRepetitions(const CTree &oTree, std::map<StatistickElement, unsigned int> &mStatictics)
+	{
+		if (!oTree.m_oNode.m_wsId.empty())
+			++mStatictics[StatistickElement{StatistickElement::IsId, L'#' + oTree.m_oNode.m_wsId}];
+				if (!oTree.m_oNode.m_wsStyle.empty())
+					++mStatictics[StatistickElement{StatistickElement::IsStyle, oTree.m_oNode.m_wsStyle}];
+
+		if (!oTree.m_arrChild.empty())
+			for (const CTree& oChildren : oTree.m_arrChild)
+				CountingNumberRepetitions(oChildren, mStatictics);
+	}
+
 	namespace NSConstValues
 	{
 		const std::map<std::wstring, std::wstring> COLORS

Common/3dParty/html/css/src/ConstValues.h

@@ -16,6 +16,28 @@ namespace NSCSS
 		ScalingDirectionY = 2
 	} ScalingDirection;
 
+	struct StatistickElement
+	{
+		enum TypeElement
+		{
+			IsStyle = 0,
+			IsId
+		} m_enType;
+		std::wstring sValue;
+
+		bool operator<(const StatistickElement& oStatistickElement) const;
+	};
+
+	struct CTree
+	{
+		NSCSS::CNode m_oNode;
+		std::vector<CTree> m_arrChild;
+
+		void Clear();
+
+		static void CountingNumberRepetitions(const CTree &oTree, std::map<StatistickElement, unsigned int> &mStatictics);
+	};
+
 	namespace NSConstValues
 	{
 		extern const std::map<std::wstring, std::wstring> COLORS;

Common/3dParty/html/css/src/StaticFunctions.cpp

@@ -48,6 +48,7 @@ namespace NS_STATIC_FUNCTIONS
 		if (sEncoding.empty())
 			sEncoding = "utf-8";
 
+
 		if (!sEncoding.empty() && sEncoding != "utf-8" && sEncoding != "UTF-8")
 		{
 			NSUnicodeConverter::CUnicodeConverter oConverter;

Common/3dParty/html/css/src/StyleProperties.cpp

@@ -513,9 +513,6 @@ namespace NSCSS
 				return (*static_cast<std::wstring*>(m_oValue)) == (*static_cast<std::wstring*>(oColor.m_oValue));
 			case ColorUrl:
 				return (*static_cast<CURL*>(m_oValue)) == (*static_cast<CURL*>(oColor.m_oValue));
-			case ColorContextStroke:
-			case ColorContextFill:
-				return false;
 		}
 	}
 
@@ -535,9 +532,6 @@ namespace NSCSS
 				return (*static_cast<std::wstring*>(m_oValue)) != (*static_cast<std::wstring*>(oColor.m_oValue));
 			case ColorUrl:
 				return (*static_cast<CURL*>(m_oValue)) != (*static_cast<CURL*>(oColor.m_oValue));
-			case ColorContextStroke:
-			case ColorContextFill:
-				return false;
 		}
 	}
 
@@ -567,9 +561,6 @@ namespace NSCSS
 				m_oValue = new CURL(*static_cast<CURL*>(oColor.m_oValue));
 				break;
 			}
-			case ColorContextStroke:
-			case ColorContextFill:
-				break;
 		}
 
 		return *this;
@@ -589,39 +580,6 @@ namespace NSCSS
 		: CValue(NULL, 0, false), m_oOpacity(1.), m_enType(ColorEmpty)
 	{}
 
-	CColor::CColor(const CColor& oColor)
-		: CValue(NULL, 0, false), m_oOpacity(oColor.m_oOpacity), m_enType(oColor.m_enType)
-	{
-		switch (m_enType)
-		{
-			case ColorRGB:
-			{
-				TRGB *pRGB = static_cast<TRGB*>(oColor.m_oValue);
-				m_oValue = new TRGB(*pRGB);
-				break;
-			}
-			case ColorHEX:
-			{
-				std::wstring* pValue = static_cast<std::wstring*>(oColor.m_oValue);
-				m_oValue = new std::wstring(*pValue);
-				break;
-			}
-			case ColorUrl:
-			{
-				CURL *pURL = static_cast<CURL*>(oColor.m_oValue);
-				m_oValue = new CURL(*pURL);
-				break;
-			}
-			default:
-			break;
-		}
-	}
-
-	CColor::~CColor()
-	{
-		Clear();
-	}
-
 	void CColor::SetEmpty(unsigned int unLevel)
 	{
 		Clear();
@@ -917,25 +875,6 @@ namespace NSCSS
 		}
 	}
 
-	std::wstring CColor::ToHEX() const
-	{
-		switch(m_enType)
-		{
-			case ColorRGB:
-			{
-				TRGB* pRGB = static_cast<TRGB*>(m_oValue);
-				return ConvertRGBtoHEX(*pRGB);
-			}
-			case ColorHEX:
-			{
-				std::wstring *pValue = static_cast<std::wstring*>(m_oValue);
-				return *pValue;
-			}
-			default:
-				return std::wstring();
-		}
-	}
-
 	std::wstring CColor::EquateToColor(const std::vector<std::pair<TRGB, std::wstring>> &arColors) const
 	{
 		if (arColors.empty())
@@ -2362,32 +2301,32 @@ namespace NSCSS
 		return m_oLeft.SetValue(dValue, unLevel, bHardMode);
 	}
 
-	void CIndent::UpdateAll(const double& dParentFontSize, const double& dCoreFontSize)
+	void CIndent::UpdateAll(double dFontSize)
 	{
-		UpdateTop   (dParentFontSize, dCoreFontSize);
-		UpdateRight (dParentFontSize, dCoreFontSize);
-		UpdateBottom(dParentFontSize, dCoreFontSize);
-		UpdateLeft  (dParentFontSize, dCoreFontSize);
+		UpdateTop   (dFontSize);
+		UpdateRight (dFontSize);
+		UpdateBottom(dFontSize);
+		UpdateLeft  (dFontSize);
 	}
 
-	void CIndent::UpdateTop(const double& dParentFontSize, const double& dCoreFontSize)
+	void CIndent::UpdateTop(double dFontSize)
 	{
-		UpdateSide(m_oTop, dParentFontSize, dCoreFontSize);
+		UpdateSide(m_oTop, dFontSize);
 	}
 
-	void CIndent::UpdateRight(const double& dParentFontSize, const double& dCoreFontSize)
+	void CIndent::UpdateRight(double dFontSize)
 	{
-		UpdateSide(m_oRight, dParentFontSize, dCoreFontSize);
+		UpdateSide(m_oRight, dFontSize);
 	}
 
-	void CIndent::UpdateBottom(const double& dParentFontSize, const double& dCoreFontSize)
+	void CIndent::UpdateBottom(double dFontSize)
 	{
-		UpdateSide(m_oBottom, dParentFontSize, dCoreFontSize);
+		UpdateSide(m_oBottom, dFontSize);
 	}
 
-	void CIndent::UpdateLeft(const double& dParentFontSize, const double& dCoreFontSize)
+	void CIndent::UpdateLeft(double dFontSize)
 	{
-		UpdateSide(m_oLeft, dParentFontSize, dCoreFontSize);
+		UpdateSide(m_oLeft, dFontSize);
 	}
 
 	const CDigit &CIndent::GetTop() const
@@ -2456,15 +2395,13 @@ namespace NSCSS
 		return bTopResult || bRightResult || bBottomResult || bLeftResult;
 	}
 	
-	void CIndent::UpdateSide(CDigit &oSide, const double& dParentFontSize, const double& dCoreFontSize)
+	void CIndent::UpdateSide(CDigit &oSide, double dFontSize)
 	{
 		if (oSide.Empty())
 			return;
 
-		if (NSCSS::Em == oSide.GetUnitMeasure())
-			oSide.ConvertTo(NSCSS::Twips, dParentFontSize);
-		else if (NSCSS::Rem == oSide.GetUnitMeasure())
-			oSide.ConvertTo(NSCSS::Twips, dCoreFontSize);
+		if (NSCSS::Em == oSide.GetUnitMeasure() || NSCSS::Rem == oSide.GetUnitMeasure())
+			oSide.ConvertTo(NSCSS::Twips, dFontSize);
 	}
 
 	// FONT
@@ -2707,20 +2644,16 @@ namespace NSCSS
 		                                    std::make_pair(L"700", L"bold"), std::make_pair(L"800", L"bold"), std::make_pair(L"900", L"bold")}, unLevel, bHardMode);
 	}
 
-	void CFont::UpdateSize(const double& dParentFontSize, const double& dCoreFontSize)
+	void CFont::UpdateSize(double dFontSize)
 	{
-		if (NSCSS::Em == m_oSize.GetUnitMeasure() || NSCSS::Percent == m_oSize.GetUnitMeasure())
-			m_oSize.ConvertTo(NSCSS::Point, dParentFontSize);
-		else if (NSCSS::Rem == m_oSize.GetUnitMeasure())
-			m_oSize.ConvertTo(NSCSS::Point, dCoreFontSize);
+		if (NSCSS::Em == m_oSize.GetUnitMeasure() || NSCSS::Rem == m_oSize.GetUnitMeasure() || NSCSS::Percent == m_oSize.GetUnitMeasure())
+			m_oSize.ConvertTo(NSCSS::Point, dFontSize);
 	}
 	
-	void CFont::UpdateLineHeight(const double& dParentFontSize, const double& dCoreFontSize)
+	void CFont::UpdateLineHeight(double dFontSize)
 	{
-		if (NSCSS::Em == m_oLineHeight.GetUnitMeasure())
-			m_oLineHeight.ConvertTo(NSCSS::Twips, dParentFontSize);
-		else if (NSCSS::Rem == m_oLineHeight.GetUnitMeasure())
-			m_oLineHeight.ConvertTo(NSCSS::Twips, dCoreFontSize);
+		if (NSCSS::Em == m_oLineHeight.GetUnitMeasure() || NSCSS::Rem == m_oLineHeight.GetUnitMeasure())
+			m_oLineHeight.ConvertTo(NSCSS::Twips, dFontSize);
 	}
 
 	bool CFont::Bold() const

Common/3dParty/html/css/src/StyleProperties.h

@@ -224,8 +224,6 @@ namespace NSCSS
 	{
 	public:
 		CColor();
-		CColor(const CColor& oColor);
-		~CColor();
 
 		bool SetValue(const std::wstring& wsValue, unsigned int unLevel = 0, bool bHardMode = true) override;
 		bool SetOpacity(const std::wstring& wsValue, unsigned int unLevel = 0, bool bHardMode = true);
@@ -242,7 +240,6 @@ namespace NSCSS
 		int ToInt() const override;
 		double ToDouble() const override;
 		std::wstring ToWString() const override;
-		std::wstring ToHEX() const;
 		std::wstring EquateToColor(const std::vector<std::pair<TRGB, std::wstring>>& arColors) const;
 		TRGB ToRGB() const;
 
@@ -659,11 +656,11 @@ namespace NSCSS
 		bool SetLeft   (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetLeft   (const double& dValue,        unsigned int unLevel, bool bHardMode = false);
 
-		void UpdateAll   (const double& dParentFontSize, const double& dCoreFontSize);
-		void UpdateTop   (const double& dParentFontSize, const double& dCoreFontSize);
-		void UpdateRight (const double& dParentFontSize, const double& dCoreFontSize);
-		void UpdateBottom(const double& dParentFontSize, const double& dCoreFontSize);
-		void UpdateLeft  (const double& dParentFontSize, const double& dCoreFontSize);
+		void UpdateAll   (double dFontSize);
+		void UpdateTop   (double dFontSize);
+		void UpdateRight (double dFontSize);
+		void UpdateBottom(double dFontSize);
+		void UpdateLeft  (double dFontSize);
 
 		const CDigit& GetTop   () const;
 		const CDigit& GetRight () const;
@@ -678,7 +675,7 @@ namespace NSCSS
 		bool     operator!=(const CIndent& oIndent) const;
 	private:
 		bool SetValues(const std::wstring& wsTopValue, const std::wstring& wsRightValue, const std::wstring& wsBottomValue, const std::wstring& wsLeftValue, unsigned int unLevel, bool bHardMode = false);
-		void UpdateSide(CDigit& oSide, const double& dParentFontSize, const double& dCoreFontSize);
+		void UpdateSide(CDigit& oSide, double dFontSize);
 
 		CDigit m_oLeft;
 		CDigit m_oTop;
@@ -705,8 +702,8 @@ namespace NSCSS
 		bool SetVariant       (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 		bool SetWeight        (const std::wstring& wsValue, unsigned int unLevel, bool bHardMode = false);
 
-		void UpdateSize(const double& dParentFontSize, const double& dCoreFontSize);
-		void UpdateLineHeight(const double& dParentFontSize, const double& dCoreFontSize);
+		void UpdateSize(double dFontSize);
+		void UpdateLineHeight(double dFontSize);
 
 		void Clear();
 

Common/3dParty/html/css/src/xhtml/CDocumentStyle.cpp

@@ -316,7 +316,7 @@ namespace NSCSS
 
 		std::wstring wsTextAlign{oStyle.m_oText.GetAlign().ToWString()};
 
-		if (wsTextAlign.empty())
+		if (wsTextAlign.empty() && bInTable)
 			wsTextAlign = oStyle.m_oDisplay.GetHAlign().ToWString();
 
 		oXmlElement.AddPropertiesInP(PProperties::P_Jc, wsTextAlign);
@@ -485,7 +485,7 @@ namespace NSCSS
 			return;
 
 		if (!oStyle.m_oFont.GetSize().Empty())
-			oXmlElement.AddPropertiesInR(RProperties::R_Sz, std::to_wstring(static_cast<int>(oStyle.m_oFont.GetSize().ToDouble(NSCSS::Point) * 2. * oStyle.m_oTransform.GetMatrix().GetFinalValue().sy() + 0.5))); // Значения шрифта увеличивает на 2
+			oXmlElement.AddPropertiesInR(RProperties::R_Sz, std::to_wstring(static_cast<int>(oStyle.m_oFont.GetSize().ToDouble(NSCSS::Point) * 2. + 0.5))); // Значения шрифта увеличивает на 2
 
 		if (oStyle.m_oText.GetDecoration().m_oLine.Underline())
 			oXmlElement.AddPropertiesInR(RProperties::R_U, (!oStyle.m_oText.GetDecoration().m_oStyle.Empty()) ? oStyle.m_oText.GetDecoration().m_oStyle.ToWString() : L"single");

Common/3dParty/html/fetch.py

@@ -25,5 +25,3 @@ if not base.is_dir("katana-parser"):
   base.replaceInFileUtf8(base_directory + "/katana-parser/src/tokenizer.c", "static inline bool2 katana_is_html_space(char c);", "static inline bool katana_is_html_space(char c);")
   base.replaceInFileUtf8(base_directory + "/katana-parser/src/parser.c", "katanaget_text(parser->scanner)", "/*katanaget_text(parser->scanner)*/\"error\"")
   base.replaceInFileUtf8(base_directory + "/katana-parser/src/parser.c", "#define KATANA_PARSER_STRING(literal) (KatanaParserString){", "#define KATANA_PARSER_STRING(literal) {")
-  # katana may not be able to handle an empty string correctly in some cases (bug#73485)
-  base.replaceInFileUtf8(base_directory + "/katana-parser/src/foundation.c", "size_t len = strlen(str);", "if (NULL == str)\n        return;\n    size_t len = strlen(str);")

Common/3dParty/html/htmltoxhtml.h

@@ -19,6 +19,7 @@ static std::string nonbreaking_inline  = "|a|abbr|acronym|b|bdo|big|cite|code|df
 static std::string empty_tags          = "|area|base|basefont|bgsound|br|command|col|embed|event-source|frame|hr|image|img|input|keygen|link|menuitem|meta|param|source|spacer|track|wbr|";
 static std::string preserve_whitespace = "|pre|textarea|script|style|";
 static std::string special_handling    = "|html|body|";
+static std::string no_entity_sub       = ""; //"|style|";
 static std::string treat_like_inline   = "|p|";
 
 static std::vector<std::string> html_tags = {"div","span","a","img","p","h1","h2","h3","h4","h5","h6",
@@ -54,11 +55,6 @@ static void replace_all(std::string& s, const std::string& s1, const std::string
 	}
 }
 
-static bool NodeIsUnprocessed(const std::string& wsTagName)
-{
-	return "xml" == wsTagName;
-}
-
 static bool IsUnckeckedNodes(const std::string& sValue)
 {
 	return unchecked_nodes_new.end() != std::find(unchecked_nodes_new.begin(), unchecked_nodes_new.end(), sValue);
@@ -435,25 +431,9 @@ static void substitute_xml_entities_into_text(std::string& text)
 	replace_all(text, ">", "&gt;");
 }
 
-// After running through Gumbo, the values of type "&#1;" are replaced with the corresponding code '0x01'
-// Since the attribute value does not use control characters (value <= 0x1F),
-// then just delete them, otherwise XmlUtils::CXmlLiteReader crashes on them.
-// bug#73486
-static void remove_control_symbols(std::string& text)
-{
-	std::string::iterator itFound = std::find_if(text.begin(), text.end(), [](char chValue){ return chValue <= 0x1F; });
-
-	while (itFound != text.end())
-	{
-		itFound = text.erase(itFound);
-		itFound = std::find_if(itFound, text.end(), [](char chValue){ return chValue <= 0x1F; });
-	}
-}
-
 // Заменяет сущности " в text
 static void substitute_xml_entities_into_attributes(std::string& text)
 {
-	remove_control_symbols(text);
 	substitute_xml_entities_into_text(text);
 	replace_all(text, "\"", "&quot;");
 }
@@ -501,7 +481,7 @@ static void build_doctype(GumboNode* node, NSStringUtils::CStringBuilderA& oBuil
 	}
 }
 
-static void build_attributes(const GumboVector* attribs, NSStringUtils::CStringBuilderA& atts)
+static void build_attributes(const GumboVector* attribs, bool no_entities, NSStringUtils::CStringBuilderA& atts)
 {
 	std::vector<std::string> arrRepeat;
 	for (size_t i = 0; i < attribs->length; ++i)
@@ -547,7 +527,8 @@ static void build_attributes(const GumboVector* attribs, NSStringUtils::CStringB
 		std::string qs ="\"";
 		atts.WriteString("=");
 		atts.WriteString(qs);
-		substitute_xml_entities_into_attributes(sVal);
+		if(!no_entities)
+			substitute_xml_entities_into_attributes(sVal);
 		atts.WriteString(sVal);
 		atts.WriteString(qs);
 	}
@@ -556,6 +537,7 @@ static void build_attributes(const GumboVector* attribs, NSStringUtils::CStringB
 static void prettyprint_contents(GumboNode* node, NSStringUtils::CStringBuilderA& contents, bool bCheckValidNode)
 {
 	std::string key             = "|" + get_tag_name(node) + "|";
+	bool no_entity_substitution = no_entity_sub.find(key) != std::string::npos;
 	bool keep_whitespace        = preserve_whitespace.find(key) != std::string::npos;
 	bool is_inline              = nonbreaking_inline.find(key) != std::string::npos;
 	bool is_like_inline         = treat_like_inline.find(key) != std::string::npos;
@@ -569,7 +551,8 @@ static void prettyprint_contents(GumboNode* node, NSStringUtils::CStringBuilderA
 		if (child->type == GUMBO_NODE_TEXT)
 		{
 			std::string val(child->v.text.text);
-			substitute_xml_entities_into_text(val);
+			if(!no_entity_substitution)
+				substitute_xml_entities_into_text(val);
 
 			// Избавление от FF
 			size_t found = val.find_first_of("\014");
@@ -609,9 +592,6 @@ static void prettyprint(GumboNode* node, NSStringUtils::CStringBuilderA& oBuilde
 
 	std::string tagname            = get_tag_name(node);
 
-	if (NodeIsUnprocessed(tagname))
-		return;
-
 	if (bCheckValidNode)
 		bCheckValidNode = !IsUnckeckedNodes(tagname);
 
@@ -625,6 +605,7 @@ static void prettyprint(GumboNode* node, NSStringUtils::CStringBuilderA& oBuilde
 	std::string closeTag           = "";
 	std::string key                = "|" + tagname + "|";
 	bool is_empty_tag              = empty_tags.find(key) != std::string::npos;
+	bool no_entity_substitution    = no_entity_sub.find(key) != std::string::npos;
 	
 	// determine closing tag type
 	if (is_empty_tag)
@@ -637,7 +618,7 @@ static void prettyprint(GumboNode* node, NSStringUtils::CStringBuilderA& oBuilde
 
 	// build attr string
 	const GumboVector* attribs = &node->v.element.attributes;
-	build_attributes(attribs, oBuilder);
+	build_attributes(attribs, no_entity_substitution, oBuilder);
 	oBuilder.WriteString(close + ">");
 
 	// prettyprint your contents

Common/OfficeFileErrorDescription.h

@@ -244,4 +244,3 @@
 #define AVS_FILEUTILS_ERROR_CONVERT_LIMITS								(AVS_ERROR_FIRST + AVS_FILEUTILS_ERROR_FIRST + 0x005d)
 #define AVS_FILEUTILS_ERROR_CONVERT_ROWLIMITS							(AVS_ERROR_FIRST + AVS_FILEUTILS_ERROR_FIRST + 0x005e)
 #define AVS_FILEUTILS_ERROR_CONVERT_DETECT								(AVS_ERROR_FIRST + AVS_FILEUTILS_ERROR_FIRST + 0x005f)
-#define AVS_FILEUTILS_ERROR_CONVERT_CELLLIMITS							(AVS_ERROR_FIRST + AVS_FILEUTILS_ERROR_FIRST + 0x0060)

Common/OfficeFileFormatChecker.h

@@ -68,7 +68,6 @@ public:
 	bool isOOXFormatFile(const std::wstring& fileName, bool unpacked = false);
 	bool isOpenOfficeFormatFile(const std::wstring& fileName, std::wstring& documentID);
 	bool isOnlyOfficeFormatFile(const std::wstring& fileName);
-	bool isMacFormatFile(const std::wstring& fileName);
 
 	bool isDocFormatFile(const std::wstring& fileName);
 	bool isXlsFormatFile(const std::wstring& fileName);
@@ -81,7 +80,6 @@ public:
 	bool isMS_MITCRYPTOFormatFile(POLE::Storage* storage, std::wstring& documentID);
 	bool isVbaProjectFile(POLE::Storage* storage);
 	bool isMS_OFFCRYPTOFormatFile(const std::wstring& fileName, std::wstring& documentID);
-	bool isHwpFile(POLE::Storage* storage);
 
 	bool iXmlFile(const std::wstring& fileName);
 
@@ -103,7 +101,6 @@ public:
 	bool isBinaryDoctFormatFile(unsigned char* pBuffer, int dwBytes);
 	bool isBinaryXlstFormatFile(unsigned char* pBuffer, int dwBytes);
 	bool isBinaryPpttFormatFile(unsigned char* pBuffer, int dwBytes);
-	bool isBinaryVsdtFormatFile(unsigned char* pBuffer, int dwBytes);
 
 	bool isDjvuFormatFile(unsigned char* pBuffer, int dwBytes);
 	bool isMobiFormatFile(unsigned char* pBuffer, int dwBytes);

Common/OfficeFileFormatChecker2.cpp

@@ -44,7 +44,6 @@
 
 #include "3dParty/pole/pole.h"
 #include <algorithm>
-#include <limits>
 
 #include "OfficeFileFormatDefines.h"
 
@@ -223,16 +222,6 @@ bool COfficeFileFormatChecker::isBinaryPpttFormatFile(unsigned char *pBuffer, in
 
 	return false;
 }
-bool COfficeFileFormatChecker::isBinaryVsdtFormatFile(unsigned char* pBuffer, int dwBytes)
-{
-	if (pBuffer == NULL)
-		return false;
-
-	if ((4 <= dwBytes) && ('V' == pBuffer[0] && 'S' == pBuffer[1] && 'D' == pBuffer[2] && 'Y' == pBuffer[3]))
-		return true;
-
-	return false;
-}
 bool COfficeFileFormatChecker::isPdfFormatFile(unsigned char *pBuffer, int dwBytes, std::wstring &documentID)
 {
 	if (pBuffer == NULL)
@@ -462,20 +451,6 @@ bool COfficeFileFormatChecker::isVbaProjectFile(POLE::Storage *storage)
 	}
 	return true;
 }
-bool COfficeFileFormatChecker::isHwpFile(POLE::Storage* storage)
-{
-	if (storage == NULL)
-		return false;
-
-	unsigned char buffer[10];
-
-	POLE::Stream stream(storage, L"BodyText/Section0");
-	if (stream.read(buffer, 10) < 1)
-	{
-		return false;
-	}	
-	return true;
-}
 bool COfficeFileFormatChecker::isXlsFormatFile(POLE::Storage *storage)
 {
 	if (storage == NULL)
@@ -746,11 +721,6 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring &_fileName)
 			nFileType = AVS_OFFICESTUDIO_FILE_OTHER_MS_VBAPROJECT;
 			return true;
 		}
-		else if (isHwpFile(&storage))
-		{
-			nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_HWP;
-			return true;
-		}
 	}
 	NSFile::CFileBinary file;
 	if (!file.OpenFile(fileName))
@@ -770,40 +740,13 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring &_fileName)
 	if (OfficeUtils.IsArchive(fileName) == S_OK && (false == isPdfFormatFile(bufferDetect, dwDetectdBytes, sDocumentID)))
 	{
 		if (isOOXFormatFile(fileName))
-        {
-            if (bufferDetect)
-                delete[] bufferDetect;
-            bufferDetect = NULL;
 			return true;
-        }
 		else if (isOpenOfficeFormatFile(fileName, sDocumentID))
-        {
-            if (bufferDetect)
-                delete[] bufferDetect;
-            bufferDetect = NULL;
-            return true;
-        }
-		else if (isOnlyOfficeFormatFile(fileName))
-        {
-            if (bufferDetect)
-                delete[] bufferDetect;
-            bufferDetect = NULL;
-            return true;
-        }
-		else if (isXpsFile(fileName))
-        {
-            if (bufferDetect)
-                delete[] bufferDetect;
-            bufferDetect = NULL;
-            return true;
-        }
-		else if (isMacFormatFile(fileName))
-		{
-			if (bufferDetect)
-				delete[] bufferDetect;
-			bufferDetect = NULL;
 			return true;
-		}
+		else if (isOnlyOfficeFormatFile(fileName))
+			return true;
+		else if (isXpsFile(fileName))
+			return true;
 	}
 
 	//-----------------------------------------------------------------------------------------------
@@ -827,10 +770,6 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring &_fileName)
 		{
 			nFileType = AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION;
 		}
-		else if (isBinaryVsdtFormatFile(bufferDetect, sizeRead)) // min size - 4
-		{
-			nFileType = AVS_OFFICESTUDIO_FILE_CANVAS_DRAW;
-		}
 		else if (isOOXFlatFormatFile(bufferDetect, sizeRead))
 		{
 			// nFileType;
@@ -940,16 +879,6 @@ bool COfficeFileFormatChecker::isOfficeFile(const std::wstring &_fileName)
 		nFileType = AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY;
 	else if (0 == sExt.compare(L".txt") || 0 == sExt.compare(L".xml") || 0 == sExt.compare(L".rtf")	|| 0 == sExt.compare(L".doc") || 0 == sExt.compare(L".docx") || 0 == sExt.compare(L".md"))
 		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_TXT;
-	else if (0 == sExt.compare(L".pages"))
-		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_PAGES;
-	else if (0 == sExt.compare(L".numbers"))
-		nFileType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_NUMBERS;
-	else if (0 == sExt.compare(L".key"))
-		nFileType = AVS_OFFICESTUDIO_FILE_PRESENTATION_KEY;
-	else if (0 == sExt.compare(L".hwp"))
-		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_HWP;
-	else if (0 == sExt.compare(L".hwpx"))
-		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_HWPX;
 
 	if (nFileType != AVS_OFFICESTUDIO_FILE_UNKNOWN)
 		return true;
@@ -1165,10 +1094,6 @@ bool COfficeFileFormatChecker::isOnlyOfficeFormatFile(const std::wstring &fileNa
 		{
 			nFileType = AVS_OFFICESTUDIO_FILE_TEAMLAB_PPTY;
 		}
-		else if (isBinaryVsdtFormatFile(pBuffer, nBufferSize))
-		{
-			nFileType = AVS_OFFICESTUDIO_FILE_TEAMLAB_VSDY;
-		}
 
 		delete[] pBuffer;
 		pBuffer = NULL;
@@ -1178,222 +1103,6 @@ bool COfficeFileFormatChecker::isOnlyOfficeFormatFile(const std::wstring &fileNa
 	}
 	return false;
 }
-
-struct TIWAField
-{
-	size_t m_unStart;
-	size_t m_unEnd;
-	unsigned m_uIndex;
-	unsigned m_unWireType;
-	uint64_t m_oValue;
-};
-
-bool ReadUVar(BYTE* pBuffer, size_t unEndPos, size_t& unPos, uint64_t& unValue)
-{
-	std::vector<unsigned char> arBytes;
-	arBytes.reserve(8);
-
-	unValue = 0;
-
-	bool bNext = true;
-	while (unPos < unEndPos && bNext)
-	{
-		const unsigned char c = pBuffer[unPos++];
-		arBytes.push_back((unsigned char)(c & ~0x80));
-		bNext = c & 0x80;
-	}
-
-	if (bNext && unPos == unEndPos)
-		return false;
-
-	for (std::vector<unsigned char>::const_reverse_iterator it = arBytes.rbegin(); it != arBytes.rend(); ++it)
-	{
-		if (std::numeric_limits<uint64_t>::max() >> 7 < unValue ||
-		    std::numeric_limits<uint64_t>::max() - (unValue << 7) < *it) // overflow
-		return false;
-
-		unValue = (unValue << 7) + *it;
-	}
-
-	return true;
-}
-
-bool ReadIWAField(BYTE* pBuffer, size_t unEndPos, size_t& unPos, TIWAField& oIWAField)
-{
-	if (NULL == pBuffer || unPos + 2 > unEndPos)
-		return false;
-
-	unsigned uSpec;
-
-	uSpec = (unsigned)pBuffer[unPos++];
-	oIWAField.m_unWireType = uSpec & 0x7;
-
-	oIWAField.m_unStart = unPos;
-
-	switch (oIWAField.m_unWireType)
-	{
-		case 0:
-		{
-			if (!ReadUVar(pBuffer, unEndPos, unPos, oIWAField.m_oValue))
-				return false;
-
-			break;
-		}
-		case 1:
-		{
-			unPos += 4;
-			break;
-		}
-		case 2:
-		{
-			uint64_t unLen;
-			if (!ReadUVar(pBuffer, unEndPos, unPos, unLen) || unPos + unLen > unEndPos)
-				return false;
-
-			oIWAField.m_unStart = unPos;
-			unPos += unLen;
-			break;
-		}
-		case 5:
-		{
-			unPos += 2;
-			break;
-		}
-		default:
-			return false;
-	}
-
-	oIWAField.m_unEnd = unPos;
-	oIWAField.m_uIndex = uSpec >> 3;
-
-	return true;
-}
-
-bool DetectIWorkFormat(const std::wstring& fileName, int &nType)
-{
-	COfficeUtils OfficeUtils(NULL);
-
-	ULONG unSize = 0;
-	BYTE* pBuffer = NULL;
-
-	HRESULT hresult = OfficeUtils.LoadFileFromArchive(fileName, L"Index/Document.iwa", &pBuffer, unSize);
-
-	if (hresult != S_OK || NULL == pBuffer)
-		return false;
-
-	#define CLEAR_BUFFER_AND_RETURN(return_value)\
-	do{\
-		delete[] pBuffer;\
-		return return_value;\
-	}while(false)
-
-	if (unSize < 13)
-		CLEAR_BUFFER_AND_RETURN(false);
-
-	size_t uPos = 6;
-
-	for (; uPos < 12; ++uPos)
-	{
-		if (0x08 == pBuffer[uPos] && 0x01 == pBuffer[uPos + 1])
-		{
-			--uPos;
-			break;
-		}
-	}
-
-	if (12 == uPos)
-		CLEAR_BUFFER_AND_RETURN(false);
-
-	uint64_t unHeaderLen;
-	if (!ReadUVar(pBuffer, unSize, uPos, unHeaderLen))
-		CLEAR_BUFFER_AND_RETURN(false);
-
-	const size_t uStartPos = uPos;
-
-	if (unHeaderLen < 8 || unSize < unHeaderLen + uStartPos)
-		CLEAR_BUFFER_AND_RETURN(false);
-
-	uPos += 2;
-
-	TIWAField oMessageField;
-
-	if (!ReadIWAField(pBuffer, uStartPos + unHeaderLen, uPos, oMessageField) || 2 != oMessageField.m_unWireType ||
-	    2 != oMessageField.m_uIndex)
-		CLEAR_BUFFER_AND_RETURN(false);
-
-	size_t uSubPos = oMessageField.m_unStart;
-	TIWAField oField;
-
-	if (!ReadIWAField(pBuffer, oMessageField.m_unEnd, uSubPos, oField) || 0 != oField.m_unWireType ||
-	    1 != oField.m_uIndex)
-		CLEAR_BUFFER_AND_RETURN(false);
-
-	switch (oField.m_oValue)
-	{
-		case 1:
-		{
-			uint32_t unDataLen = 0;
-
-			TIWAField oTempField;
-			if (ReadIWAField(pBuffer, oMessageField.m_unEnd, uSubPos, oTempField) &&
-			    ReadIWAField(pBuffer, oMessageField.m_unEnd, uSubPos, oTempField) && 0 == oTempField.m_unWireType &&
-			    3 == oTempField.m_uIndex)
-				unDataLen += oTempField.m_oValue;
-
-			size_t unTempPos = uStartPos + unHeaderLen;
-
-			// keynote: presentation ref in 2
-			// number: sheet ref in 1
-			if (ReadIWAField(pBuffer, uStartPos + unDataLen, unTempPos, oTempField) &&
-			    (2 != oTempField.m_unWireType || 1 != oTempField.m_uIndex || oTempField.m_unEnd - oTempField.m_unStart < 2))
-			{
-				nType = AVS_OFFICESTUDIO_FILE_PRESENTATION_KEY;
-				CLEAR_BUFFER_AND_RETURN(true);
-			}
-			else if (ReadIWAField(pBuffer, uStartPos + unDataLen, unTempPos, oTempField) &&
-			        (2 != oTempField.m_unWireType || 2 != oTempField.m_uIndex || oTempField.m_unEnd - oTempField.m_unStart < 2))
-			{
-				nType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_NUMBERS;
-				CLEAR_BUFFER_AND_RETURN(true);
-			}
-
-			break;
-		}
-		case 10000:
-		{
-			nType = AVS_OFFICESTUDIO_FILE_DOCUMENT_PAGES;
-			CLEAR_BUFFER_AND_RETURN(true);
-		}
-	}
-
-	CLEAR_BUFFER_AND_RETURN(false);
-}
-
-bool COfficeFileFormatChecker::isMacFormatFile(const std::wstring& fileName)
-{
-	if (DetectIWorkFormat(fileName, nFileType))
-		return true;
-
-	std::wstring::size_type nExtPos = fileName.rfind(L'.');
-	std::wstring sExt = L"unknown";
-
-	if (nExtPos != std::wstring::npos)
-		sExt = fileName.substr(nExtPos);
-
-	std::transform(sExt.begin(), sExt.end(), sExt.begin(), tolower);
-
-	if (0 == sExt.compare(L".pages"))
-		nFileType = AVS_OFFICESTUDIO_FILE_DOCUMENT_PAGES;
-	else if (0 == sExt.compare(L".numbers"))
-		nFileType = AVS_OFFICESTUDIO_FILE_SPREADSHEET_NUMBERS;
-	else if (0 == sExt.compare(L".key"))
-		nFileType = AVS_OFFICESTUDIO_FILE_PRESENTATION_KEY;
-	else
-		return false;
-
-	return true;
-}
-
 bool COfficeFileFormatChecker::isOpenOfficeFormatFile(const std::wstring &fileName, std::wstring &documentID)
 {
 	documentID.clear();
@@ -1636,7 +1345,6 @@ std::wstring COfficeFileFormatChecker::GetExtensionByType(int type)
 	case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOTM:
 		return L".dotm";
 	case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOC:
-	case AVS_OFFICESTUDIO_FILE_DOCUMENT_DOC_FLAT:
 		return L".doc";
 	case AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT:
 		return L".odt";
@@ -1679,8 +1387,6 @@ std::wstring COfficeFileFormatChecker::GetExtensionByType(int type)
 		return L".fodp";
 	case AVS_OFFICESTUDIO_FILE_PRESENTATION_OTP:
 		return L".otp";
-	case AVS_OFFICESTUDIO_FILE_PRESENTATION_ODG:
-		return L".odg";
 
 	case AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX:
 		return L".xlsx";
@@ -1753,15 +1459,12 @@ std::wstring COfficeFileFormatChecker::GetExtensionByType(int type)
 	case AVS_OFFICESTUDIO_FILE_CANVAS_WORD:
 	case AVS_OFFICESTUDIO_FILE_CANVAS_SPREADSHEET:
 	case AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION:
-	case AVS_OFFICESTUDIO_FILE_CANVAS_DRAW:
 		return L".bin";
 	case AVS_OFFICESTUDIO_FILE_OTHER_OLD_DOCUMENT:
 	case AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY:
 		return L".doct";
 	case AVS_OFFICESTUDIO_FILE_TEAMLAB_XLSY:
 		return L".xlst";
-	case AVS_OFFICESTUDIO_FILE_TEAMLAB_VSDY:
-		return L".vsdt";
 	case AVS_OFFICESTUDIO_FILE_OTHER_OLD_PRESENTATION:
 	case AVS_OFFICESTUDIO_FILE_OTHER_OLD_DRAWING:
 	case AVS_OFFICESTUDIO_FILE_TEAMLAB_PPTY:
@@ -1850,8 +1553,6 @@ int COfficeFileFormatChecker::GetFormatByExtension(const std::wstring &sExt)
 		return AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP_FLAT;
 	if (L".otp" == ext)
 		return AVS_OFFICESTUDIO_FILE_PRESENTATION_OTP;
-	if (L".odg" == ext)
-		return AVS_OFFICESTUDIO_FILE_PRESENTATION_ODG;
 
 	if (L".xlsx" == ext)
 		return AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX;
@@ -1925,8 +1626,6 @@ int COfficeFileFormatChecker::GetFormatByExtension(const std::wstring &sExt)
 		return AVS_OFFICESTUDIO_FILE_TEAMLAB_XLSY;
 	if (L".pptt" == ext)
 		return AVS_OFFICESTUDIO_FILE_TEAMLAB_PPTY;
-	if (L".vsdt" == ext)
-		return AVS_OFFICESTUDIO_FILE_TEAMLAB_VSDY;
 
 	if (L".vsdx" == ext)
 		return AVS_OFFICESTUDIO_FILE_DRAW_VSDX;

Common/OfficeFileFormats.h

@@ -56,9 +56,6 @@
 #define AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM			AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0015
 #define AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCXF			AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0016
 #define AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM_PDF		AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0017
-#define AVS_OFFICESTUDIO_FILE_DOCUMENT_PAGES			AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0018
-#define AVS_OFFICESTUDIO_FILE_DOCUMENT_HWP				AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0019
-#define AVS_OFFICESTUDIO_FILE_DOCUMENT_HWPX				AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0020
 
 #define AVS_OFFICESTUDIO_FILE_DOCUMENT_XML				AVS_OFFICESTUDIO_FILE_DOCUMENT + 0x0030
 
@@ -75,7 +72,6 @@
 #define AVS_OFFICESTUDIO_FILE_PRESENTATION_OTP			AVS_OFFICESTUDIO_FILE_PRESENTATION + 0x000a
 #define AVS_OFFICESTUDIO_FILE_PRESENTATION_PPTX_PACKAGE	AVS_OFFICESTUDIO_FILE_PRESENTATION + 0x000b
 #define AVS_OFFICESTUDIO_FILE_PRESENTATION_ODG			AVS_OFFICESTUDIO_FILE_PRESENTATION + 0x000c
-#define AVS_OFFICESTUDIO_FILE_PRESENTATION_KEY			AVS_OFFICESTUDIO_FILE_PRESENTATION + 0x000d
 
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET				0x0100
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX			AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x0001
@@ -91,7 +87,6 @@
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_OTS			AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x000a
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX_FLAT		AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x000b
 #define AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX_PACKAGE	AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x000c
-#define AVS_OFFICESTUDIO_FILE_SPREADSHEET_NUMBERS		AVS_OFFICESTUDIO_FILE_SPREADSHEET + 0x000d
 
 #define AVS_OFFICESTUDIO_FILE_CROSSPLATFORM				0x0200
 #define AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF			AVS_OFFICESTUDIO_FILE_CROSSPLATFORM + 0x0001
@@ -138,14 +133,12 @@
 #define AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY				AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0001
 #define AVS_OFFICESTUDIO_FILE_TEAMLAB_XLSY				AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0002
 #define AVS_OFFICESTUDIO_FILE_TEAMLAB_PPTY				AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0003
-#define AVS_OFFICESTUDIO_FILE_TEAMLAB_VSDY				AVS_OFFICESTUDIO_FILE_TEAMLAB + 0x0004
 
 #define AVS_OFFICESTUDIO_FILE_CANVAS					0x2000
 #define AVS_OFFICESTUDIO_FILE_CANVAS_WORD				AVS_OFFICESTUDIO_FILE_CANVAS + 0x0001
 #define AVS_OFFICESTUDIO_FILE_CANVAS_SPREADSHEET		AVS_OFFICESTUDIO_FILE_CANVAS + 0x0002
 #define AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION		AVS_OFFICESTUDIO_FILE_CANVAS + 0x0003
 #define AVS_OFFICESTUDIO_FILE_CANVAS_PDF				AVS_OFFICESTUDIO_FILE_CANVAS + 0x0004
-#define AVS_OFFICESTUDIO_FILE_CANVAS_DRAW				AVS_OFFICESTUDIO_FILE_CANVAS + 0x0005
 
 #define AVS_OFFICESTUDIO_FILE_DRAW						0x4000
 #define AVS_OFFICESTUDIO_FILE_DRAW_VSDX					AVS_OFFICESTUDIO_FILE_DRAW + 0x0001
@@ -153,4 +146,4 @@
 #define AVS_OFFICESTUDIO_FILE_DRAW_VSTX					AVS_OFFICESTUDIO_FILE_DRAW + 0x0003
 #define AVS_OFFICESTUDIO_FILE_DRAW_VSDM					AVS_OFFICESTUDIO_FILE_DRAW + 0x0004
 #define AVS_OFFICESTUDIO_FILE_DRAW_VSSM					AVS_OFFICESTUDIO_FILE_DRAW + 0x0005
-#define AVS_OFFICESTUDIO_FILE_DRAW_VSTM					AVS_OFFICESTUDIO_FILE_DRAW + 0x0006
+#define AVS_OFFICESTUDIO_FILE_DRAW_VSTM					AVS_OFFICESTUDIO_FILE_DRAW + 0x0006

Common/js/logging.h

@@ -4,7 +4,6 @@
 #include <stdio.h>
 #define LOG_BUFFER_SIZE 1000
 
-// not intended for use in production. only for testing/debugging purposes
 namespace Logging
 {
 void logBytes(char* name, unsigned char* str, int len)

DesktopEditor/agg-2.4/include/agg_pixfmt_rgba.h

@@ -207,9 +207,9 @@ namespace agg
 			}
 
 			p[Order::A] = (value_type)((alpha + a) - ((alpha * a + base_mask) >> base_shift));
-			if (r != cr) p[Order::R] = (value_type)((alpha * cr + a * r - ((a * r * alpha + base_mask) >> base_shift)) / p[Order::A]);
-			if (g != cg) p[Order::G] = (value_type)((alpha * cg + a * g - ((a * g * alpha + base_mask) >> base_shift)) / p[Order::A]);
-			if (b != cb) p[Order::B] = (value_type)((alpha * cb + a * b - ((a * b * alpha + base_mask) >> base_shift)) / p[Order::A]);
+			p[Order::R] = (value_type)((alpha * cr + a * r - ((a * r * alpha + base_mask) >> base_shift)) / p[Order::A]);
+			p[Order::G] = (value_type)((alpha * cg + a * g - ((a * g * alpha + base_mask) >> base_shift)) / p[Order::A]);
+			p[Order::B] = (value_type)((alpha * cb + a * b - ((a * b * alpha + base_mask) >> base_shift)) / p[Order::A]);
 		}
 
 		static AGG_INLINE void blend_pix_subpix(value_type* p,

DesktopEditor/agg-2.4/include/test_grads/custom_gradients.h

@@ -847,10 +847,40 @@ namespace agg
 			if (calculate_tensor_coefs)
 				calculate_tensor();
 
+			float minxres = m_oGradientInfo.shading.patch[0][0].x;
+			float minyres = m_oGradientInfo.shading.patch[0][0].y;
+			float maxxres = m_oGradientInfo.shading.patch[0][0].x;
+			float maxyres = m_oGradientInfo.shading.patch[0][0].y;
+			for (int i = 0; i < 4; i++)
+			{
+				for (int j = 0; j < 4; j++)
+				{
+					if (m_oGradientInfo.shading.patch[i][j].x > maxxres)
+					{
+						maxxres = m_oGradientInfo.shading.patch[i][j].x;
+					}
+					if (m_oGradientInfo.shading.patch[i][j].y > maxyres)
+					{
+						maxyres = m_oGradientInfo.shading.patch[i][j].y;
+					}
+					if (m_oGradientInfo.shading.patch[i][j].x < minxres)
+					{
+						minxres = m_oGradientInfo.shading.patch[i][j].x;
+					}
+					if (m_oGradientInfo.shading.patch[i][j].y < minyres)
+					{
+						minyres = m_oGradientInfo.shading.patch[i][j].y;
+					}
+				}
+			}
+
+			RES = std::max(1.0f, std::max(maxxres - minxres, maxyres - minyres) / 3);
+			float delta = 1.0 / RES;
 			float u = 0, v = 0;
 			auto start_p = get_p_curve(u, v);
 			xmax_curve = xmin_curve = start_p.x;
 			ymax_curve = ymin_curve = start_p.y;
+			precalc = std::vector<std::vector<ColorT>>(RES, std::vector<ColorT>(RES, {0, 0, 0, 0}));
 
 			/*
 			 * Небольшая оптимизация основанная на том, что данная фигура не выходит за границы своих опорных точек.
@@ -888,7 +918,7 @@ namespace agg
 				RES = nRES;
 			}
 			precalc = std::vector<std::vector<ColorT>>(RES, std::vector<ColorT>(RES, {0, 0, 0, 0}));
-			float delta = 1.0f / RES;
+			delta = 1.0f / RES;
 			std::vector<std::pair<int, int>> next_indexes(RES + 1);
 			u = 0;
 			for (int i = 0; i < RES; ++i)
@@ -926,6 +956,8 @@ namespace agg
 		}
 		ColorT ifswapRGB(const ColorT &c)
 		{
+
+
 			if (m_bSwapRGB) {
 				return c;
 			}

DesktopEditor/common/Base64.cpp

@@ -250,123 +250,3 @@ namespace NSBase64
 		return Base64DecodeBase(szSrc, nSrcLen, pbDest, pnDestLen);
 	}
 }
-
-#include <cstring>
-namespace NSBase32
-{
-	const unsigned char PADDING_CHAR_32 = '=';
-
-	inline void pad(unsigned char* buf, int len)
-	{
-		for (int i = 0; i < len; i++)
-			buf[i] = PADDING_CHAR_32;
-	}
-	inline unsigned char shift_right(unsigned char byte, signed char offset)
-	{
-		if (offset > 0)
-			return byte >>  offset;
-		else
-			return byte << -offset;
-	}
-	inline unsigned char shift_left(unsigned char byte, signed char offset)
-	{
-		return shift_right(byte, - offset);
-	}
-
-	unsigned char encode_char(unsigned char c)
-	{
-		static unsigned char base32[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
-		return base32[c & 0x1F];
-	}
-
-	int decode_char(unsigned char c)
-	{
-		char retval = -2;
-
-		if (c >= 'A' && c <= 'Z')
-			retval = c - 'A';
-		else if (c >= '2' && c <= '7')
-			retval = c - '2' + 26;
-		else if (c == PADDING_CHAR_32)
-			retval = -1;
-
-		return  retval;
-	}
-
-	int decode_sequence(const unsigned char* coded, unsigned char* plain)
-	{
-		plain[0] = 0;
-		for (int block = 0; block < 8; block++)
-		{
-			int offset = (8 - 5 - (5*block) % 8);
-			int octet = (block*5) / 8;
-
-			int c = decode_char(coded[block]);
-			if (c < 0)
-				return c;
-
-			plain[octet] |= shift_left(c, offset);
-			if (offset < 0)
-			{  // does this block overflows to next octet?
-				plain[octet+1] = shift_left(c, 8 + offset);
-			}
-		}
-		return 5;
-	}
-
-	bool Decode(unsigned char* in, int inLen, unsigned char* out)
-	{
-		for (size_t i = 0, j = 0; (i + 8) <= inLen; i += 8, j += 5)
-		{
-			int n = decode_sequence(&in[i], &out[j]);
-			if (n == -2)
-				return false;
-			if (n < 5)
-				break;
-		}
-		return true;
-	}
-
-	void encode_sequence(const unsigned char* plain, int len, unsigned char* coded)
-	{
-		for (int block = 0; block < 8; block++)
-		{
-			int octet = (block*5) / 8;
-			int junk = (8 - 5 - (5*block) % 8);
-
-			if (octet >= len)
-			{
-				pad(&coded[block], 8 - block);
-				return;
-			}
-
-			unsigned char c = shift_right(plain[octet], junk);  // first part
-
-			if (junk < 0  // is there a second part?
-				&&  octet < len - 1)  // is there still something to read?
-			{
-				c |= shift_right(plain[octet+1], 8 + junk);
-			}
-			coded[block] = encode_char(c);
-		}
-	}
-
-	bool Encode(unsigned char* src, int len, unsigned char* dst)
-	{
-		for (int i = 0, j = 0; i < len; i += 5, j += 8)
-		{
-			int tmpLen = len - i;
-			encode_sequence(&src[i], tmpLen > 5 ? 5 : tmpLen, &dst[j]);
-		}
-		return true;
-	}
-
-	int  DecodeGetRequiredLength(int bytes)
-	{
-		return (((bytes)/8)*5);
-	}
-	int  EncodeGetRequiredLength(int bytes)
-	{
-		return (((bytes)/5)*8 + ((bytes) % 5 ? 8 : 0));
-	}
-}

DesktopEditor/common/Base64.h

@@ -58,13 +58,4 @@ namespace NSBase64
 	KERNEL_DECL int Base64Decode(const wchar_t* szSrc, int nSrcLen, BYTE *pbDest, int *pnDestLen);
 }
 
-namespace NSBase32
-{
-	KERNEL_DECL bool Decode(unsigned char* in, int inLen, unsigned char* out);
-	KERNEL_DECL bool Encode(unsigned char* in, int inLen, unsigned char* out);
-
-	KERNEL_DECL int  DecodeGetRequiredLength(int bytes);
-	KERNEL_DECL int  EncodeGetRequiredLength(int bytes);
-}
-
 #endif//_BUILD_BASE64_CROSSPLATFORM_DEFINE

DesktopEditor/common/File.cpp

@@ -1535,11 +1535,6 @@ namespace NSFile
 		return bIsSuccess;
 	}
 
-	bool CFileBinary::IsGlobalTempPathUse()
-	{
-		return g_overrideTmpPath.empty() ? false : true;
-	}
-
 	std::wstring CFileBinary::GetTempPath()
 	{
 		if (!g_overrideTmpPath.empty())

DesktopEditor/common/File.h

@@ -189,7 +189,6 @@ namespace NSFile
 
 		static void SetTempPath(const std::wstring& strTempPath);
 		static std::wstring GetTempPath();
-		static bool IsGlobalTempPathUse();
 
 		static std::wstring CreateTempFileWithUniqueName(const std::wstring& strFolderPathRoot, const std::wstring& Prefix);
 		static bool OpenTempFile(std::wstring *pwsName, FILE **ppFile, wchar_t *wsMode, wchar_t *wsExt, wchar_t *wsFolder, wchar_t* wsName = NULL);

DesktopEditor/common/StringBuilder.cpp

@@ -682,10 +682,9 @@ namespace NSStringUtils
 		}
 		if (val < 0)
 		{
-			if (val == -2147483648)
+			val = -val;
+			if (val < 0)
 				val = 2147483647;
-			else
-				val = -val;
 
 			*m_pDataCur++ = (wchar_t)'-';
 			++m_lSizeCur;

DesktopEditor/cximage/png/pngpriv.h

@@ -332,7 +332,6 @@
     *  DBL_MAX  Maximum floating point number (can be set to an arbitrary value)
     */
 #  include <float.h>
-#  include <math.h>
 
 #  if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
     defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)

DesktopEditor/doctrenderer/addon/docbuilder_addon.h

@@ -1,61 +0,0 @@
-/*
- * (c) Copyright Ascensio System SIA 2010-2023
- *
- * This program is a free software product. You can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License (AGPL)
- * version 3 as published by the Free Software Foundation. In accordance with
- * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
- * that Ascensio System SIA expressly excludes the warranty of non-infringement
- * of any third-party rights.
- *
- * This program is distributed WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
- * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
- *
- * You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
- * street, Riga, Latvia, EU, LV-1050.
- *
- * The  interactive user interfaces in modified source and object code versions
- * of the Program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU AGPL version 3.
- *
- * Pursuant to Section 7(b) of the License you must retain the original Product
- * logo when distributing the program. Pursuant to Section 7(e) we decline to
- * grant you any rights under trademark law for use of our trademarks.
- *
- * All the Product's GUI elements, including illustrations and icon sets, as
- * well as technical writing content are licensed under the terms of the
- * Creative Commons Attribution-ShareAlike 4.0 International. See the License
- * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
- *
- */
-#ifndef DOC_BUILDER_ADDON_PRIVATE
-#define DOC_BUILDER_ADDON_PRIVATE
-
-#include <string>
-#include "../docbuilder.h"
-
-namespace NSDoctRenderer
-{
-	class CDocBuilderAddon
-	{
-	private:
-		std::wstring m_sWorkDirectory;
-	public:
-		CDocBuilderAddon(const std::wstring& sWorkDir)
-		{
-			m_sWorkDirectory = sWorkDir;
-		}
-	public:
-		std::wstring GetX2tSaveAddon(NSDoctRenderer::CDocBuilder* builder, const int& filetype)
-		{
-			return L"";
-		}
-		int GetX2tPreSaveError(NSDoctRenderer::CDocBuilder* builder, const int& filetype)
-		{
-			return 0;
-		}
-	};
-}
-
-#endif // DOC_BUILDER_ADDON_PRIVATE

DesktopEditor/doctrenderer/app_builder/main.cpp

@@ -33,7 +33,6 @@
 #include "./../common_deploy.h"
 #include "../docbuilder.h"
 #include "../../common/File.h"
-#include "../../common/SystemUtils.h"
 
 #ifdef LINUX
 #include "../../../DesktopEditor/common/File.h"
@@ -79,15 +78,6 @@ void parse_args(NSDoctRenderer::CDocBuilder* builder, int argc, char *argv[])
 	}
 }
 
-bool CheckLicense(const std::wstring& sSrc, const std::wstring& sDst)
-{
-	if (sDst.empty())
-		return false;
-	NSFile::CFileBinary::Remove(sDst);
-	NSFile::CFileBinary::Copy(sSrc, sDst);
-	return NSFile::CFileBinary::Exists(sDst);
-}
-
 #ifdef WIN32
 int wmain(int argc, wchar_t *argv[])
 #else
@@ -99,7 +89,6 @@ int main(int argc, char *argv[])
 
 	bool bIsHelp = false;
 	bool bIsFonts = false;
-	bool bIsLicense = false;
 	for (int i = 0; i < argc; ++i)
 	{
 #ifdef WIN32
@@ -132,33 +121,6 @@ int main(int argc, char *argv[])
 		{
 			bIsFonts = true;
 		}
-		else if (sParam == "-register")
-		{
-			bIsLicense = true;
-		}
-		else
-		{
-			if (bIsLicense)
-			{
-				std::wstring sLicensePathSrc = UTF8_TO_U(sParam);
-				if (!NSFile::CFileBinary::Exists(sLicensePathSrc))
-					return 1;
-
-				std::wstring sLicensePath = NSSystemUtils::GetEnvVariable(L"ONLYOFFICE_BUILDER_LICENSE");
-				if (CheckLicense(sLicensePathSrc, sLicensePath))
-					return 0;
-
-				sLicensePath = NSFile::GetProcessDirectory() + L"/license.xml";
-				if (CheckLicense(sLicensePathSrc, sLicensePath))
-					return 0;
-
-				sLicensePath = NSSystemUtils::GetAppDataDir() + L"/docbuilder/license.xml";
-				if (CheckLicense(sLicensePathSrc, sLicensePath))
-					return 0;
-
-				return 1;
-			}
-		}
 	}
 
 	if (bIsFonts)

DesktopEditor/doctrenderer/config.h

@@ -38,9 +38,6 @@
 #include "../xml/include/xmlutils.h"
 #include "../fontengine/TextHyphen.h"
 
-#define VALUE_TO_STRING(x) #x
-#define VALUE(x) VALUE_TO_STRING(x)
-
 namespace NSDoctRenderer
 {
 	class CAdditionalData
@@ -191,7 +188,7 @@ namespace NSDoctRenderer
 			m_strSdkPath = oNode.ReadNodeText(L"sdkjs");
 			if (!m_strSdkPath.empty())
 			{
-				if (0 == m_strSdkPath.find(L"./") || !NSDirectory::Exists(m_strSdkPath))
+				if (!NSDirectory::Exists(m_strSdkPath))
 					m_strSdkPath = sConfigDir + m_strSdkPath;
 			}
 
@@ -206,14 +203,28 @@ namespace NSDoctRenderer
 
 		char* GetVersion()
 		{
-			std::string sVersion = VALUE(INTVER);
+			std::wstring sFile = m_strSdkPath + L"/word/sdk-all-min.js";
 
-			size_t sSrcLen = sVersion.size();
+			std::string sData;
+			if (!NSFile::CFileBinary::ReadAllTextUtf8A(sFile, sData))
+				return NULL;
+
+			std::string::size_type startPos = sData.find("Version:");
+			if (std::string::npos == startPos)
+				return NULL;
+
+			startPos += 8;
+
+			std::string::size_type endPos = sData.find(')', startPos);
+			if (std::string::npos == endPos)
+				return NULL;
+
+			size_t sSrcLen = endPos - startPos + 1;
 			if (sSrcLen == 0)
 				return NULL;
 
 			char* sRet = new char[sSrcLen + 1];
-			memcpy(sRet, sVersion.c_str(), sSrcLen);
+			memcpy(sRet, sData.c_str() + startPos, sSrcLen);
 			sRet[sSrcLen] = '\0';
 			return sRet;
 		}

DesktopEditor/doctrenderer/docbuilder.cpp

@@ -47,6 +47,14 @@ namespace NSDoctRenderer
 		RELEASEOBJECT(m_pInternal);
 	}
 
+	int CDocBuilder::OpenFile(const wchar_t* path, const wchar_t* params)
+	{
+		m_pInternal->m_nFileType = -1;
+		if (!NSDirectory::Exists(m_pInternal->m_sTmpFolder))
+			NSDirectory::CreateDirectory(m_pInternal->m_sTmpFolder);
+
+		return m_pInternal->OpenFile(path, params);
+	}
 	int CDocBuilder::SaveFile(const int& type, const wchar_t* path, const wchar_t* params)
 	{
 		return m_pInternal->SaveFile(type, path, params);
@@ -57,7 +65,7 @@ namespace NSDoctRenderer
 	}
 	bool CDocBuilder::ExecuteCommand(const wchar_t* command, CDocBuilderValue* retValue)
 	{
-		return m_pInternal->ExecuteCommand(command, retValue, false, false);
+		return m_pInternal->ExecuteCommand(command, retValue);
 	}
 
 	CDocBuilderContext CDocBuilder::GetContext(bool enterContext)

DesktopEditor/doctrenderer/docbuilder.h

@@ -475,13 +475,6 @@ namespace NSDoctRenderer
 		 */
 		void SetPropertyW(const wchar_t* param, const wchar_t* value);
 
-		/**
-		 * GetProperty method.
-		 * @param param The parameter name in the Unicode format, the value is always --argument.
-		 * @return int value for property
-		 */
-		int GetPropertyInt(const wchar_t* param);
-
 		/**
 		 * Writes data to the log file. It is used for logs in JS code.
 		 * @param path The path to the file where all the logs will be written.
@@ -533,7 +526,6 @@ namespace NSDoctRenderer
 		CDocBuilder_Private* m_pInternal;
 
 		friend class CBuilderDocumentEmbed;
-		friend class CBuilderEmbed;
 	};
 
 	/**

DesktopEditor/doctrenderer/docbuilder.java/src/jni/docbuilder_CDocBuilder.cpp

@@ -16,18 +16,18 @@ static std::wstring wstringFromJavaString(JNIEnv* env, jstring jstr)
 	return wstr;
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilder_c_1Create(JNIEnv* env, jclass cls)
+jlong Java_docbuilder_CDocBuilder_c_1Create(JNIEnv* env, jclass cls)
 {
 	return reinterpret_cast<jlong>(new CDocBuilder());
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
+void Java_docbuilder_CDocBuilder_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	delete pSelf;
 }
 
-JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1OpenFile(JNIEnv* env, jclass cls, jlong self, jstring path, jstring params)
+jint Java_docbuilder_CDocBuilder_c_1OpenFile(JNIEnv* env, jclass cls, jlong self, jstring path, jstring params)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strPath = wstringFromJavaString(env, path);
@@ -35,34 +35,34 @@ JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1OpenFile(JNIEnv* env, jcla
 	return (jint)pSelf->OpenFile(strPath.c_str(), strParams.c_str());
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1CreateFileByType(JNIEnv* env, jclass cls, jlong self, jint type)
+jboolean Java_docbuilder_CDocBuilder_c_1CreateFileByType(JNIEnv* env, jclass cls, jlong self, jint type)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	return (jboolean)pSelf->CreateFile((int)type);
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1CreateFileByExtension(JNIEnv* env, jclass cls, jlong self, jstring extension)
+jboolean Java_docbuilder_CDocBuilder_c_1CreateFileByExtension(JNIEnv* env, jclass cls, jlong self, jstring extension)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strExtension = wstringFromJavaString(env, extension);
 	return (jboolean)pSelf->CreateFile(strExtension.c_str());
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1SetTmpFolder(JNIEnv* env, jclass cls, jlong self, jstring folder)
+void Java_docbuilder_CDocBuilder_c_1SetTmpFolder(JNIEnv* env, jclass cls, jlong self, jstring folder)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strFolder = wstringFromJavaString(env, folder);
 	pSelf->SetTmpFolder(strFolder.c_str());
 }
 
-JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1SaveFileByType(JNIEnv* env, jclass cls, jlong self, jint type, jstring path)
+jint Java_docbuilder_CDocBuilder_c_1SaveFileByType(JNIEnv* env, jclass cls, jlong self, jint type, jstring path)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strPath = wstringFromJavaString(env, path);
 	return (jint)pSelf->SaveFile((int)type, strPath.c_str());
 }
 
-JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1SaveFileByTypeWithParams(JNIEnv* env, jclass cls, jlong self, jint type, jstring path, jstring params)
+jint Java_docbuilder_CDocBuilder_c_1SaveFileByTypeWithParams(JNIEnv* env, jclass cls, jlong self, jint type, jstring path, jstring params)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strPath = wstringFromJavaString(env, path);
@@ -70,7 +70,7 @@ JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1SaveFileByTypeWithParams(J
 	return (jint)pSelf->SaveFile((int)type, strPath.c_str(), strParams.c_str());
 }
 
-JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1SaveFileByExtension(JNIEnv* env, jclass cls, jlong self, jstring extension, jstring path)
+jint Java_docbuilder_CDocBuilder_c_1SaveFileByExtension(JNIEnv* env, jclass cls, jlong self, jstring extension, jstring path)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strExtension = wstringFromJavaString(env, extension);
@@ -78,7 +78,7 @@ JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1SaveFileByExtension(JNIEnv
 	return (jint)pSelf->SaveFile(strExtension.c_str(), strPath.c_str());
 }
 
-JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1SaveFileByExtensionWithParams(JNIEnv* env, jclass cls, jlong self, jstring extension, jstring path, jstring params)
+jint Java_docbuilder_CDocBuilder_c_1SaveFileByExtensionWithParams(JNIEnv* env, jclass cls, jlong self, jstring extension, jstring path, jstring params)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strExtension = wstringFromJavaString(env, extension);
@@ -87,20 +87,20 @@ JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilder_c_1SaveFileByExtensionWithPar
 	return (jint)pSelf->SaveFile(strExtension.c_str(), strPath.c_str(), strParams.c_str());
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1CloseFile(JNIEnv* env, jclass cls, jlong self)
+void Java_docbuilder_CDocBuilder_c_1CloseFile(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	pSelf->CloseFile();
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1ExecuteCommand(JNIEnv* env, jclass cls, jlong self, jstring command)
+jboolean Java_docbuilder_CDocBuilder_c_1ExecuteCommand(JNIEnv* env, jclass cls, jlong self, jstring command)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strCommand = wstringFromJavaString(env, command);
 	return (jboolean)pSelf->ExecuteCommand(strCommand.c_str());
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1ExecuteCommandWithRetValue(JNIEnv* env, jclass cls, jlong self, jstring command, jlong retValue)
+jboolean Java_docbuilder_CDocBuilder_c_1ExecuteCommandWithRetValue(JNIEnv* env, jclass cls, jlong self, jstring command, jlong retValue)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strCommand = wstringFromJavaString(env, command);
@@ -108,14 +108,14 @@ JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1ExecuteCommandWithRetV
 	return (jboolean)pSelf->ExecuteCommand(strCommand.c_str(), pRetValue);
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1Run(JNIEnv* env, jclass cls, jlong self, jstring path)
+jboolean Java_docbuilder_CDocBuilder_c_1Run(JNIEnv* env, jclass cls, jlong self, jstring path)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strPath = wstringFromJavaString(env, path);
 	return (jboolean)pSelf->Run(strPath.c_str());
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1RunText(JNIEnv* env, jclass cls, jlong self, jstring commands)
+jboolean Java_docbuilder_CDocBuilder_c_1RunText(JNIEnv* env, jclass cls, jlong self, jstring commands)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	const char* strUtfCommands = env->GetStringUTFChars(commands, nullptr);
@@ -124,7 +124,7 @@ JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1RunText(JNIEnv* env, j
 	return result;
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1SetProperty(JNIEnv* env, jclass cls, jlong self, jstring param, jstring value)
+void Java_docbuilder_CDocBuilder_c_1SetProperty(JNIEnv* env, jclass cls, jlong self, jstring param, jstring value)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	const char* strUtfParam = env->GetStringUTFChars(param, nullptr);
@@ -133,7 +133,7 @@ JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1SetProperty(JNIEnv* env, j
 	env->ReleaseStringUTFChars(param, strUtfParam);
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1WriteData(JNIEnv* env, jclass cls, jlong self, jstring path, jstring data, jboolean append)
+void Java_docbuilder_CDocBuilder_c_1WriteData(JNIEnv* env, jclass cls, jlong self, jstring path, jstring data, jboolean append)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	std::wstring strPath = wstringFromJavaString(env, path);
@@ -141,13 +141,13 @@ JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1WriteData(JNIEnv* env, jcl
 	pSelf->WriteData(strPath.c_str(), strData.c_str(), (bool)append);
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilder_c_1IsSaveWithDoctrendererMode(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilder_c_1IsSaveWithDoctrendererMode(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	return (jboolean)pSelf->IsSaveWithDoctrendererMode();
 }
 
-JNIEXPORT jstring JNICALL Java_docbuilder_CDocBuilder_c_1GetVersion(JNIEnv* env, jclass cls, jlong self)
+jstring Java_docbuilder_CDocBuilder_c_1GetVersion(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	char* strUtfVersion = pSelf->GetVersion();
@@ -156,30 +156,30 @@ JNIEXPORT jstring JNICALL Java_docbuilder_CDocBuilder_c_1GetVersion(JNIEnv* env,
 	return jstrVersion;
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilder_c_1GetContext(JNIEnv* env, jclass cls, jlong self)
+jlong Java_docbuilder_CDocBuilder_c_1GetContext(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderContext(pSelf->GetContext()));
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilder_c_1GetContextWithEnterParam(JNIEnv* env, jclass cls, jlong self, jboolean enterContext)
+jlong Java_docbuilder_CDocBuilder_c_1GetContextWithEnterParam(JNIEnv* env, jclass cls, jlong self, jboolean enterContext)
 {
 	CDocBuilder* pSelf = reinterpret_cast<CDocBuilder*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderContext(pSelf->GetContext((bool)enterContext)));
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1Initialize(JNIEnv* env, jclass cls)
+void Java_docbuilder_CDocBuilder_c_1Initialize(JNIEnv* env, jclass cls)
 {
 	CDocBuilder::Initialize();
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1InitializeWithDirectory(JNIEnv* env, jclass cls, jstring directory)
+void Java_docbuilder_CDocBuilder_c_1InitializeWithDirectory(JNIEnv* env, jclass cls, jstring directory)
 {
 	std::wstring strDirectory = wstringFromJavaString(env, directory);
 	CDocBuilder::Initialize(strDirectory.c_str());
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilder_c_1Dispose(JNIEnv* env, jclass cls)
+void Java_docbuilder_CDocBuilder_c_1Dispose(JNIEnv* env, jclass cls)
 {
 	CDocBuilder::Dispose();
 }

DesktopEditor/doctrenderer/docbuilder.java/src/jni/docbuilder_CDocBuilderContext.cpp

@@ -4,60 +4,60 @@
 
 using namespace NSDoctRenderer;
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1Create(JNIEnv* env, jclass cls)
+jlong Java_docbuilder_CDocBuilderContext_c_1Create(JNIEnv* env, jclass cls)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderContext());
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1Copy(JNIEnv* env, jclass cls, jlong other)
+jlong Java_docbuilder_CDocBuilderContext_c_1Copy(JNIEnv* env, jclass cls, jlong other)
 {
 	CDocBuilderContext* pOther = reinterpret_cast<CDocBuilderContext*>(other);
 	return reinterpret_cast<jlong>(new CDocBuilderContext(*pOther));
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderContext_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
+void Java_docbuilder_CDocBuilderContext_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	delete pSelf;
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1CreateUndefined(JNIEnv* env, jclass cls, jlong self)
+jlong Java_docbuilder_CDocBuilderContext_c_1CreateUndefined(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderValue(pSelf->CreateUndefined()));
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1CreateNull(JNIEnv* env, jclass cls, jlong self)
+jlong Java_docbuilder_CDocBuilderContext_c_1CreateNull(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderValue(pSelf->CreateNull()));
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1CreateObject(JNIEnv* env, jclass cls, jlong self)
+jlong Java_docbuilder_CDocBuilderContext_c_1CreateObject(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderValue(pSelf->CreateObject()));
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1CreateArray(JNIEnv* env, jclass cls, jlong self, jint length)
+jlong Java_docbuilder_CDocBuilderContext_c_1CreateArray(JNIEnv* env, jclass cls, jlong self, jint length)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderValue(pSelf->CreateArray((int)length)));
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1GetGlobal(JNIEnv* env, jclass cls, jlong self)
+jlong Java_docbuilder_CDocBuilderContext_c_1GetGlobal(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderValue(pSelf->GetGlobal()));
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContext_c_1CreateScope(JNIEnv* env, jclass cls, jlong self)
+jlong Java_docbuilder_CDocBuilderContext_c_1CreateScope(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return reinterpret_cast<jlong>(new CDocBuilderContextScope(pSelf->CreateScope()));
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderContext_c_1IsError(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilderContext_c_1IsError(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContext* pSelf = reinterpret_cast<CDocBuilderContext*>(self);
 	return (jboolean)pSelf->IsError();

DesktopEditor/doctrenderer/docbuilder.java/src/jni/docbuilder_CDocBuilderContextScope.cpp

@@ -4,24 +4,24 @@
 
 using namespace NSDoctRenderer;
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContextScope_c_1Create(JNIEnv* env, jclass cls)
+jlong Java_docbuilder_CDocBuilderContextScope_c_1Create(JNIEnv* env, jclass cls)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderContextScope());
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderContextScope_c_1Copy(JNIEnv* env, jclass cls, jlong other)
+jlong Java_docbuilder_CDocBuilderContextScope_c_1Copy(JNIEnv* env, jclass cls, jlong other)
 {
 	CDocBuilderContextScope* pOther = reinterpret_cast<CDocBuilderContextScope*>(other);
 	return reinterpret_cast<jlong>(new CDocBuilderContextScope(*pOther));
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderContextScope_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
+void Java_docbuilder_CDocBuilderContextScope_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContextScope* pSelf = reinterpret_cast<CDocBuilderContextScope*>(self);
 	delete pSelf;
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderContextScope_c_1Close(JNIEnv* env, jclass cls, jlong self)
+void Java_docbuilder_CDocBuilderContextScope_c_1Close(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderContextScope* pSelf = reinterpret_cast<CDocBuilderContextScope*>(self);
 	pSelf->Close();

DesktopEditor/doctrenderer/docbuilder.java/src/jni/docbuilder_CDocBuilderValue.cpp

@@ -8,114 +8,114 @@
 
 using namespace NSDoctRenderer;
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Create(JNIEnv* env, jclass cls)
+jlong Java_docbuilder_CDocBuilderValue_c_1Create(JNIEnv* env, jclass cls)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue());
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Copy(JNIEnv* env, jclass cls, jlong other)
+jlong Java_docbuilder_CDocBuilderValue_c_1Copy(JNIEnv* env, jclass cls, jlong other)
 {
 	CDocBuilderValue* pOther = reinterpret_cast<CDocBuilderValue*>(other);
 	return reinterpret_cast<jlong>(new CDocBuilderValue(*pOther));
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderValue_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
+void Java_docbuilder_CDocBuilderValue_c_1Destroy(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	delete pSelf;
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsEmpty(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilderValue_c_1IsEmpty(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsEmpty();
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderValue_c_1Clear(JNIEnv* env, jclass cls, jlong self)
+void Java_docbuilder_CDocBuilderValue_c_1Clear(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	pSelf->Clear();
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsNull(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilderValue_c_1IsNull(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsNull();
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsUndefined(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilderValue_c_1IsUndefined(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsUndefined();
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsBool(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilderValue_c_1IsBool(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsBool();
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsInt(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilderValue_c_1IsInt(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsInt();
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsDouble(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilderValue_c_1IsDouble(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsDouble();
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsString(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilderValue_c_1IsString(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsString();
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsFunction(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilderValue_c_1IsFunction(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsFunction();
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsObject(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilderValue_c_1IsObject(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsObject();
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1IsArray(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilderValue_c_1IsArray(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->IsArray();
 }
 
-JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilderValue_c_1GetLength(JNIEnv* env, jclass cls, jlong self)
+jint Java_docbuilder_CDocBuilderValue_c_1GetLength(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jint)pSelf->GetLength();
 }
 
-JNIEXPORT jboolean JNICALL Java_docbuilder_CDocBuilderValue_c_1ToBool(JNIEnv* env, jclass cls, jlong self)
+jboolean Java_docbuilder_CDocBuilderValue_c_1ToBool(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jboolean)pSelf->ToBool();
 }
 
-JNIEXPORT jint JNICALL Java_docbuilder_CDocBuilderValue_c_1ToInt(JNIEnv* env, jclass cls, jlong self)
+jint Java_docbuilder_CDocBuilderValue_c_1ToInt(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jint)pSelf->ToInt();
 }
 
-JNIEXPORT jdouble JNICALL Java_docbuilder_CDocBuilderValue_c_1ToDouble(JNIEnv* env, jclass cls, jlong self)
+jdouble Java_docbuilder_CDocBuilderValue_c_1ToDouble(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	return (jdouble)pSelf->ToDouble();
 }
 
-JNIEXPORT jstring JNICALL Java_docbuilder_CDocBuilderValue_c_1ToString(JNIEnv* env, jclass cls, jlong self)
+jstring Java_docbuilder_CDocBuilderValue_c_1ToString(JNIEnv* env, jclass cls, jlong self)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CString strValue = pSelf->ToString();
@@ -123,7 +123,7 @@ JNIEXPORT jstring JNICALL Java_docbuilder_CDocBuilderValue_c_1ToString(JNIEnv* e
 	return env->NewStringUTF(strUtfData.c_str());
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1GetProperty(JNIEnv* env, jclass cls, jlong self, jstring name)
+jlong Java_docbuilder_CDocBuilderValue_c_1GetProperty(JNIEnv* env, jclass cls, jlong self, jstring name)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	const char* strUtfName = env->GetStringUTFChars(name, nullptr);
@@ -132,14 +132,14 @@ JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1GetProperty(JNIEnv*
 	return reinterpret_cast<jlong>(pValue);
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1GetByIndex(JNIEnv* env, jclass cls, jlong self, jint index)
+jlong Java_docbuilder_CDocBuilderValue_c_1GetByIndex(JNIEnv* env, jclass cls, jlong self, jint index)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pValue = new CDocBuilderValue(pSelf->Get((int)index));
 	return reinterpret_cast<jlong>(pValue);
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderValue_c_1SetProperty(JNIEnv* env, jclass cls, jlong self, jstring name, jlong value)
+void Java_docbuilder_CDocBuilderValue_c_1SetProperty(JNIEnv* env, jclass cls, jlong self, jstring name, jlong value)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pValue = reinterpret_cast<CDocBuilderValue*>(value);
@@ -149,29 +149,29 @@ JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderValue_c_1SetProperty(JNIEnv* e
 	env->ReleaseStringUTFChars(name, strUtfName);
 }
 
-JNIEXPORT void JNICALL Java_docbuilder_CDocBuilderValue_c_1SetByIndex(JNIEnv* env, jclass cls, jlong self, jint index, jlong value)
+void Java_docbuilder_CDocBuilderValue_c_1SetByIndex(JNIEnv* env, jclass cls, jlong self, jint index, jlong value)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pValue = reinterpret_cast<CDocBuilderValue*>(value);
 	pSelf->Set((int)index, *pValue);
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateWithBool(JNIEnv* env, jclass cls, jboolean value)
+jlong Java_docbuilder_CDocBuilderValue_c_1CreateWithBool(JNIEnv* env, jclass cls, jboolean value)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue((bool)value));
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateWithInt(JNIEnv* env, jclass cls, jint value)
+jlong Java_docbuilder_CDocBuilderValue_c_1CreateWithInt(JNIEnv* env, jclass cls, jint value)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue((int)value));
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateWithDouble(JNIEnv* env, jclass cls, jdouble value)
+jlong Java_docbuilder_CDocBuilderValue_c_1CreateWithDouble(JNIEnv* env, jclass cls, jdouble value)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue((double)value));
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateWithString(JNIEnv* env, jclass cls, jstring str)
+jlong Java_docbuilder_CDocBuilderValue_c_1CreateWithString(JNIEnv* env, jclass cls, jstring str)
 {
 	const char* strUtf = env->GetStringUTFChars(str, nullptr);
 	CDocBuilderValue* pValue = new CDocBuilderValue(strUtf);
@@ -179,22 +179,22 @@ JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateWithString(JNI
 	return reinterpret_cast<jlong>(pValue);
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateUndefined(JNIEnv* env, jclass cls)
+jlong Java_docbuilder_CDocBuilderValue_c_1CreateUndefined(JNIEnv* env, jclass cls)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue(CDocBuilderValue::CreateUndefined()));
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateNull(JNIEnv* env, jclass cls)
+jlong Java_docbuilder_CDocBuilderValue_c_1CreateNull(JNIEnv* env, jclass cls)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue(CDocBuilderValue::CreateNull()));
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1CreateArray(JNIEnv* env, jclass cls, jint length)
+jlong Java_docbuilder_CDocBuilderValue_c_1CreateArray(JNIEnv* env, jclass cls, jint length)
 {
 	return reinterpret_cast<jlong>(new CDocBuilderValue(CDocBuilderValue::CreateArray((int)length)));
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call0(JNIEnv* env, jclass cls, jlong self, jstring name)
+jlong Java_docbuilder_CDocBuilderValue_c_1Call0(JNIEnv* env, jclass cls, jlong self, jstring name)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	const char* strUtfName = env->GetStringUTFChars(name, nullptr);
@@ -203,7 +203,7 @@ JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call0(JNIEnv* env, j
 	return reinterpret_cast<jlong>(pReturnValue);
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call1(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1)
+jlong Java_docbuilder_CDocBuilderValue_c_1Call1(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pParam1 = reinterpret_cast<CDocBuilderValue*>(p1);
@@ -213,7 +213,7 @@ JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call1(JNIEnv* env, j
 	return reinterpret_cast<jlong>(pReturnValue);
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call2(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2)
+jlong Java_docbuilder_CDocBuilderValue_c_1Call2(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pParam1 = reinterpret_cast<CDocBuilderValue*>(p1);
@@ -224,7 +224,7 @@ JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call2(JNIEnv* env, j
 	return reinterpret_cast<jlong>(pReturnValue);
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call3(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3)
+jlong Java_docbuilder_CDocBuilderValue_c_1Call3(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pParam1 = reinterpret_cast<CDocBuilderValue*>(p1);
@@ -236,7 +236,7 @@ JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call3(JNIEnv* env, j
 	return reinterpret_cast<jlong>(pReturnValue);
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call4(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3, jlong p4)
+jlong Java_docbuilder_CDocBuilderValue_c_1Call4(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3, jlong p4)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pParam1 = reinterpret_cast<CDocBuilderValue*>(p1);
@@ -249,7 +249,7 @@ JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call4(JNIEnv* env, j
 	return reinterpret_cast<jlong>(pReturnValue);
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call5(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3, jlong p4, jlong p5)
+jlong Java_docbuilder_CDocBuilderValue_c_1Call5(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3, jlong p4, jlong p5)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pParam1 = reinterpret_cast<CDocBuilderValue*>(p1);
@@ -263,7 +263,7 @@ JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call5(JNIEnv* env, j
 	return reinterpret_cast<jlong>(pReturnValue);
 }
 
-JNIEXPORT jlong JNICALL Java_docbuilder_CDocBuilderValue_c_1Call6(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3, jlong p4, jlong p5, jlong p6)
+jlong Java_docbuilder_CDocBuilderValue_c_1Call6(JNIEnv* env, jclass cls, jlong self, jstring name, jlong p1, jlong p2, jlong p3, jlong p4, jlong p5, jlong p6)
 {
 	CDocBuilderValue* pSelf = reinterpret_cast<CDocBuilderValue*>(self);
 	CDocBuilderValue* pParam1 = reinterpret_cast<CDocBuilderValue*>(p1);

DesktopEditor/doctrenderer/docbuilder.python/src/docbuilder.py

@@ -2,7 +2,6 @@ import ctypes
 import os
 import platform
 import atexit
-import subprocess
 
 OBJECT_HANDLE = ctypes.c_void_p
 STRING_HANDLE = ctypes.c_void_p
@@ -609,17 +608,8 @@ class FileTypes:
         PNG = _IMAGE_MASK + 0x0005
         BMP = _IMAGE_MASK + 0x0008
 
-# NOTE: do not change builder_path manually!
 builder_path = os.path.dirname(os.path.realpath(__file__))
 _loadLibrary(builder_path)
 CDocBuilder.Initialize(builder_path)
 
-def registerLibrary(license_path):
-    docbuilder_bin = os.path.join(builder_path, "docbuilder")
-    if ("windows" == platform.system().lower()):
-        docbuilder_bin += ".exe"
-        return subprocess.call([docbuilder_bin, "-register", license_path], stderr=subprocess.STDOUT, shell=True)
-    command = docbuilder_bin + " -register \"" +  license_path.replace('\"', '\\\"') + "\""
-    return subprocess.call(command, stderr=subprocess.STDOUT, shell=True)
-
 atexit.register(CDocBuilder.Dispose)

DesktopEditor/doctrenderer/docbuilder_p.cpp

@@ -56,6 +56,7 @@ CV8RealTimeWorker::CV8RealTimeWorker(NSDoctRenderer::CDocBuilder* pBuilder, cons
 	CJSContextScope scope(m_context);
 
 	CJSContext::Embed<CNativeControlEmbed>(false);
+	CJSContext::Embed<CGraphicsEmbed>();
 	NSJSBase::CreateDefaults();
 
 	JSSmart<CJSTryCatch> try_catch = m_context->GetExceptions();
@@ -82,7 +83,7 @@ CV8RealTimeWorker::~CV8RealTimeWorker()
 	m_context->Dispose();
 }
 
-bool CV8RealTimeWorker::ExecuteCommand(const std::wstring& command, NSDoctRenderer::CDocBuilderValue* retValue, const bool& isEnterContext)
+bool CV8RealTimeWorker::ExecuteCommand(const std::wstring& command, NSDoctRenderer::CDocBuilderValue* retValue)
 {
 	LOGGER_SPEED_START();
 
@@ -92,20 +93,14 @@ bool CV8RealTimeWorker::ExecuteCommand(const std::wstring& command, NSDoctRender
 	std::string commandA = U_TO_UTF8(command);
 	//commandA = "Api." + commandA;
 
-	if (isEnterContext)
-		m_context->Enter();
-
+	CJSContextScope scope(m_context);
 	JSSmart<CJSTryCatch> try_catch = m_context->GetExceptions();
 
 	LOGGER_SPEED_LAP("compile_command");
 
 	JSSmart<CJSValue> retNativeVal = m_context->runScript(commandA, try_catch);
 	if(try_catch->Check())
-	{
-		if (isEnterContext)
-			m_context->Exit();
 		return false;
-	}
 
 	if (retValue)
 	{
@@ -116,9 +111,6 @@ bool CV8RealTimeWorker::ExecuteCommand(const std::wstring& command, NSDoctRender
 
 	LOGGER_SPEED_LAP("run_command");
 
-	if (isEnterContext)
-		m_context->Exit();
-
 	return true;
 }
 
@@ -249,14 +241,6 @@ bool CV8RealTimeWorker::InitVariables()
 		if (try_catch->Check())
 			return false;
 	}
-
-	if (!m_sJSCodeStart.empty())
-	{
-		m_context->runScript(m_sJSCodeStart, try_catch);
-		if (try_catch->Check())
-			return false;
-	}
-
 	return true;
 }
 
@@ -313,7 +297,7 @@ bool CV8RealTimeWorker::OpenFile(const std::wstring& sBasePath, const std::wstri
 		else if (1 == m_nFileType)
 			pNative->m_strEditorType = L"presentation";
 		else if (7 == m_nFileType)
-			pNative->m_strEditorType = L"visio";
+			pNative->m_strEditorType = L"draw";
 		else
 			pNative->m_strEditorType = L"spreadsheet";
 
@@ -353,17 +337,7 @@ bool CV8RealTimeWorker::OpenFile(const std::wstring& sBasePath, const std::wstri
 	return !bIsBreak;
 }
 
-bool CV8RealTimeWorker::NewSimpleJSInstance()
-{
-	return InitVariables();
-}
-
-bool CV8RealTimeWorker::IsSimpleJSInstance()
-{
-	return (-1 == m_nFileType);
-}
-
-bool CV8RealTimeWorker::SaveFileWithChanges(int type, const std::wstring& _path, const std::wstring& sJsonParams, const bool& isEnterContext)
+bool CV8RealTimeWorker::SaveFileWithChanges(int type, const std::wstring& _path, const std::wstring& sJsonParams)
 {
 	NSDoctRenderer::DoctRendererFormat::FormatFile _formatDst = NSDoctRenderer::DoctRendererFormat::DOCT;
 	if (type & AVS_OFFICESTUDIO_FILE_PRESENTATION)
@@ -389,9 +363,7 @@ bool CV8RealTimeWorker::SaveFileWithChanges(int type, const std::wstring& _path,
 		}
 	}
 
-	if (isEnterContext)
-		m_context->Enter();
-
+	CJSContextScope scope(m_context);
 	JSSmart<CJSTryCatch> try_catch = m_context->GetExceptions();
 
 	NSNativeControl::CNativeControl* pNative = NULL;
@@ -420,7 +392,7 @@ bool CV8RealTimeWorker::SaveFileWithChanges(int type, const std::wstring& _path,
 		bIsSilentMode = true;
 
 	if (bIsSilentMode)
-		this->ExecuteCommand(L"Api.asc_SetSilentMode(false);", NULL, isEnterContext);
+		this->ExecuteCommand(L"Api.asc_SetSilentMode(false);");
 
 	std::wstring strError;
 	bool bIsError = Doct_renderer_SaveFile_ForBuilder(_formatDst,
@@ -432,10 +404,7 @@ bool CV8RealTimeWorker::SaveFileWithChanges(int type, const std::wstring& _path,
 													  sJsonParams);
 
 	if (bIsSilentMode)
-		this->ExecuteCommand(L"Api.asc_SetSilentMode(true);", NULL, isEnterContext);
-
-	if (isEnterContext)
-		m_context->Exit();
+		this->ExecuteCommand(L"Api.asc_SetSilentMode(true);");
 
 	return bIsError;
 }
@@ -1263,29 +1232,8 @@ namespace NSDoctRenderer
 		nCount = nIndex;
 	}
 
-	int CDocBuilder::OpenFile(const wchar_t* path, const wchar_t* params)
-	{
-		if (m_pInternal->m_nFileType != -1 && m_pInternal->m_bIsOpenedFromSimpleJS)
-		{
-			m_pInternal->m_bIsOpenedFromSimpleJS = false;
-			return true;
-		}
-
-		m_pInternal->m_nFileType = -1;
-		if (!NSDirectory::Exists(m_pInternal->m_sTmpFolder))
-			NSDirectory::CreateDirectory(m_pInternal->m_sTmpFolder);
-
-		return m_pInternal->OpenFile(path, params);
-	}
-
 	bool CDocBuilder::CreateFile(const int& type)
 	{
-		if (m_pInternal->m_nFileType != -1 && m_pInternal->m_bIsOpenedFromSimpleJS)
-		{
-			m_pInternal->m_bIsOpenedFromSimpleJS = false;
-			return true;
-		}
-
 		m_pInternal->m_nFileType = -1;
 		if (!NSDirectory::Exists(m_pInternal->m_sTmpFolder))
 			NSDirectory::CreateDirectory(m_pInternal->m_sTmpFolder);
@@ -1444,7 +1392,7 @@ namespace NSDoctRenderer
 				if (!sJsCommands.empty())
 				{
 					std::wstring sUnicodeCommand = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)sJsCommands.c_str(), (LONG)sJsCommands.length());
-					bIsNoError = this->m_pInternal->ExecuteCommand(sUnicodeCommand.c_str(), NULL, bIsBuilderJSCloseFile);
+					bIsNoError = this->ExecuteCommand(sUnicodeCommand.c_str());
 					sJsCommands = "";
 					if (!bIsNoError)
 						return false;
@@ -1466,10 +1414,6 @@ namespace NSDoctRenderer
 					if (0 == _builder_params[nCheckParam].find(L"jsValue(") && _builder_params[nCheckParam].length() > 9)
 					{
 						std::wstring sParam = _builder_params[nCheckParam].substr(8, _builder_params[nCheckParam].length() - 9);
-
-						if (NULL == m_pInternal->m_pWorker)
-							m_pInternal->CheckWorker();
-
 						_builder_params[nCheckParam] = m_pInternal->m_pWorker->GetJSVariable(sParam);
 					}
 				}
@@ -1535,7 +1479,7 @@ namespace NSDoctRenderer
 		{
 			// Такого быть не должно!!! Так как результат никуда не сохранится. пустое действие.
 			std::wstring sUnicodeCommand = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)sJsCommands.c_str(), (LONG)sJsCommands.length());
-			bool bIsNoError = this->m_pInternal->ExecuteCommand(sUnicodeCommand.c_str(), NULL, true);
+			bool bIsNoError = this->ExecuteCommand(sUnicodeCommand.c_str());
 			sJsCommands = "";
 			if (!bIsNoError)
 				return false;
@@ -1596,15 +1540,6 @@ namespace NSDoctRenderer
 		return this->SetProperty(sA.c_str(), value);
 	}
 
-	int CDocBuilder::GetPropertyInt(const wchar_t* param)
-	{
-		std::wstring sParam = std::wstring(param);
-		std::string sParamA = U_TO_UTF8(sParam);
-		if ("--save-use-only-names" == sParamA)
-			return m_pInternal->m_bIsServerSafeVersion ? 1 : 0;
-		return -1;
-	}
-
 	void CDocBuilder::Initialize(const wchar_t* directory)
 	{
 		std::wstring sDirectory = L"";

DesktopEditor/doctrenderer/docbuilder_p.h

@@ -63,8 +63,6 @@
 
 #include "../common/ProcessEnv.h"
 
-#include "docbuilder_addon.h"
-
 #ifdef CreateFile
 #undef CreateFile
 #endif
@@ -424,7 +422,6 @@ public:
 	int m_nFileType;
 	std::string m_sUtf8ArgumentJSON;
 	std::string m_sGlobalVariable;
-	std::string m_sJSCodeStart;
 
 	CJSContextData m_oContextData;
 
@@ -437,17 +434,14 @@ public:
 
 	static void _LOGGING_ERROR_(const std::wstring& strType, const std::wstring& strError);
 
-	bool ExecuteCommand(const std::wstring& command, NSDoctRenderer::CDocBuilderValue* retValue = NULL, const bool& isEnterContext = true);
+	bool ExecuteCommand(const std::wstring& command, NSDoctRenderer::CDocBuilderValue* retValue = NULL);
 
 	std::string GetGlobalVariable();
 	std::wstring GetJSVariable(std::wstring sParam);
 
 	bool OpenFile(const std::wstring& sBasePath, const std::wstring& path, const NSDoctRenderer::DoctRendererEditorType& editorType, NSDoctRenderer::CDoctRendererConfig* config, CV8Params* pParams = NULL);
-	bool SaveFileWithChanges(int type, const std::wstring& _path, const std::wstring& sJsonParams = L"", const bool& isEnterContext = true);
+	bool SaveFileWithChanges(int type, const std::wstring& _path, const std::wstring& sJsonParams = L"");
 	bool InitVariables();
-
-	bool NewSimpleJSInstance();
-	bool IsSimpleJSInstance();
 };
 
 namespace NSDoctRenderer
@@ -461,8 +455,7 @@ namespace NSDoctRenderer
 		std::wstring m_sTmpFolder;
 		std::wstring m_sFileDir;
 		int m_nFileType;
-
-		std::wstring m_sCommandsBeforeContextCreated;
+		bool m_bJavascriptBeforeEditor;
 
 		std::wstring m_sX2tPath;
 
@@ -481,13 +474,11 @@ namespace NSDoctRenderer
 
 		NSDoctRenderer::CDocBuilder* m_pParent;
 
-		bool m_bIsOpenedFromSimpleJS;
-
 		static std::wstring m_sExternalDirectory;
 	public:
 		CDocBuilder_Private() : CDoctRendererConfig(), m_sTmpFolder(NSFile::CFileBinary::GetTempPath()), m_nFileType(-1),
 			m_pWorker(NULL), m_pAdditionalData(NULL), m_bIsInit(false), m_bIsServerSafeVersion(false),
-			  m_sGlobalVariable(""), m_bIsGlobalVariableUse(false), m_pParent(NULL), m_sCommandsBeforeContextCreated(L""), m_bIsOpenedFromSimpleJS(false)
+			m_sGlobalVariable(""), m_bIsGlobalVariableUse(false), m_pParent(NULL), m_bJavascriptBeforeEditor(false)
 		{
 		}
 
@@ -646,15 +637,11 @@ namespace NSDoctRenderer
 			{
 				NSDirectory::CreateDirectory(m_sFileDir + L"/media");
 				NSDirectory::CreateDirectory(m_sFileDir + L"/changes");
-
-				if (m_pWorker && m_pWorker->IsSimpleJSInstance() && !m_bIsOpenedFromSimpleJS)
-				{
-					RELEASEOBJECT(m_pWorker);
-					CheckWorker();
-				}
-				return bRet;
 			}
 
+			if (m_bJavascriptBeforeEditor)
+				CheckWorkerAfterOpen();
+
 			return bRet;
 #else
 			std::wstring sPath = m_sX2tPath + L"/empty/new.";
@@ -741,13 +728,22 @@ namespace NSDoctRenderer
 			oBuilder.WriteEncodeXmlString(sFolder);
 			oBuilder.WriteString(L"/Editor.bin</m_sFileTo><m_nFormatTo>8192</m_nFormatTo>");
 
-			oBuilder.WriteString(L"<m_sFontDir>");
-			oBuilder.WriteEncodeXmlString(NSFile::GetDirectoryName(m_strAllFonts));
-			oBuilder.WriteString(L"</m_sFontDir>");
+			if (!m_bIsNotUseConfigAllFontsDir)
+			{
+				oBuilder.WriteString(L"<m_sFontDir>");
+				oBuilder.WriteEncodeXmlString(m_sX2tPath + L"/sdkjs/common");
+				oBuilder.WriteString(L"</m_sFontDir>");
+			}
+			else
+			{
+				oBuilder.WriteString(L"<m_sFontDir>");
+				oBuilder.WriteEncodeXmlString(NSFile::GetDirectoryName(m_strAllFonts));
+				oBuilder.WriteString(L"</m_sFontDir>");
 
-			oBuilder.WriteString(L"<m_sAllFontsPath>");
-			oBuilder.WriteEncodeXmlString(m_strAllFonts);
-			oBuilder.WriteString(L"</m_sAllFontsPath>");
+				oBuilder.WriteString(L"<m_sAllFontsPath>");
+				oBuilder.WriteEncodeXmlString(m_strAllFonts);
+				oBuilder.WriteString(L"</m_sAllFontsPath>");
+			}
 
 			oBuilder.WriteString(L"<m_bIsNoBase64>true</m_bIsNoBase64>");
 			oBuilder.WriteString(L"<m_sThemeDir>./sdkjs/slide/themes</m_sThemeDir><m_bDontSaveAdditional>true</m_bDontSaveAdditional>");
@@ -944,11 +940,8 @@ namespace NSDoctRenderer
 
 			if (0 == nReturnCode)
 			{
-				if (m_pWorker && m_pWorker->IsSimpleJSInstance() && !m_bIsOpenedFromSimpleJS)
-				{
-					RELEASEOBJECT(m_pWorker);
-					CheckWorker();
-				}
+				if (m_bJavascriptBeforeEditor)
+					CheckWorkerAfterOpen();
 				return 0;
 			}
 
@@ -997,16 +990,10 @@ namespace NSDoctRenderer
 			return _path;
 		}
 
-		int SaveFile(const int& type, const std::wstring& path, const wchar_t* params = NULL, const bool& isEnterContext = true)
+		int SaveFile(const int& type, const std::wstring& path, const wchar_t* params = NULL)
 		{
 			Init();
 
-			CDocBuilderAddon oSaveAddon(m_sX2tPath);
-
-			int nPreSaveError = oSaveAddon.GetX2tPreSaveError(m_pParent, m_nFileType);
-			if (0 != nPreSaveError)
-				return nPreSaveError;
-
 			if (-1 == m_nFileType)
 			{
 				CV8RealTimeWorker::_LOGGING_ERROR_(L"error (save)", L"file not opened!");
@@ -1045,7 +1032,7 @@ namespace NSDoctRenderer
 					}
 				}
 
-				this->m_pWorker->SaveFileWithChanges(type, m_sFileDir + L"/Editor2.bin", sJsonParams, isEnterContext);
+				this->m_pWorker->SaveFileWithChanges(type, m_sFileDir + L"/Editor2.bin", sJsonParams);
 				sFileBin = L"/Editor2.bin";
 			}
 
@@ -1067,13 +1054,22 @@ namespace NSDoctRenderer
 				oBuilder.WriteString(L"</m_sThemeDir><m_bFromChanges>true</m_bFromChanges><m_bDontSaveAdditional>true</m_bDontSaveAdditional>");
 			oBuilder.WriteString(L"<m_nCsvTxtEncoding>46</m_nCsvTxtEncoding><m_nCsvDelimiter>4</m_nCsvDelimiter>");
 
-			oBuilder.WriteString(L"<m_sFontDir>");
-			oBuilder.WriteEncodeXmlString(NSFile::GetDirectoryName(m_strAllFonts));
-			oBuilder.WriteString(L"</m_sFontDir>");
+			if (!m_bIsNotUseConfigAllFontsDir)
+			{
+				oBuilder.WriteString(L"<m_sFontDir>");
+				oBuilder.WriteEncodeXmlString(m_sX2tPath + L"/sdkjs/common");
+				oBuilder.WriteString(L"</m_sFontDir>");
+			}
+			else
+			{
+				oBuilder.WriteString(L"<m_sFontDir>");
+				oBuilder.WriteEncodeXmlString(NSFile::GetDirectoryName(m_strAllFonts));
+				oBuilder.WriteString(L"</m_sFontDir>");
 
-			oBuilder.WriteString(L"<m_sAllFontsPath>");
-			oBuilder.WriteEncodeXmlString(m_strAllFonts);
-			oBuilder.WriteString(L"</m_sAllFontsPath>");
+				oBuilder.WriteString(L"<m_sAllFontsPath>");
+				oBuilder.WriteEncodeXmlString(m_strAllFonts);
+				oBuilder.WriteString(L"</m_sAllFontsPath>");
+			}
 
 			if (!sConvertionParams.empty())
 			{
@@ -1090,8 +1086,6 @@ namespace NSDoctRenderer
 			if (!sOptions.empty())
 				oBuilder.WriteString(UTF8_TO_U(sOptions));
 
-			oBuilder.WriteString(oSaveAddon.GetX2tSaveAddon(m_pParent, m_nFileType));
-
 			oBuilder.WriteString(L"</TaskQueueDataConvert>");
 
 			std::wstring sXmlConvert = oBuilder.GetData();
@@ -1244,75 +1238,62 @@ namespace NSDoctRenderer
 		{
 			if (NULL == m_pWorker)
 			{
-				NSDoctRenderer::DoctRendererEditorType editorType = GetEditorType();
-				m_pWorker = new CV8RealTimeWorker(m_pParent, editorType, this);
+				m_pWorker = new CV8RealTimeWorker(m_pParent, GetEditorType(), this);
 				m_pWorker->m_sUtf8ArgumentJSON = m_oParams.m_sArgumentJSON;
 				m_pWorker->m_sGlobalVariable = m_sGlobalVariable;
-				m_pWorker->m_sJSCodeStart = U_TO_UTF8(m_sCommandsBeforeContextCreated);
 
-				m_pWorker->m_nFileType = m_nFileType;
-
-				if (-1 != m_nFileType)
-					m_sCommandsBeforeContextCreated = L"";
-				else
-				{
-					m_pWorker->NewSimpleJSInstance();
-					return true;
-				}
-
-				CV8Params oParams;
-				oParams.IsServerSaveVersion = m_bIsServerSafeVersion;
-				oParams.DocumentDirectory = m_sFileDir;
-
-				return m_pWorker->OpenFile(m_sX2tPath, m_sFileDir, editorType, this, &oParams);
+				return CheckWorkerAfterOpen();
 			}
 			return true;
 		}
 
+		bool CheckWorkerAfterOpen()
+		{
+			if (!m_pWorker)
+				return false;
+
+			m_pWorker->m_nFileType = m_nFileType;
+			if (-1 == m_nFileType)
+			{
+				m_bJavascriptBeforeEditor = true;
+				return false;
+			}
+
+			m_bJavascriptBeforeEditor = false;
+
+			CV8Params oParams;
+			oParams.IsServerSaveVersion = m_bIsServerSafeVersion;
+			oParams.DocumentDirectory = m_sFileDir;
+
+			return m_pWorker->OpenFile(m_sX2tPath, m_sFileDir, GetEditorType(), this, &oParams);
+		}
+
 		int SaveFile(const std::wstring& ext, const std::wstring& path, const wchar_t* params = NULL)
 		{
 			int nType = GetFormatByTexExtention(ext);
 			return SaveFile(nType, path, params);
 		}
 
-		bool ExecuteCommand(const std::wstring& command, CDocBuilderValue* retValue = NULL, const bool& forceExecute = false, const bool& isEnterContext = true)
+		bool ExecuteCommand(const std::wstring& command, CDocBuilderValue* retValue = NULL)
 		{
 			if (command.length() < 7 && !retValue) // minimum command (!!!)
 				return true;
 
-			if (m_nFileType == -1 && !forceExecute)
-			{
-				m_sCommandsBeforeContextCreated += command;
-				return true;
-			}
-
 			Init();
 
-			if (CheckWorker())
-			{
-				bool bIsOpenedFromSimpleJSOld = m_bIsOpenedFromSimpleJS;
-				bool bResult = m_pWorker->ExecuteCommand(command, retValue, isEnterContext);
-				if (!bResult && !bIsOpenedFromSimpleJSOld && m_bIsOpenedFromSimpleJS)
-				{
-					RELEASEOBJECT(m_pWorker);
-					CheckWorker();
-					return m_pWorker->ExecuteCommand(command, retValue, isEnterContext);
-				}
-				else
-				{
-					return bResult;
-				}
-			}
+			bool bRes = CheckWorker();
 
-			return false;
+			if (!bRes && m_pWorker && m_bJavascriptBeforeEditor)
+				m_pWorker->InitVariables();
+
+			return m_pWorker->ExecuteCommand(command, retValue);
 		}
 
 		CDocBuilderContext GetContext(bool enterContext)
 		{
 			CDocBuilderContext ctx;
 
-			if (!CheckWorker())
-				return ctx;
+			CheckWorker();
 
 			ctx.m_internal->m_context = m_pWorker->m_context;
 			ctx.m_internal->m_context_data = &m_pWorker->m_oContextData;

DesktopEditor/doctrenderer/doctrenderer.cpp

@@ -575,6 +575,7 @@ namespace NSDoctRenderer
 			{
 				CJSContextScope scope(context);
 				CJSContext::Embed<CNativeControlEmbed>(false);
+				CJSContext::Embed<CGraphicsEmbed>();
 				NSJSBase::CreateDefaults();
 
 				JSSmart<CJSTryCatch> try_catch = context->GetExceptions();
@@ -986,7 +987,7 @@ namespace NSDoctRenderer
 			case DoctRendererFormat::IMAGE:
 			{
 				editorType = NSDoctRenderer::DoctRendererEditorType::VISIO;
-				m_pInternal->m_strEditorType = L"visio";
+				m_pInternal->m_strEditorType = L"draw";
 				break;
 			}
 			default:
@@ -1066,6 +1067,7 @@ namespace NSDoctRenderer
 			{
 				CJSContextScope scope(context);
 				CJSContext::Embed<CNativeControlEmbed>();
+				CJSContext::Embed<CGraphicsEmbed>();
 				NSJSBase::CreateDefaults();
 
 				JSSmart<CJSObject> global = context->GetGlobal();

DesktopEditor/doctrenderer/doctrenderer.pri

@@ -1,130 +0,0 @@
-QT       -= core
-QT       -= gui
-
-VERSION = 1.0.0.3
-TARGET = doctrenderer
-TEMPLATE = lib
-
-CONFIG += shared
-CONFIG += plugin
-
-CORE_ROOT_DIR = $$PWD/../..
-PWD_ROOT_DIR = $$PWD
-
-PWD_CUR = $$PWD
-include($$PWD_CUR/../../Common/base.pri)
-
-DEFINES += DOCTRENDERER_USE_DYNAMIC_LIBRARY_BUILDING
-DEFINES += JSBASE_USE_DYNAMIC_LIBRARY_BUILDING
-ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, kernel_network)
-
-#CONFIG += build_xp
-#CONFIG += v8_version_60
-core_android:DEFINES += DISABLE_MEMORY_LIMITATION
-
-HEADERS += \
-	$$PWD_CUR/config.h \
-	$$PWD_CUR/editors.h \
-	$$PWD_CUR/doctrenderer.h \
-	$$PWD_CUR/docbuilder.h
-
-SOURCES += \
-	$$PWD_CUR/editors.cpp \
-	$$PWD_CUR/nativecontrol.cpp \
-	$$PWD_CUR/doctrenderer.cpp \
-	$$PWD_CUR/docbuilder.cpp \
-	$$PWD_CUR/docbuilder_p.cpp \
-	$$PWD_CUR/graphics.cpp \
-	$$PWD_CUR/hash.cpp
-
-SOURCES += \
-	$$PWD_CUR/../../Common/OfficeFileFormatChecker2.cpp \
-	$$PWD_CUR/../../Common/3dParty/pole/pole.cpp \
-	$$PWD_CUR/../../OOXML/Base/unicode_util.cpp
-
-HEADERS += \
-	$$PWD_CUR/docbuilder_p.h \
-	$$PWD_CUR/nativecontrol.h \
-	$$PWD_CUR/graphics.h \
-	$$PWD_CUR/hash.h \
-	$$PWD_CUR/server.h
-
-HEADERS += \
-	$$PWD_CUR/embed/PointerEmbed.h \
-	$$PWD_CUR/embed/ZipEmbed.h \
-	$$PWD_CUR/embed/GraphicsEmbed.h \
-	$$PWD_CUR/embed/MemoryStreamEmbed.h \
-	$$PWD_CUR/embed/NativeControlEmbed.h \
-	$$PWD_CUR/embed/NativeBuilderEmbed.h \
-	$$PWD_CUR/embed/NativeBuilderDocumentEmbed.h \
-	$$PWD_CUR/embed/TextMeasurerEmbed.h \
-	$$PWD_CUR/embed/HashEmbed.h \
-	$$PWD_CUR/embed/Default.h \
-	$$PWD_CUR/js_internal/js_base.h
-
-SOURCES += \
-	$$PWD_CUR/embed/PointerEmbed.cpp \
-	$$PWD_CUR/embed/ZipEmbed.cpp \
-	$$PWD_CUR/embed/GraphicsEmbed.cpp \
-	$$PWD_CUR/embed/MemoryStreamEmbed.cpp \
-	$$PWD_CUR/embed/NativeControlEmbed.cpp \
-	$$PWD_CUR/embed/NativeBuilderEmbed.cpp \
-	$$PWD_CUR/embed/NativeBuilderDocumentEmbed.cpp \
-	$$PWD_CUR/embed/TextMeasurerEmbed.cpp \
-	$$PWD_CUR/embed/HashEmbed.cpp \
-	$$PWD_CUR/embed/Default.cpp
-
-# Serialize objects to JS
-HEADERS += \
-	$$PWD_CUR/json/json.h \
-	$$PWD_CUR/json/json_p.h \
-	$$PWD_CUR/json/json_values.h \
-	$$PWD_CUR/json/serialization.h
-
-SOURCES += \
-	$$PWD_CUR/json/json.cpp \
-	$$PWD_CUR/json/json_values.cpp
-
-include($$PWD_CUR/js_internal/js_base.pri)
-
-!use_javascript_core {
-	build_xp:DESTDIR=$$DESTDIR/xp
-}
-
-use_javascript_core {
-	OBJECTIVE_SOURCES += $$PWD_CUR/../common/Mac/NSString+StringUtils.mm
-}
-
-# files for embedded classes
-ADD_FILES_FOR_EMBEDDED_CLASS_HEADER($$PWD_CUR/embed/GraphicsEmbed.h)
-ADD_FILES_FOR_EMBEDDED_CLASS_HEADER($$PWD_CUR/embed/HashEmbed.h)
-ADD_FILES_FOR_EMBEDDED_CLASS_HEADER($$PWD_CUR/embed/MemoryStreamEmbed.h)
-ADD_FILES_FOR_EMBEDDED_CLASS_HEADER($$PWD_CUR/embed/NativeBuilderEmbed.h)
-ADD_FILES_FOR_EMBEDDED_CLASS_HEADER($$PWD_CUR/embed/NativeBuilderDocumentEmbed.h)
-ADD_FILES_FOR_EMBEDDED_CLASS_HEADER($$PWD_CUR/embed/NativeControlEmbed.h)
-ADD_FILES_FOR_EMBEDDED_CLASS_HEADER($$PWD_CUR/embed/PointerEmbed.h)
-ADD_FILES_FOR_EMBEDDED_CLASS_HEADER($$PWD_CUR/embed/TextMeasurerEmbed.h)
-ADD_FILES_FOR_EMBEDDED_CLASS_HEADER($$PWD_CUR/embed/ZipEmbed.h)
-
-include($$PWD_CUR/../graphics/pro/textshaper.pri)
-include($$PWD_CUR/../../Common/3dParty/openssl/openssl.pri)
-
-# downloader
-DEFINES += BUIDLER_OPEN_DOWNLOAD_ENABLED
-DEFINES += BUIDLER_OPEN_BASE64_ENABLED
-
-CONFIG += drawingfile_support
-drawingfile_support {
-	DEFINES += WASM_SERIALIZER_USE_ALLOCATOR
-	ADD_DEPENDENCY(PdfFile, XpsFile, DjVuFile, DocxRenderer)
-
-	HEADERS += \
-		$$PWD_CUR/drawingfile.h \
-		$$PWD_CUR/embed/DrawingFileEmbed.h
-
-	SOURCES += \
-		$$PWD_CUR/../graphics/pro/js/wasm/src/HTMLRendererText.cpp \
-		$$PWD_CUR/embed/DrawingFileEmbed.cpp
-
-	ADD_FILES_FOR_EMBEDDED_CLASS_HEADER($$PWD_CUR/embed/DrawingFileEmbed.h)
-}

DesktopEditor/doctrenderer/doctrenderer.pro

@@ -1,3 +1,128 @@
-INCLUDEPATH += $$PWD/addon
+QT       -= core
+QT       -= gui
 
-include(doctrenderer.pri)
+VERSION = 1.0.0.3
+TARGET = doctrenderer
+TEMPLATE = lib
+
+CONFIG += shared
+CONFIG += plugin
+
+CORE_ROOT_DIR = $$PWD/../..
+PWD_ROOT_DIR = $$PWD
+include(../../Common/base.pri)
+
+DEFINES += DOCTRENDERER_USE_DYNAMIC_LIBRARY_BUILDING
+DEFINES += JSBASE_USE_DYNAMIC_LIBRARY_BUILDING
+ADD_DEPENDENCY(graphics, kernel, UnicodeConverter, kernel_network)
+
+#CONFIG += build_xp
+#CONFIG += v8_version_60
+core_android:DEFINES += DISABLE_MEMORY_LIMITATION
+
+HEADERS += \
+	config.h \
+	editors.h \
+	doctrenderer.h \
+	docbuilder.h
+
+SOURCES += \
+	editors.cpp \
+	nativecontrol.cpp \
+	doctrenderer.cpp \
+	docbuilder.cpp \
+	docbuilder_p.cpp \
+	graphics.cpp \
+	hash.cpp
+
+SOURCES += \
+	../../Common/OfficeFileFormatChecker2.cpp \
+	../../Common/3dParty/pole/pole.cpp \
+	../../OOXML/Base/unicode_util.cpp
+
+HEADERS += \
+	docbuilder_p.h \
+	nativecontrol.h \
+	graphics.h \
+	hash.h \
+	server.h
+
+HEADERS += \
+	embed/PointerEmbed.h \
+	embed/ZipEmbed.h \
+	embed/GraphicsEmbed.h \
+	embed/MemoryStreamEmbed.h \
+	embed/NativeControlEmbed.h \
+	embed/NativeBuilderEmbed.h \
+	embed/NativeBuilderDocumentEmbed.h \
+	embed/TextMeasurerEmbed.h \
+	embed/HashEmbed.h \
+	embed/Default.h \
+	js_internal/js_base.h
+
+SOURCES += \
+	embed/PointerEmbed.cpp \
+	embed/ZipEmbed.cpp \
+	embed/GraphicsEmbed.cpp \
+	embed/MemoryStreamEmbed.cpp \
+	embed/NativeControlEmbed.cpp \
+	embed/NativeBuilderEmbed.cpp \
+	embed/NativeBuilderDocumentEmbed.cpp \
+	embed/TextMeasurerEmbed.cpp \
+	embed/HashEmbed.cpp \
+	embed/Default.cpp
+
+# Serialize objects to JS
+HEADERS += \
+	json/json.h \
+	json/json_p.h \
+	json/json_values.h \
+	json/serialization.h
+
+SOURCES += \
+	json/json.cpp \
+	json/json_values.cpp
+
+include($$PWD/js_internal/js_base.pri)
+
+!use_javascript_core {
+	build_xp:DESTDIR=$$DESTDIR/xp
+}
+
+use_javascript_core {
+	OBJECTIVE_SOURCES += ../common/Mac/NSString+StringUtils.mm
+}
+
+# files for embedded classes
+ADD_FILES_FOR_EMBEDDED_CLASS_HEADER(embed/GraphicsEmbed.h)
+ADD_FILES_FOR_EMBEDDED_CLASS_HEADER(embed/HashEmbed.h)
+ADD_FILES_FOR_EMBEDDED_CLASS_HEADER(embed/MemoryStreamEmbed.h)
+ADD_FILES_FOR_EMBEDDED_CLASS_HEADER(embed/NativeBuilderEmbed.h)
+ADD_FILES_FOR_EMBEDDED_CLASS_HEADER(embed/NativeBuilderDocumentEmbed.h)
+ADD_FILES_FOR_EMBEDDED_CLASS_HEADER(embed/NativeControlEmbed.h)
+ADD_FILES_FOR_EMBEDDED_CLASS_HEADER(embed/PointerEmbed.h)
+ADD_FILES_FOR_EMBEDDED_CLASS_HEADER(embed/TextMeasurerEmbed.h)
+ADD_FILES_FOR_EMBEDDED_CLASS_HEADER(embed/ZipEmbed.h)
+
+include(../graphics/pro/textshaper.pri)
+include(../../Common/3dParty/openssl/openssl.pri)
+
+# downloader
+DEFINES += BUIDLER_OPEN_DOWNLOAD_ENABLED
+DEFINES += BUIDLER_OPEN_BASE64_ENABLED
+
+CONFIG += drawingfile_support
+drawingfile_support {
+	DEFINES += WASM_SERIALIZER_USE_ALLOCATOR
+	ADD_DEPENDENCY(PdfFile, XpsFile, DjVuFile, DocxRenderer)
+
+	HEADERS += \
+		drawingfile.h \
+		embed/DrawingFileEmbed.h
+
+	SOURCES += \
+		../../HtmlRenderer/src/HTMLRendererText.cpp \
+		embed/DrawingFileEmbed.cpp
+
+	ADD_FILES_FOR_EMBEDDED_CLASS_HEADER(embed/DrawingFileEmbed.h)
+}

DesktopEditor/doctrenderer/drawingfile.h

@@ -38,8 +38,8 @@
 #include "../../PdfFile/PdfFile.h"
 #include "../../XpsFile/XpsFile.h"
 #include "../../DjVuFile/DjVu.h"
-#include "../graphics/pro/js/wasm/src/serialize.h"
-#include "../graphics/pro/js/wasm/src/HTMLRendererText.h"
+#include "../../DesktopEditor/graphics/pro/js/wasm/src/serialize.h"
+#include "../../HtmlRenderer/include/HTMLRendererText.h"
 #include "../../DocxRenderer/DocxRenderer.h"
 
 #define CHECKER_FILE_BUFFER_LEN 4096
@@ -542,8 +542,8 @@ private:
 		}
 		if (m_nType == 0)
 			nRotate = ((CPdfFile*)m_pFile)->GetRotate(nPageIndex);
-		nWidth    = round(dWidth);
-		nHeight   = round(dHeight);
+		nWidth    = dWidth;
+		nHeight   = dHeight;
 		nPageDpiX = dPageDpiX;
 	}
 

DesktopEditor/doctrenderer/editors.cpp

@@ -6,16 +6,16 @@ namespace NSDoctRenderer
 {
 	namespace
 	{
-		bool AppendScript(NSStringUtils::CStringBuilderA* builder, const std::wstring& path, const std::string& header = "", const std::string& footer = "")
+		void AppendScript(NSStringUtils::CStringBuilderA* builder, const std::wstring& path)
 		{
 			NSFile::CFileBinary oFile;
 
 			if (!oFile.OpenFile(path))
-				return false;
+				return;
 
 			int size = (int)oFile.GetFileSize();
 			if (size < 3)
-				return false;
+				return;
 
 			BYTE* pData = new BYTE[size];
 			DWORD dwReadSize = 0;
@@ -26,18 +26,9 @@ namespace NSDoctRenderer
 			if (pData[0] == 0xEF && pData[1] == 0xBB && pData[2] == 0xBF)
 				nOffset = 3;
 
-			if (!header.empty())
-				builder->WriteString(header);
-
 			builder->WriteString((char*)(pData + nOffset), size - nOffset);
-
-			if (!footer.empty())
-				builder->WriteString(footer);
-
 			builder->WriteString("\n\n");
 			RELEASEARRAYOBJECTS(pData);
-
-			return true;
 		}
 
 		bool RunScript(JSSmart<NSJSBase::CJSContext>& context, JSSmart<NSJSBase::CJSTryCatch>& try_catch, const std::wstring& path)
@@ -109,12 +100,12 @@ namespace NSDoctRenderer
 			}
 			case DoctRendererEditorType::VISIO:
 			{
-				if (!NSFile::CFileBinary::Exists(config->m_strSdkPath + L"/visio/sdk-all-min.js"))
+				if (!NSFile::CFileBinary::Exists(config->m_strSdkPath + L"/draw/sdk-all-min.js"))
 					return L"";
-				AppendScript(builder, config->m_strSdkPath + L"/visio/sdk-all-min.js");
+				AppendScript(builder, config->m_strSdkPath + L"/draw/sdk-all-min.js");
 				AppendScript(builder, sFontsPath);
-				AppendScript(builder, config->m_strSdkPath + L"/visio/sdk-all.js");
-				sCachePath = config->m_strSdkPath + L"/visio/sdk-all";
+				AppendScript(builder, config->m_strSdkPath + L"/draw/sdk-all.js");
+				sCachePath = config->m_strSdkPath + L"/draw/sdk-all";
 				break;
 			}
 			case DoctRendererEditorType::PDF:
@@ -123,7 +114,6 @@ namespace NSDoctRenderer
 				AppendScript(builder, sFontsPath);
 				AppendScript(builder, config->m_strSdkPath + L"/word/sdk-all.js");
 				AppendScript(builder, config->m_strSdkPath + L"/pdf/src/engine/drawingfile_native.js");
-				AppendScript(builder, config->m_strSdkPath + L"/pdf/src/annotations/stamps.json", "window[\"native_pdf_stamps\"]=", ";");
 				sCachePath = config->m_strSdkPath + L"/pdf/sdk-all";
 				break;
 			}
@@ -157,7 +147,7 @@ namespace NSDoctRenderer
 			}
 			case DoctRendererEditorType::VISIO:
 			{
-				return config->m_strSdkPath + L"/visio/sdk-all.bin";
+				return config->m_strSdkPath + L"/draw/sdk-all.bin";
 			}
 			case DoctRendererEditorType::PDF:
 			{

DesktopEditor/doctrenderer/embed/Default.cpp

@@ -4,7 +4,6 @@
 #include "./MemoryStreamEmbed.h"
 #include "./TextMeasurerEmbed.h"
 #include "./HashEmbed.h"
-#include "./GraphicsEmbed.h"
 
 namespace NSJSBase
 {
@@ -14,6 +13,5 @@ namespace NSJSBase
 		CJSContext::Embed<CMemoryStreamEmbed>();
 		CJSContext::Embed<CTextMeasurerEmbed>();
 		CJSContext::Embed<CHashEmbed>();
-		CJSContext::Embed<CGraphicsEmbed>();
 	}
 }

DesktopEditor/doctrenderer/embed/DrawingFileEmbed.cpp

@@ -1,6 +1,5 @@
 #include "DrawingFileEmbed.h"
 #include "../drawingfile.h"
-#include "../../raster/BgraFrame.h"
 
 JSSmart<CJSValue> WasmMemoryToJS(BYTE* pWasmData)
 {

DesktopEditor/doctrenderer/embed/GraphicsEmbed.cpp

@@ -1,197 +1,8 @@
-#include "../graphics.h"
-#include <map>
-#include "../../../Common/Network/FileTransporter/include/FileTransporter.h"
-
-// APPLICATION INFO
-class CGraphicsAppImage_private
-{
-public:
-	NSFonts::IApplicationFonts* m_pFonts;
-	std::wstring m_sFontsDirectory;
-	std::wstring m_sImagesDirectory;
-	std::wstring m_sThemesDirectory;
-	bool m_bIsRgba;
-
-	std::map<std::wstring, std::wstring> m_mapDownloads;
-
-	CGraphicsAppImage_private()
-	{
-		m_pFonts = NULL;
-		m_sFontsDirectory = L"";
-		m_sImagesDirectory = L"";
-		m_sThemesDirectory = L"";
-		m_bIsRgba = false;
-	}
-	~CGraphicsAppImage_private()
-	{
-		RELEASEINTERFACE(m_pFonts);
-
-		for (std::map<std::wstring, std::wstring>::iterator i = m_mapDownloads.begin(); i != m_mapDownloads.end(); i++)
-		{
-			std::wstring sTmp = i->second;
-			if (NSFile::CFileBinary::Exists(sTmp))
-				NSFile::CFileBinary::Remove(sTmp);
-		}
-	}
-
-	bool IsNeedDownload(const std::wstring& sUrl)
-	{
-		if ((0 == sUrl.find(L"www.")) ||
-			(0 == sUrl.find(L"http://")) ||
-			(0 == sUrl.find(L"https://")))
-			return true;
-		return false;
-	}
-
-	std::wstring GetImagePath(const std::wstring& sUrl)
-	{
-		std::map<std::wstring, std::wstring>::iterator find = m_mapDownloads.find(sUrl);
-		if (find != m_mapDownloads.end())
-			return find->second;
-
-		NSNetwork::NSFileTransport::CFileDownloader oDownloader(sUrl, false);
-
-		std::wstring sTmpFile = NSFile::CFileBinary::CreateTempFileWithUniqueName(NSFile::CFileBinary::GetTempPath(), L"IMG");
-		if (NSFile::CFileBinary::Exists(sTmpFile))
-			NSFile::CFileBinary::Remove(sTmpFile);
-		sTmpFile = sTmpFile + L".png";
-
-		oDownloader.SetFilePath(sTmpFile);
-		oDownloader.Start(0);
-		while ( oDownloader.IsRunned() )
-		{
-			NSThreads::Sleep( 10 );
-		}
-		bool bIsDownloaded = oDownloader.IsFileDownloaded();
-
-		if (bIsDownloaded)
-		{
-			m_mapDownloads.insert(std::pair<std::wstring, std::wstring>(sUrl, sTmpFile));
-			return sTmpFile;
-		}
-
-		return sUrl;
-	}
-};
-
-CGraphicsAppImage::CGraphicsAppImage()
-{
-	m_internal = new CGraphicsAppImage_private();
-}
-CGraphicsAppImage::~CGraphicsAppImage()
-{
-	delete m_internal;
-}
-
-void CGraphicsAppImage::SetFontsDirectory(const std::wstring& dir)
-{
-	m_internal->m_sFontsDirectory = dir;
-}
-std::wstring CGraphicsAppImage::GetFontsDirectory()
-{
-	return m_internal->m_sFontsDirectory;
-}
-
-void CGraphicsAppImage::SetImagesDirectory(const std::wstring& dir)
-{
-	m_internal->m_sImagesDirectory = dir;
-}
-std::wstring CGraphicsAppImage::GetImagesDirectory()
-{
-	return m_internal->m_sImagesDirectory;
-}
-
-void CGraphicsAppImage::SetThemesDirectory(const std::wstring& dir)
-{
-	m_internal->m_sThemesDirectory = dir;
-}
-std::wstring CGraphicsAppImage::GetThemesDirectory()
-{
-	return m_internal->m_sThemesDirectory;
-}
-
-void CGraphicsAppImage::SetFonts(NSFonts::IApplicationFonts* fonts)
-{
-	m_internal->m_pFonts = fonts;
-	ADDREFINTERFACE(fonts);
-}
-NSFonts::IApplicationFonts* CGraphicsAppImage::GetFonts()
-{
-	return m_internal->m_pFonts;
-}
-
-void CGraphicsAppImage::SetRgba(const bool& isRgba)
-{
-	m_internal->m_bIsRgba = isRgba;
-}
-bool CGraphicsAppImage::GetRgba()
-{
-	return m_internal->m_bIsRgba;
-}
-
-unsigned char* CGraphicsAppImage::GetBits(int& w, int& h)
-{
-	return NULL;
-}
-unsigned char* CGraphicsAppImage::AllocBits(const int& w, const int& h)
-{
-	return new unsigned char[4 * w * h];
-}
-
-// APPLICATION INFO END
-
-CGraphicsEmbed::CGraphicsEmbed() : m_pInternal(new NSGraphics::CGraphics())
-{
-}
-CGraphicsEmbed::~CGraphicsEmbed()
-{
-	RELEASEOBJECT(m_pInternal);
-}
-
-CGraphicsAppImage* CGraphicsEmbed::GetAppImage()
-{
-	return m_pInternal->m_pAppImage;
-}
-
-void CGraphicsEmbed::SetAppImage(CGraphicsAppImage* appImage)
-{
-	m_pInternal->m_pAppImage = appImage;
-}
+#include "GraphicsEmbed.h"
 
 JSSmart<CJSValue> CGraphicsEmbed::create(JSSmart<CJSValue> Native, JSSmart<CJSValue> width_px, JSSmart<CJSValue> height_px, JSSmart<CJSValue> width_mm, JSSmart<CJSValue> height_mm)
 {
-	if (!Native->isNull())
-	{
-		JSSmart<CJSObject> pNativeObject = Native->toObject();
-		CJSEmbedObject* pNativeEmbedObject = pNativeObject->getNative();
-
-		if (m_pInternal->m_pAppImage && pNativeEmbedObject)
-		{
-			delete m_pInternal->m_pAppImage;
-			m_pInternal->m_pAppImage = NULL;
-		}
-
-		if (NULL == m_pInternal->m_pAppImage)
-			m_pInternal->m_pAppImage = new CGraphicsAppImage();
-
-		if (pNativeEmbedObject)
-		{
-			NSNativeControl::CNativeControl* pControl = (NSNativeControl::CNativeControl*)pNativeEmbedObject->getObject();
-			m_pInternal->m_pAppImage->SetFontsDirectory(pControl->m_strFontsDirectory);
-			m_pInternal->m_pAppImage->SetImagesDirectory(pControl->m_strImagesDirectory);
-		}
-		else
-		{
-			JSSmart<CJSValue> checkResources = pNativeObject->get("isResourcesObject");
-			if (checkResources->isBool() && true == checkResources->toBool())
-			{
-				m_pInternal->m_pAppImage->SetFontsDirectory(pNativeObject->get("fontsDirectory")->toStringW());
-				m_pInternal->m_pAppImage->SetImagesDirectory(pNativeObject->get("imagesDirectory")->toStringW());
-			}
-		}
-	}
-
-	m_pInternal->init(width_px->toDouble(), height_px->toDouble(), width_mm->toDouble(), height_mm->toDouble());
+	m_pInternal->init((NSNativeControl::CNativeControl*)Native->toObject()->getNative()->getObject(), width_px->toDouble(), height_px->toDouble(), width_mm->toDouble(), height_mm->toDouble());
 	return NULL;
 }
 JSSmart<CJSValue> CGraphicsEmbed::Destroy()
@@ -339,19 +150,11 @@ JSSmart<CJSValue> CGraphicsEmbed::ClearLastFont()
 }
 JSSmart<CJSValue> CGraphicsEmbed::drawImage2(JSSmart<CJSValue> img, JSSmart<CJSValue> x, JSSmart<CJSValue> y, JSSmart<CJSValue> w, JSSmart<CJSValue> h, JSSmart<CJSValue> alpha, JSSmart<CJSValue> srcRect)
 {
-	std::wstring sUrl = img->toStringW();
-	if (m_pInternal->m_pAppImage && m_pInternal->m_pAppImage->m_internal->IsNeedDownload(sUrl))
-		sUrl = m_pInternal->m_pAppImage->m_internal->GetImagePath(sUrl);
-
-	m_pInternal->drawImage(sUrl, x->toDouble(), y->toDouble(), w->toDouble(), h->toDouble(), alpha->toInt32());
+	m_pInternal->drawImage(img->toStringW(), x->toDouble(), y->toDouble(), w->toDouble(), h->toDouble(), alpha->toInt32());
 	return NULL;
 }
 JSSmart<CJSValue> CGraphicsEmbed::drawImage (JSSmart<CJSValue> img, JSSmart<CJSValue> x, JSSmart<CJSValue> y, JSSmart<CJSValue> w, JSSmart<CJSValue> h, JSSmart<CJSValue> alpha, JSSmart<CJSValue> srcRect, JSSmart<CJSValue> nativeImage)
 {
-	std::wstring sUrl = img->toStringW();
-	if (m_pInternal->m_pAppImage && m_pInternal->m_pAppImage->m_internal->IsNeedDownload(sUrl))
-		sUrl = m_pInternal->m_pAppImage->m_internal->GetImagePath(sUrl);
-
 	m_pInternal->drawImage(img->toStringW(), x->toDouble(), y->toDouble(), w->toDouble(), h->toDouble(), alpha->toInt32());
 	return NULL;
 }
@@ -656,11 +459,7 @@ JSSmart<CJSValue> CGraphicsEmbed::GetBrushColor()
 }
 JSSmart<CJSValue> CGraphicsEmbed::put_brushTexture(JSSmart<CJSValue> src, JSSmart<CJSValue> type)
 {
-	std::wstring sUrl = src->toStringW();
-	if (m_pInternal->m_pAppImage && m_pInternal->m_pAppImage->m_internal->IsNeedDownload(sUrl))
-		sUrl = m_pInternal->m_pAppImage->m_internal->GetImagePath(sUrl);
-
-	m_pInternal->put_brushTexture(sUrl, type->toInt32());
+	m_pInternal->put_brushTexture(src->toStringW(), type->toInt32());
 	return NULL;
 }
 JSSmart<CJSValue> CGraphicsEmbed::put_brushTextureMode(JSSmart<CJSValue> mode)

DesktopEditor/doctrenderer/embed/GraphicsEmbed.h

@@ -1,57 +1,21 @@
 #ifndef _BUILD_NATIVE_GRAPHICS_EMBED_H_
 #define _BUILD_NATIVE_GRAPHICS_EMBED_H_
 
-#include "../../graphics/pro/Fonts.h"
+#include "../graphics.h"
 #include "../js_internal/js_base.h"
 
-class CGraphicsAppImage_private;
-class JS_DECL CGraphicsAppImage
-{
-public:
-	CGraphicsAppImage();
-	virtual ~CGraphicsAppImage();
-public:
-	void SetFontsDirectory(const std::wstring& dir);
-	std::wstring GetFontsDirectory();
-
-	void SetImagesDirectory(const std::wstring& dir);
-	std::wstring GetImagesDirectory();
-
-	void SetThemesDirectory(const std::wstring& dir);
-	std::wstring GetThemesDirectory();
-
-	void SetFonts(NSFonts::IApplicationFonts* fonts);
-	NSFonts::IApplicationFonts* GetFonts();
-
-	void SetRgba(const bool& isRgba);
-	bool GetRgba();
-
-	virtual unsigned char* GetBits(int& w, int& h);
-	virtual unsigned char* AllocBits(const int& w, const int& h);
-
-private:
-	CGraphicsAppImage_private* m_internal;
-
-	friend class CGraphicsEmbed;
-};
-
-namespace NSGraphics { class CGraphics; }
-
 using namespace NSJSBase;
-class JS_DECL CGraphicsEmbed : public CJSEmbedObject
+class CGraphicsEmbed : public CJSEmbedObject
 {
 public:
 	NSGraphics::CGraphics* m_pInternal;
 
 public:
-	CGraphicsEmbed();
-	~CGraphicsEmbed();
+	CGraphicsEmbed() : m_pInternal(new NSGraphics::CGraphics()) {}
+	~CGraphicsEmbed() { RELEASEOBJECT(m_pInternal); }
 
 	virtual void* getObject() override { return (void*)m_pInternal; }
 
-	CGraphicsAppImage* GetAppImage();
-	void SetAppImage(CGraphicsAppImage* appImage);
-
 public:
 	JSSmart<CJSValue> create(JSSmart<CJSValue> Native, JSSmart<CJSValue> width_px, JSSmart<CJSValue> height_px, JSSmart<CJSValue> width_mm, JSSmart<CJSValue> height_mm);
 	JSSmart<CJSValue> Destroy();

DesktopEditor/doctrenderer/embed/NativeBuilderDocumentEmbed.cpp

@@ -2,7 +2,6 @@
 #include "./../docbuilder_p.h"
 
 #include "../../common/Directory.h"
-#include "../server.h"
 
 JSSmart<CJSValue> CBuilderDocumentEmbed::IsValid()
 {
@@ -69,23 +68,13 @@ void CBuilderDocumentEmbed::_OpenFile(const std::wstring& sFile, const std::wstr
 	int nConvertResult = pBuilder->ConvertToInternalFormat(m_sFolder, sFileCopy, sParams);
 
 	if (0 == nConvertResult)
-	{
-		if (CServerInstance::getInstance().IsEnable())
-			CServerInstance::getInstance().AddTmpFile(m_sFolder);
 		m_bIsValid = true;
-	}
 }
 
 void CBuilderDocumentEmbed::_CloseFile()
 {
 	if (!m_sFolder.empty())
-	{
 		NSDirectory::DeleteDirectory(m_sFolder);
-
-		if (m_bIsValid && CServerInstance::getInstance().IsEnable())
-			CServerInstance::getInstance().RemoveTmpFile(m_sFolder);
-	}
-
 	m_bIsValid = false;
 	m_sFolder = L"";
 }

DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.cpp

@@ -8,22 +8,7 @@ JSSmart<CJSValue> CBuilderEmbed::OpenFile(JSSmart<CJSValue> sPath, JSSmart<CJSVa
 {
 	std::wstring Path = sPath->toStringW();
 	std::wstring Params = sParams->toStringW();
-
-	// Since we now use snapshots, and we can't always determine which editor is needed
-	// (since the code may be BEFORE opening the file). And if the opening came from
-	// builderJS.OpenFile - in this case we skip reopening.
-	NSDoctRenderer::CDocBuilder_Private* pPrivate = GetPrivate();
-	if (pPrivate->m_pWorker->IsSimpleJSInstance())
-		pPrivate->m_bIsOpenedFromSimpleJS = true;
-
 	int ret = m_pBuilder->OpenFile(Path.c_str(), Params.c_str());
-
-	if (pPrivate->m_pWorker->IsSimpleJSInstance())
-	{
-		JSSmart<CJSContext> current = CJSContext::GetCurrent();
-		current->runScript("throw 0;");
-	}
-
 	return CJSContext::createInt(ret);
 }
 
@@ -35,21 +20,7 @@ JSSmart<CJSValue> CBuilderEmbed::CreateFile(JSSmart<CJSValue> type)
 	else
 		nFormat = type->toInt32();
 
-	// Since we now use snapshots, and we can't always determine which editor is needed
-	// (since the code may be BEFORE opening the file). And if the opening came from
-	// builderJS.OpenFile - in this case we skip reopening.
-	NSDoctRenderer::CDocBuilder_Private* pPrivate = GetPrivate();
-	if (pPrivate->m_pWorker->IsSimpleJSInstance())
-		pPrivate->m_bIsOpenedFromSimpleJS = true;
-
 	bool ret = m_pBuilder->CreateFile(nFormat);
-
-	if (pPrivate->m_pWorker->IsSimpleJSInstance())
-	{
-		JSSmart<CJSContext> current = CJSContext::GetCurrent();
-		current->runScript("throw 0;");
-	}
-
 	return CJSContext::createBool(ret);
 }
 
@@ -70,7 +41,7 @@ JSSmart<CJSValue> CBuilderEmbed::SaveFile(JSSmart<CJSValue> type, JSSmart<CJSVal
 
 	std::wstring sPath = path->toStringW();
 	std::wstring sParams = params->toStringW();
-	int ret = GetPrivate()->SaveFile(nFormat, sPath.c_str(), sParams.empty() ? NULL : sParams.c_str(), false);
+	int ret = m_pBuilder->SaveFile(nFormat, sPath.c_str(), sParams.empty() ? NULL : sParams.c_str());
 	return CJSContext::createInt(ret);
 }
 

DesktopEditor/doctrenderer/embed/NativeBuilderEmbed.h

@@ -50,7 +50,6 @@ public:
 	~CBuilderEmbed() { if(m_pBuilder) RELEASEOBJECT(m_pBuilder); }
 
 	virtual void* getObject() { return (void*)m_pBuilder; }
-	NSDoctRenderer::CDocBuilder_Private* GetPrivate() { return m_pBuilder->GetPrivate(); }
 
 public:
 	JSSmart<CJSValue> OpenFile(JSSmart<CJSValue> sPath, JSSmart<CJSValue> sParams);

DesktopEditor/doctrenderer/embed/ZipEmbed.cpp

@@ -258,64 +258,3 @@ JSSmart<CJSValue> CZipEmbed::getImageType(JSSmart<CJSValue> typedArray)
 		oBuffer.Free();
 	return CJSContext::createInt(bIsImageFile ? oChecker.eFileType : 0);
 }
-
-JSSmart<CJSValue> CZipEmbed::getImageBuffer(JSSmart<CJSValue> filePath)
-{
-	if (!m_pFolder || !filePath->isString())
-		return CJSContext::createNull();
-
-	std::wstring sFilePath = filePath->toStringW();
-	IFolder::CBuffer* pBuffer;
-	if (!m_pFolder->read(sFilePath, pBuffer))
-		return CJSContext::createNull();
-
-	size_t nBufferSize = (size_t)pBuffer->Size;
-
-	CImageFileFormatChecker oChecker;
-	bool bIsImageFile = oChecker.isImageFile(pBuffer->Buffer, (DWORD)pBuffer->Size);
-
-	if (!bIsImageFile)
-	{
-		RELEASEOBJECT(pBuffer);
-		return CJSContext::createNull();
-	}
-
-	bool bIsNeedConvertMetfileToSvg = false;
-
-	// Make as wasm module
-	if (oChecker.eFileType == _CXIMAGE_FORMAT_WMF || oChecker.eFileType == _CXIMAGE_FORMAT_EMF)
-		oChecker.eFileType = _CXIMAGE_FORMAT_SVG;
-	else
-		bIsNeedConvertMetfileToSvg = false;
-
-	if (!bIsNeedConvertMetfileToSvg)
-	{
-		BYTE* pMemory = NSJSBase::NSAllocator::Alloc(nBufferSize);
-		memcpy(pMemory, pBuffer->Buffer, nBufferSize);
-		RELEASEOBJECT(pBuffer);
-
-		JSSmart<CJSObject> retObject = CJSContext::createObject();
-		retObject->set("type", CJSContext::createInt(oChecker.eFileType));
-		retObject->set("data", NSJSBase::CJSContext::createUint8Array(pMemory, (int)nBufferSize, false));
-		return retObject->toValue();
-	}
-
-#ifndef GRAPHICS_DISABLE_METAFILE
-	MetaFile::IMetaFile* pMetaFile = MetaFile::Create(NULL);
-	pMetaFile->LoadFromBuffer(pBuffer->Buffer, (unsigned int)pBuffer->Size);
-	std::wstring wsSvg = pMetaFile->ConvertToSvg();
-	std::string sSvg = U_TO_UTF8(wsSvg);
-	pMetaFile->Release();
-	RELEASEOBJECT(pBuffer);
-
-	BYTE* pData = NSAllocator::Alloc(sSvg.length());
-	memcpy(pData, sSvg.c_str(), sSvg.length());
-
-	JSSmart<CJSObject> retObject = CJSContext::createObject();
-	retObject->set("type", CJSContext::createInt(24));
-	retObject->set("data", NSJSBase::CJSContext::createUint8Array(pData, sSvg.length(), false));
-	return retObject->toValue();
-#else
-	return CJSContext::createNull();
-#endif
-}

DesktopEditor/doctrenderer/embed/ZipEmbed.h

@@ -36,7 +36,6 @@ public:
 	JSSmart<CJSValue> encodeImageData(JSSmart<CJSValue> typedArray, JSSmart<CJSValue> w, JSSmart<CJSValue> h, JSSmart<CJSValue> stride, JSSmart<CJSValue> format, JSSmart<CJSValue> isRgba);
 	JSSmart<CJSValue> encodeImage(JSSmart<CJSValue> typedArray, JSSmart<CJSValue> format);
 	JSSmart<CJSValue> getImageType(JSSmart<CJSValue> typedArray);
-	JSSmart<CJSValue> getImageBuffer(JSSmart<CJSValue> path);
 
 	DECLARE_EMBED_METHODS
 };

DesktopEditor/doctrenderer/embed/jsc/jsc_ZipEmbed.mm

@@ -17,7 +17,6 @@
 -(JSValue*) encodeImageData : (JSValue*)typedArray : (JSValue*)w : (JSValue*)h : (JSValue*)stride : (JSValue*)format : (JSValue*)isRgba;
 -(JSValue*) encodeImage : (JSValue*)typedArray : (JSValue*)format;
 -(JSValue*) getImageType : (JSValue*)typedArray;
--(JSValue*) getImageBuffer : (JSValue*)path;
 @end
 
 @interface CJSCZipEmbed : NSObject<IJSCZipEmbed, JSEmbedObjectProtocol>
@@ -42,7 +41,6 @@ FUNCTION_WRAPPER_JS_2(decodeImage, decodeImage)
 FUNCTION_WRAPPER_JS_6(encodeImageData, encodeImageData)
 FUNCTION_WRAPPER_JS_2(encodeImage, encodeImage)
 FUNCTION_WRAPPER_JS_1(getImageType, getImageType)
-FUNCTION_WRAPPER_JS_1(getImageBuffer, getImageBuffer)
 @end
 
 class CZipEmbedAdapter : public CJSEmbedObjectAdapterJSC

DesktopEditor/doctrenderer/embed/v8/v8_ZipEmbed.cpp

@@ -20,7 +20,6 @@ namespace NSZipEmbed
 	FUNCTION_WRAPPER_V8_6(_encodeImageData, encodeImageData)
 	FUNCTION_WRAPPER_V8_2(_encodeImage, encodeImage)
 	FUNCTION_WRAPPER_V8_1(_getImageType, getImageType)
-	FUNCTION_WRAPPER_V8_1(_getImageBuffer, getImageBuffer)
 
 	v8::Handle<v8::ObjectTemplate> CreateTemplate(v8::Isolate* isolate)
 	{
@@ -40,7 +39,6 @@ namespace NSZipEmbed
 		NSV8Objects::Template_Set(result, "encodeImageData",	_encodeImageData);
 		NSV8Objects::Template_Set(result, "encodeImage",	_encodeImage);
 		NSV8Objects::Template_Set(result, "getImageType",	_getImageType);
-		NSV8Objects::Template_Set(result, "getImageBuffer",	_getImageBuffer);
 
 		return handle_scope.Escape(result);
 	}

DesktopEditor/doctrenderer/graphics.cpp

@@ -10,35 +10,18 @@
 #define M_PI 3.14159265358979323846
 #endif
 
-#ifdef _DEBUG
-//#define ENABLE_GR_LOGS
-#endif
-
 namespace NSGraphics
 {
-	void CGraphics::init(double width_px, double height_px, double width_mm, double height_mm)
+	void CGraphics::init(NSNativeControl::CNativeControl* oNative, double width_px, double height_px, double width_mm, double height_mm)
 	{
-		if (!m_pAppImage)
-			return;
-
-		if (NULL == m_pAppImage->GetFonts())
-		{
-			NSFonts::IApplicationFonts* pFonts = NSFonts::NSApplication::Create();
-			std::wstring sFontsDir = m_pAppImage->GetFontsDirectory();
-			pFonts->InitializeFromFolder(sFontsDir.empty() ? NSFile::GetProcessDirectory() : sFontsDir);
-			m_pAppImage->SetFonts(pFonts);
-			RELEASEINTERFACE(pFonts);
-		}
-
-		NSFonts::IFontManager* pManager = m_pAppImage->GetFonts()->GenerateFontManager();
-
-#ifdef ENABLE_GR_LOGS
-		std::wcout << L"init "<<
-			m_pAppImage->GetImagesDirectory() << L"  " <<
-			m_pAppImage->GetFontsDirectory() << L"  " <<
-			width_px << L"  " << height_px << L"  " <<
-			width_mm << L"  " << height_mm << std::endl;
+		m_sApplicationImagesDirectory = oNative->m_strImagesDirectory;
+		m_sApplicationFontsDirectory  = oNative->m_strFontsDirectory;
+#ifdef _DEBUG
+		std::wcout << L"init "<< m_sApplicationImagesDirectory << L"  " << m_sApplicationFontsDirectory << L"  " << width_px << L"  " << height_px << L"  " << width_mm << L"  " << height_mm << std::endl;
 #endif
+		m_pApplicationFonts = NSFonts::NSApplication::Create();
+		m_pApplicationFonts->InitializeFromFolder(m_sApplicationFontsDirectory.empty() ? NSFile::GetProcessDirectory() : m_sApplicationFontsDirectory);
+		NSFonts::IFontManager* pManager = m_pApplicationFonts->GenerateFontManager();
 
 		m_pRenderer = NSGraphics::Create();
 		m_pRenderer->SetFontManager(pManager);
@@ -59,19 +42,7 @@ namespace NSGraphics
 			if (nRasterH < 1) nRasterH = 0;
 		}
 
-		int nExistW = 0;
-		int nExistH = 0;
-		BYTE* pData =  m_pAppImage->GetBits(nExistW, nExistH);
-		if (pData != NULL)
-		{
-			nRasterW = nExistW;
-			nRasterH = nExistH;
-		}
-		else
-		{
-			pData = m_pAppImage->AllocBits(nRasterW, nRasterH);
-		}
-
+		BYTE* pData = new BYTE[4 * nRasterW * nRasterH];
 		unsigned int back = 0xffffff;
 		unsigned int* pData32 = (unsigned int*)pData;
 		unsigned int* pData32End = pData32 + nRasterW * nRasterH;
@@ -84,21 +55,21 @@ namespace NSGraphics
 		m_oFrame.put_Stride(4 * nRasterW);
 
 		m_pRenderer->CreateFromBgraFrame(&m_oFrame);
-		m_pRenderer->SetSwapRGB(m_pAppImage->GetRgba());
+		m_pRenderer->SetSwapRGB(false);
 
 		m_pRenderer->put_Width(width_mm);
 		m_pRenderer->put_Height(height_mm);
 	}
 	void CGraphics::put_GlobalAlpha(bool enable, double alpha)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "put_GlobalAlpha " << enable << "  " << alpha << std::endl;
 #endif
 		m_pRenderer->put_GlobalAlphaEnabled(enable, alpha);
 	}
 	void CGraphics::End_GlobalAlpha()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "End_GlobalAlpha " << std::endl;
 #endif
 		bool bIsInteger = m_pRenderer->get_IntegerGrid();
@@ -115,7 +86,7 @@ namespace NSGraphics
 	}
 	void CGraphics::p_color(int r, int g, int b, int a)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "p_color " << r << "  " << g << "  " << b << "  " << a << std::endl;
 #endif
 		m_pRenderer->put_PenColor(r | (g << 8) | (b << 16));
@@ -123,14 +94,14 @@ namespace NSGraphics
 	}
 	void CGraphics::p_width(double w)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "p_width " << w  << std::endl;
 #endif
 		m_pRenderer->put_PenSize(w / 1000.0);
 	}
 	void CGraphics::p_dash(size_t length, double* dash)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "p_dash " << length << std::endl;
 #endif
 		if(length > 0)
@@ -148,7 +119,7 @@ namespace NSGraphics
 	}
 	void CGraphics::b_color1(int r, int g, int b, int a)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "b_color1 " << r << "  " << g << "  " << b << "  " << a << std::endl;
 #endif
 		m_pRenderer->put_BrushType(c_BrushTypeSolid);
@@ -157,7 +128,7 @@ namespace NSGraphics
 	}
 	void CGraphics::b_color2(int r, int g, int b, int a)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "b_color2 " << r << "  " << g << "  " << b << "  " << a << std::endl;
 #endif
 		m_pRenderer->put_BrushColor2(r | (g << 8) | (b << 16));
@@ -165,42 +136,42 @@ namespace NSGraphics
 	}
 	void CGraphics::transform(double sx, double shy, double shx, double sy, double tx, double ty)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "transform " << sx << "  " << shy << "  " << shx << "  " << sy << "  " << tx << "  " << ty << std::endl;
 #endif
 		m_pRenderer->SetTransform(sx, shy, shx, sy, tx, ty);
 	}
 	void CGraphics::CalculateFullTransform()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "CalculateFullTransform " << std::endl;
 #endif
 		m_pRenderer->CalculateFullTransform();
 	}
 	void CGraphics::_s()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "_s " << std::endl;
 #endif
 		m_pRenderer->PathCommandEnd();
 	}
 	void CGraphics::_e()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "_e " << std::endl;
 #endif
 		m_pRenderer->PathCommandEnd();
 	}
 	void CGraphics::_z()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "_z " << std::endl;
 #endif
 		m_pRenderer->PathCommandClose();
 	}
 	void CGraphics::_m(double x, double y)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "_m " << x << "  " << y << std::endl;
 #endif
 		if (!m_pRenderer->get_IntegerGrid())
@@ -213,7 +184,7 @@ namespace NSGraphics
 	}
 	void CGraphics::_l(double x, double y)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "_l " << x << "  " << y << std::endl;
 #endif
 		if (!m_pRenderer->get_IntegerGrid())
@@ -226,7 +197,7 @@ namespace NSGraphics
 	}
 	void CGraphics::_c (double x1, double y1, double x2, double y2, double x3, double y3)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "_c " << x1 << "  " << y1 << "  " << x2 << "  " << y2 << "  " << x3 << "  " << y3 << std::endl;
 #endif
 		if (!m_pRenderer->get_IntegerGrid())
@@ -241,7 +212,7 @@ namespace NSGraphics
 	}
 	void CGraphics::_c2(double x1, double y1, double x2, double y2)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "_c2 " << x1 << "  " << y1 << "  " << x2 << "  " << y2 << std::endl;
 #endif
 		if (!m_pRenderer->get_IntegerGrid())
@@ -255,28 +226,28 @@ namespace NSGraphics
 	}
 	void CGraphics::ds()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "ds " << std::endl;
 #endif
 		m_pRenderer->Stroke();
 	}
 	void CGraphics::df()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "df " << std::endl;
 #endif
 		m_pRenderer->Fill();
 	}
 	void CGraphics::save()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "save " << std::endl;
 #endif
-		m_oFrame.SaveFile(m_pAppImage->GetImagesDirectory() + L"/img.png", _CXIMAGE_FORMAT_PNG);
+		m_oFrame.SaveFile(m_sApplicationImagesDirectory + L"/img.png", _CXIMAGE_FORMAT_PNG);
 	}
 	void CGraphics::restore()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "restore " << std::endl;
 #endif
 		m_pRenderer->BeginCommand(c_nResetClipType);
@@ -284,7 +255,7 @@ namespace NSGraphics
 	}
 	void CGraphics::clip()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "clip " << std::endl;
 #endif
 		m_pRenderer->BeginCommand(c_nClipType);
@@ -292,46 +263,43 @@ namespace NSGraphics
 	}
 	void CGraphics::reset()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "reset " << std::endl;
 #endif
 		m_pRenderer->ResetTransform();
 	}
 	void CGraphics::FreeFont()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "FreeFont " << std::endl;
 #endif
 		m_pRenderer->CloseFont();
 	}
 	void CGraphics::ClearLastFont()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "ClearLastFont " << std::endl;
 #endif
 		m_pRenderer->ClearInstallFont();
 	}
 	void CGraphics::drawImage(const std::wstring& img, double x, double y, double w, double h, BYTE alpha)
 	{
-		std::wstring strImage = img;
-		if (!NSFile::CFileBinary::Exists(img))
-			strImage = (0 == img.find(L"theme") ? m_pAppImage->GetThemesDirectory() : m_pAppImage->GetImagesDirectory()) + L'/' + img;
-
-#ifdef ENABLE_GR_LOGS
+		std::wstring strImage = (0 == img.find(L"theme") ? m_sApplicationThemesDirectory : m_sApplicationImagesDirectory) + L'/' + img;
+#ifdef _DEBUG
 		std::wcout << L"drawImage " << strImage << L"  " << x << "  " << y << L"  " << w << L"  " << h << L"  " << alpha << std::endl;
 #endif
 		m_pRenderer->DrawImageFromFile(strImage, x, y, w, h, alpha);
 	}
 	std::wstring CGraphics::GetFont()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "GetFont " << std::endl;
 #endif
 		return m_pRenderer->GetFontManager()->GetName();
 	}
 	void CGraphics::SetFont(const std::wstring& name, int face, double size, int style)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::wcout << L"SetFont " << name << L"  " << face << L"  " << size << L"  " << style << std::endl;
 #endif
 		double DpiX, DpiY;
@@ -346,21 +314,21 @@ namespace NSGraphics
 	}
 	void CGraphics::FillText(double x, double y, int text)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::wcout << L"FillText " << (wchar_t)text << L"  " << x << L"  " << y << std::endl;
 #endif
 		m_pRenderer->CommandDrawTextCHAR(text, x, y, 0, 0);
 	}
 	void CGraphics::t(double x, double y, const std::wstring& text)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::wcout << L"t " << text << L"  " << x << L"  " << y << std::endl;
 #endif
 		m_pRenderer->CommandDrawText(text, x, y, 0, 0);
 	}
 	void CGraphics::tg(int text, double x, double y)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::wcout << L"tg " << text << L"  " << x << L"  " << y << std::endl;
 #endif
 		m_pRenderer->put_FontStringGID(TRUE);
@@ -369,21 +337,21 @@ namespace NSGraphics
 	}
 	void CGraphics::SetIntegerGrid(bool param)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "SetIntegerGrid " << param << std::endl;
 #endif
 		m_pRenderer->put_IntegerGrid(param);
 	}
 	bool CGraphics::GetIntegerGrid()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "GetIntegerGrid " << std::endl;
 #endif
 		return m_pRenderer->get_IntegerGrid();
 	}
 	void CGraphics::DrawStringASCII (const std::wstring& text, double x, double y)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::wcout << L"DrawStringASCII " << text << L"  " << x << L"  " << y << std::endl;
 #endif
 		double DpiY;
@@ -405,7 +373,7 @@ namespace NSGraphics
 	}
 	void CGraphics::DrawHeaderEdit(double yPos)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "DrawHeaderEdit " << std::endl;
 #endif
 		m_pRenderer->PathCommandEnd();
@@ -448,7 +416,7 @@ namespace NSGraphics
 	}
 	void CGraphics::DrawFooterEdit(double yPos)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "DrawFooterEdit " << std::endl;
 #endif
 		m_pRenderer->PathCommandEnd();
@@ -491,7 +459,7 @@ namespace NSGraphics
 	}
 	void CGraphics::DrawLockParagraph (double x,  double y1, double y2)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "DrawLockParagraph " << std::endl;
 #endif
 		m_pRenderer->PathCommandEnd();
@@ -563,7 +531,7 @@ namespace NSGraphics
 	}
 	void CGraphics::DrawLockObjectRect(double x,  double y,  double w,  double h)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "DrawLockObjectRect " << std::endl;
 #endif
 		m_pRenderer->PathCommandEnd();
@@ -589,7 +557,7 @@ namespace NSGraphics
 	}
 	void CGraphics::DrawEmptyTableLine(double x1, double y1, double x2, double y2)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "DrawEmptyTableLine " << std::endl;
 #endif
 		m_pRenderer->PathCommandEnd();
@@ -674,7 +642,7 @@ namespace NSGraphics
 	}
 	void CGraphics::DrawSpellingLine  (double y0, double x0, double x1, double w)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "DrawSpellingLine " << std::endl;
 #endif
 		Aggplus::CMatrix* pMatrix = m_pRenderer->GetTransformMatrix();
@@ -1020,7 +988,7 @@ namespace NSGraphics
 	}
 	void CGraphics::SaveGrState()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "SaveGrState " << std::endl;
 #endif
 		CGrStateState* pState = new CGrStateState();
@@ -1036,7 +1004,7 @@ namespace NSGraphics
 	}
 	void CGraphics::RestoreGrState()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "RestoreGrState " << std::endl;
 #endif
 		if (m_oGrState.States.empty())
@@ -1100,14 +1068,14 @@ namespace NSGraphics
 	}
 	void CGraphics::StartClipPath()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "StartClipPath " << std::endl;
 #endif
 		m_pRenderer->BeginCommand(c_nClipType);
 	}
 	void CGraphics::EndClipPath()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "EndClipPath " << std::endl;
 #endif
 		m_pRenderer->EndCommand(c_nClipType);
@@ -1165,7 +1133,7 @@ namespace NSGraphics
 	}
 	std::string CGraphics::toDataURL(std::wstring type)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::wcout << "toDataURL " << type << std::endl;
 #endif
 		std::wstring sFormat = (type.length() > 6) ? type.substr(6) : type;
@@ -1210,11 +1178,11 @@ namespace NSGraphics
 	{
 		if (src.find(L"data:") == 0)
 		{
-			std::wstring strImage = m_pAppImage->GetImagesDirectory() + L"/texture.png";
+			std::wstring strImage = m_sApplicationImagesDirectory + L"/texture.png";
 			bool bIsOnlyOfficeHatch = false;
 			if(src.find(L"onlyoffice_hatch") != std::wstring::npos)
 				bIsOnlyOfficeHatch = true;
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 			std::wcout << L"put_brushTexture " << src << L"  "  << type << std::endl;
 #endif
 			src.erase(0, src.find(L',') + 1);
@@ -1253,10 +1221,7 @@ namespace NSGraphics
 		}
 		else
 		{
-			std::wstring strImage = src;
-			if (!NSFile::CFileBinary::Exists(src))
-				strImage = (0 == src.find(L"theme") ? m_pAppImage->GetThemesDirectory() : m_pAppImage->GetImagesDirectory()) + L'/' + src;
-
+			std::wstring strImage = (0 == src.find(L"theme") ? m_sApplicationThemesDirectory : m_sApplicationImagesDirectory) + L'/' + src;
 			std::wstring sName = strImage.substr(0, strImage.rfind(L'.') + 1);
 			std::wstring sExt = src.substr(src.rfind(L'.') + 1);
 			if (sExt == L"svg")
@@ -1266,7 +1231,7 @@ namespace NSGraphics
 				else if (NSFile::CFileBinary::Exists(sName + L"emf") && src.find(L"display") == 0)
 					strImage = sName + L"emf";
 
-				MetaFile::IMetaFile* pMetafile = MetaFile::Create(m_pAppImage->GetFonts());
+				MetaFile::IMetaFile* pMetafile = MetaFile::Create(m_pApplicationFonts);
 				pMetafile->LoadFromFile(strImage.c_str());
 
 				double x = 0, y = 0, w = 0, h = 0;
@@ -1279,7 +1244,7 @@ namespace NSGraphics
 			}
 			else
 				sName += sExt;
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 			std::wcout << L"put_brushTexture " << sName << L"  " << type << std::endl;
 #endif
 			m_pRenderer->put_BrushType(c_BrushTypeTexture);
@@ -1289,21 +1254,21 @@ namespace NSGraphics
 	}
 	void CGraphics::put_brushTextureMode(int mode)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "put_brushTextureMode " << mode << std::endl;
 #endif
 		m_pRenderer->put_BrushTextureMode(mode);
 	}
 	void CGraphics::put_BrushTextureAlpha(int a)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "put_BrushTextureAlpha " << a << std::endl;
 #endif
 		m_pRenderer->put_BrushTextureAlpha(a == 0 ? 255 : a);
 	}
 	void CGraphics::put_BrushGradient(LONG* pColors, double* pPositions, size_t nCount, double x0, double y0, double x1, double y1, double r0, double r1)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "put_BrushGradient " << nCount << "  " << x0 << "  " << y0 << "  " << x1 << "  " << y1 << "  " << r0 << "  " << r1 << std::endl;
 		for (size_t i = 0; i < nCount; i++)
 			std::cout << pPositions[i] << "  " << pColors[i] << "  ";
@@ -1328,7 +1293,7 @@ namespace NSGraphics
 	}
 	double CGraphics::TransformPointX(double x, double y)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "TransformPointX " << std::endl;
 #endif
 		m_pRenderer->GetFullTransform()->TransformPoint(x, y);
@@ -1336,7 +1301,7 @@ namespace NSGraphics
 	}
 	double CGraphics::TransformPointY(double x, double y)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "TransformPointY " << std::endl;
 #endif
 		m_pRenderer->GetFullTransform()->TransformPoint(x, y);
@@ -1344,14 +1309,14 @@ namespace NSGraphics
 	}
 	void CGraphics::put_LineJoin(int nJoin)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "put_LineJoin " << std::endl;
 #endif
 		m_pRenderer->put_PenLineJoin(nJoin);
 	}
 	int CGraphics::GetLineJoin()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "GetLineJoin " << std::endl;
 #endif
 		BYTE nRes;
@@ -1360,7 +1325,7 @@ namespace NSGraphics
 	}
 	void CGraphics::put_TextureBounds(double x, double y, double w, double h)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "put_TextureBounds " << x << "  " << y << "  " << w << "  " << h << std::endl;
 #endif
 		if(m_pRenderer->get_IntegerGrid())
@@ -1376,7 +1341,7 @@ namespace NSGraphics
 	}
 	double CGraphics::GetlineWidth()
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "GetlineWidth " << std::endl;
 #endif
 		double nRes;
@@ -1385,7 +1350,7 @@ namespace NSGraphics
 	}
 	void CGraphics::DrawPath(int path)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "DrawPath " << path << std::endl;
 #endif
 		if(path == 257)
@@ -1398,7 +1363,7 @@ namespace NSGraphics
 	}
 	void CGraphics::CoordTransformOffset(double tx, double ty)
 	{
-#ifdef ENABLE_GR_LOGS
+#ifdef _DEBUG
 		std::cout << "CoordTransformOffset " << tx << "  " << ty << std::endl;
 #endif
 		m_pRenderer->SetCoordTransformOffset(tx, ty);

DesktopEditor/doctrenderer/graphics.h

@@ -7,7 +7,6 @@
 #include "../common/File.h"
 #include "nativecontrol.h"
 #include "../graphics/pro/Graphics.h"
-#include "embed/GraphicsEmbed.h"
 
 namespace NSGraphics
 {
@@ -115,32 +114,28 @@ namespace NSGraphics
 	class CGraphics
 	{
 	public:
-		CGraphicsAppImage* m_pAppImage;
-		CBgraFrame m_oFrame;
+		std::wstring m_sApplicationFontsDirectory;
+		std::wstring m_sApplicationImagesDirectory;
+		std::wstring m_sApplicationThemesDirectory;
 
 	private:
+		NSFonts   ::IApplicationFonts* m_pApplicationFonts;
 		NSGraphics::IGraphicsRenderer* m_pRenderer;
+		CBgraFrame m_oFrame;
 		CGrState   m_oGrState;
 
 	public:
-		CGraphics()
-		{
-			m_pAppImage = NULL;
-		}
+		CGraphics() {}
 		~CGraphics()
 		{
 			Destroy();
 		}
 
-		void init(double width_px, double height_px, double width_mm, double height_mm);
+		void init(NSNativeControl::CNativeControl* oNative, double width_px, double height_px, double width_mm, double height_mm);
 		void Destroy()
 		{
-			int w, h;
-			if (m_pAppImage && m_pAppImage->GetBits(w, h))
-				m_oFrame.put_Data(NULL);
-
 			RELEASEINTERFACE(m_pRenderer);
-			RELEASEOBJECT(m_pAppImage);
+			RELEASEINTERFACE(m_pApplicationFonts);
 		}
 		void EndDraw() {}
 		void put_GlobalAlpha(bool enable, double globalAlpha);

DesktopEditor/doctrenderer/js_internal/jsc/jsc_base.mm

@@ -374,7 +374,7 @@ namespace NSJSBase
 
 	JSSmart<CJSContext> CJSContext::GetCurrent()
 	{
-		CJSContext* ret = new CJSContext(false);
+		CJSContext* ret = new CJSContext();
 		ret->m_internal->context = NSJSBase::CJSContextPrivate::GetCurrentContext();
 		return ret;
 	}

DesktopEditor/doctrenderer/js_internal/v8/v8_base.h

@@ -54,9 +54,9 @@ v8::Local<v8::String> CreateV8String(v8::Isolate* i, const std::string& str);
 
 #ifdef __ANDROID__
 
-//#ifdef _DEBUG
+#ifdef _DEBUG
 #define ANDROID_LOGS
-//#endif
+#endif
 
 #ifdef ANDROID_LOGS
 #include <android/log.h>
@@ -488,11 +488,7 @@ namespace NSJSBase
 
 		virtual CJSEmbedObject* getNative()
 		{
-			if (0 == value->InternalFieldCount())
-				return NULL;
 			v8::Handle<v8::External> field = v8::Handle<v8::External>::Cast(value->GetInternalField(0));
-			if (field.IsEmpty())
-				return NULL;
 			return (CJSEmbedObject*)field->Value();
 		}
 
@@ -995,76 +991,67 @@ inline void js_return(const v8::PropertyCallbackInfo<v8::Value>& info, JSSmart<N
 #define PROPERTY_GET(NAME, NAME_EMBED)                                                      \
 	void NAME(v8::Local<v8::String> _name, const v8::PropertyCallbackInfo<v8::Value>& info) \
 {                                                                                           \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(info.Holder()));    \
-	if (!_this) return;                                                                     \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(info.Holder());                  \
 	JSSmart<CJSValue> ret = _this->NAME_EMBED();                                            \
 	js_return(info, ret);                                                                   \
 	}
 
-#define FUNCTION_WRAPPER_V8_0(NAME, NAME_EMBED)                                             \
-	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                              \
-{                                                                                           \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(args.Holder()));    \
-	if (!_this) return;                                                                     \
-	JSSmart<CJSValue> ret = _this->NAME_EMBED();                                            \
-	js_return(args, ret);                                                                   \
+#define FUNCTION_WRAPPER_V8_0(NAME, NAME_EMBED)										\
+	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                      \
+{                                                                                   \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(args.Holder());          \
+	JSSmart<CJSValue> ret = _this->NAME_EMBED();                                    \
+	js_return(args, ret);                                                           \
 	}
 
 #define FUNCTION_WRAPPER_V8(NAME, NAME_EMBED) FUNCTION_WRAPPER_V8_0(NAME, NAME_EMBED)
 
-#define FUNCTION_WRAPPER_V8_1(NAME, NAME_EMBED)                                             \
-	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                              \
-{                                                                                           \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(args.Holder()));    \
-	if (!_this) return;                                                                     \
-	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]));                           \
-	js_return(args, ret);                                                                   \
+#define FUNCTION_WRAPPER_V8_1(NAME, NAME_EMBED)                                     \
+	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                      \
+{                                                                                   \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(args.Holder());          \
+	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]));                   \
+	js_return(args, ret);                                                           \
 	}
-#define FUNCTION_WRAPPER_V8_2(NAME, NAME_EMBED)                                             \
-	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                              \
-{                                                                                           \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(args.Holder()));    \
-	if (!_this) return;                                                                     \
-	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]), js_value(args[1]));        \
-	js_return(args, ret);                                                                   \
+#define FUNCTION_WRAPPER_V8_2(NAME, NAME_EMBED)                                         \
+	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                          \
+{                                                                                       \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(args.Holder());              \
+	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]), js_value(args[1]));    \
+	js_return(args, ret);                                                               \
 	}
 #define FUNCTION_WRAPPER_V8_3(NAME, NAME_EMBED)                                                             \
 	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                                              \
 {                                                                                                           \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(args.Holder()));                    \
-	if (!_this) return;                                                                                     \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(args.Holder());                                  \
 	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]), js_value(args[1]), js_value(args[2]));     \
 	js_return(args, ret);                                                                                   \
 	}
 #define FUNCTION_WRAPPER_V8_4(NAME, NAME_EMBED)                                                                             \
 	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                                                              \
 {                                                                                                                           \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(args.Holder()));                                    \
-	if (!_this) return;                                                                                                     \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(args.Holder());                                                  \
 	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]), js_value(args[1]), js_value(args[2]), js_value(args[3]));  \
 	js_return(args, ret);                                                                                                   \
 	}
 #define FUNCTION_WRAPPER_V8_5(NAME, NAME_EMBED)                                                                                                 \
 	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                                                                                  \
 {                                                                                                                                               \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(args.Holder()));                                                        \
-	if (!_this) return;                                                                                                                         \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(args.Holder());                                                                      \
 	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]), js_value(args[1]), js_value(args[2]), js_value(args[3]), js_value(args[4]));   \
 	js_return(args, ret);                                                                                                                       \
 	}
 #define FUNCTION_WRAPPER_V8_6(NAME, NAME_EMBED)                                                                                                                    \
 	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                                                                                                     \
 {                                                                                                                                                                  \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(args.Holder()));                                                                           \
-	if (!_this) return;                                                                                                                                            \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(args.Holder());                                                                                         \
 	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]), js_value(args[1]), js_value(args[2]), js_value(args[3]), js_value(args[4]), js_value(args[5]));   \
 	js_return(args, ret);                                                                                                                                          \
 	}
 #define FUNCTION_WRAPPER_V8_7(NAME, NAME_EMBED)                                                                                                 \
 	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                                                                                  \
 {                                                                                                                                               \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(args.Holder()));                                                        \
-	if (!_this) return;                                                                                                                         \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(args.Holder());                                                                      \
 	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]), js_value(args[1]), js_value(args[2]), js_value(args[3]), js_value(args[4]),    \
 	js_value(args[5]), js_value(args[6]));                                                                                                      \
 	js_return(args, ret);                                                                                                                       \
@@ -1072,8 +1059,7 @@ inline void js_return(const v8::PropertyCallbackInfo<v8::Value>& info, JSSmart<N
 #define FUNCTION_WRAPPER_V8_8(NAME, NAME_EMBED)                                                                                                 \
 	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                                                                                  \
 {                                                                                                                                               \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(args.Holder()));                                                        \
-	if (!_this) return;                                                                                                                         \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(args.Holder());                                                                      \
 	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]), js_value(args[1]), js_value(args[2]), js_value(args[3]), js_value(args[4]),    \
 	js_value(args[5]), js_value(args[6]), js_value(args[7]));                                                                                   \
 	js_return(args, ret);                                                                                                                       \
@@ -1081,8 +1067,7 @@ inline void js_return(const v8::PropertyCallbackInfo<v8::Value>& info, JSSmart<N
 #define FUNCTION_WRAPPER_V8_9(NAME, NAME_EMBED)                                                                                                 \
 	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                                                                                  \
 {                                                                                                                                               \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(args.Holder()));                                                        \
-	if (!_this) return;                                                                                                                         \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(args.Holder());                                                                      \
 	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]), js_value(args[1]), js_value(args[2]), js_value(args[3]), js_value(args[4]),    \
 	js_value(args[5]), js_value(args[6]), js_value(args[7]), js_value(args[8]));                                                                \
 	js_return(args, ret);                                                                                                                       \
@@ -1090,8 +1075,7 @@ inline void js_return(const v8::PropertyCallbackInfo<v8::Value>& info, JSSmart<N
 #define FUNCTION_WRAPPER_V8_10(NAME, NAME_EMBED)                                                                                                                \
 	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                                                                                                  \
 {                                                                                                                                                               \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(args.Holder()));                                                                        \
-	if (!_this) return;                                                                                                                                         \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(args.Holder());                                                                                      \
 	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]), js_value(args[1]), js_value(args[2]), js_value(args[3]), js_value(args[4]), js_value(args[5]), \
 	js_value(args[6]), js_value(args[7]), js_value(args[8]), js_value(args[9]));                                                                                \
 	js_return(args, ret);                                                                                                                                       \
@@ -1099,8 +1083,7 @@ inline void js_return(const v8::PropertyCallbackInfo<v8::Value>& info, JSSmart<N
 #define FUNCTION_WRAPPER_V8_13(NAME, NAME_EMBED)                                                                                                                \
 	void NAME(const v8::FunctionCallbackInfo<v8::Value>& args)                                                                                                  \
 {                                                                                                                                                               \
-	CURRENTWRAPPER* _this = dynamic_cast<CURRENTWRAPPER*>(unwrap_native(args.Holder()));                                                                        \
-	if (!_this) return;                                                                                                                                         \
+	CURRENTWRAPPER* _this = (CURRENTWRAPPER*)unwrap_native(args.Holder());                                                                                      \
 	JSSmart<CJSValue> ret = _this->NAME_EMBED(js_value(args[0]), js_value(args[1]), js_value(args[2]), js_value(args[3]), js_value(args[4]), js_value(args[5]), \
 	js_value(args[6]), js_value(args[7]), js_value(args[8]), js_value(args[9]), js_value(args[10]), js_value(args[11]),                                         \
 	js_value(args[12]));                                                                                                                                        \

DesktopEditor/doctrenderer/json/json.cpp

@@ -99,11 +99,6 @@ namespace NSJSON
 		return m_internal->m_type == CTypedValue::vtObject;
 	}
 
-	bool IValue::IsImage() const
-	{
-		return m_internal->m_type == CTypedValue::vtImage;
-	}
-
 	bool IValue::ToBool() const
 	{
 		if (m_internal->m_type != CTypedValue::vtPrimitive)
@@ -355,11 +350,6 @@ namespace NSJSON
 			strRes += "}";
 			break;
 		}
-		case CTypedValue::vtImage:
-		{
-			// TODO: implement like typed array?
-			break;
-		}
 		}
 
 		return strRes;
@@ -507,82 +497,6 @@ namespace NSJSON
 		return static_cast<CObject*>(m_internal->m_value.get())->getPropertyNames();
 	}
 
-	const BYTE* IValue::GetImageBits() const
-	{
-		if (m_internal->m_type != CTypedValue::vtImage)
-		{
-#ifdef JSON_DEBUG
-			throw std::bad_cast();
-#endif
-			return nullptr;
-		}
-		return static_cast<CImage*>(m_internal->m_value.get())->getBits();
-	}
-
-	BYTE* IValue::GetImageBits()
-	{
-		return const_cast<BYTE*>(static_cast<const CValue&>(*this).GetImageBits());
-	}
-
-	int IValue::GetImageWidth() const
-	{
-		if (m_internal->m_type != CTypedValue::vtImage)
-		{
-#ifdef JSON_DEBUG
-			throw std::bad_cast();
-#endif
-			return 0;
-		}
-		return static_cast<CImage*>(m_internal->m_value.get())->getWidth();
-	}
-
-	int IValue::GetImageHeight() const
-	{
-		if (m_internal->m_type != CTypedValue::vtImage)
-		{
-#ifdef JSON_DEBUG
-			throw std::bad_cast();
-#endif
-			return 0;
-		}
-		return static_cast<CImage*>(m_internal->m_value.get())->getHeight();
-	}
-
-	ImageFormat IValue::GetImageFormat() const
-	{
-		if (m_internal->m_type != CTypedValue::vtImage)
-		{
-#ifdef JSON_DEBUG
-			throw std::bad_cast();
-#endif
-			return ImageFormat::ifInvalid;
-		}
-		return static_cast<CImage*>(m_internal->m_value.get())->getFormat();
-	}
-
-	void IValue::ImageExternalize()
-	{
-		if (m_internal->m_type != CTypedValue::vtImage)
-		{
-#ifdef JSON_DEBUG
-			throw std::bad_cast();
-#endif
-			return;
-		}
-		static_cast<CImage*>(m_internal->m_value.get())->externalize();
-	}
-
-	void IValue::ImageAlloc(const int& width, const int& height, const ImageFormat& format)
-	{
-		if (m_internal->m_type != CTypedValue::vtImage)
-		{
-#ifdef JSON_DEBUG
-			throw std::bad_cast();
-#endif
-			return;
-		}
-		static_cast<CImage*>(m_internal->m_value.get())->alloc(width, height, format);
-	}
 
 	CValue::CValue() : IValue()
 	{
@@ -676,35 +590,6 @@ namespace NSJSON
 		NSJSBase::NSAllocator::Free(data, size);
 	}
 
-	CValue CValue::CreateImage(BYTE* bits, int width, int height, ImageFormat format, bool isExternalize)
-	{
-		CValue ret;
-		if (width <= 0 || height <= 0)
-			return ret;
-
-		ret.m_internal->m_value = std::make_shared<CImage>(bits, width, height, format, isExternalize);
-		ret.m_internal->m_type = CTypedValue::vtImage;
-		return ret;
-	}
-
-	CValue CValue::CreateEmptyImage(ImageFormat format)
-	{
-		CValue ret;
-		ret.m_internal->m_value = std::make_shared<CImage>((BYTE*)NULL, 0, 0, format, false);
-		ret.m_internal->m_type = CTypedValue::vtImage;
-		return ret;
-	}
-
-	BYTE* CValue::AllocImageBits(int width, int height)
-	{
-		return new BYTE[4 * width * height];
-	}
-
-	void CValue::FreeImageBits(BYTE* bits)
-	{
-		delete[] bits;
-	}
-
 	CValue CValue::CreateObject()
 	{
 		CValue ret;

DesktopEditor/doctrenderer/json/json.h

@@ -20,7 +20,7 @@
 #endif
 
 // uncomment to enable exceptions throwing
-// #define JSON_DEBUG
+//#define JSON_DEBUG
 
 #ifdef JSON_DEBUG
 #include <stdexcept>
@@ -29,14 +29,6 @@
 namespace NSJSON
 {
 	typedef unsigned char BYTE;
-
-	enum class ImageFormat
-	{
-		ifRGBA,
-		ifBGRA,
-		ifARGB,
-		ifInvalid
-	};
 	
 	class CValue;
 	class CValueRef;
@@ -96,10 +88,6 @@ namespace NSJSON
 		 * Returns true if the value is an object.
 		 */
 		bool IsObject() const;
-		/**
-		 * Returns true if the value is an image.
-		 */
-		bool IsImage() const;
 
 		// FUNCTIONS FOR WORKING WITH PRIMITIVE VALUES
 		/**
@@ -205,39 +193,6 @@ namespace NSJSON
 		 */
 		std::vector<std::string> GetPropertyNames() const;
 
-		// FUNCTIONS FOR WORKING WITH IMAGES
-		/**
-		 * Gets bits of image.
-		 * @return the pointer to memory, allocated for the image. If current value is not an image, returns nullptr.
-		 */
-		const BYTE* GetImageBits() const;
-		BYTE* GetImageBits();
-		/**
-		 * Gets width of the image.
-		 * @returns Returns the width of the image. If current value is not an image, returns 0.
-		 */
-		int GetImageWidth() const;
-		/**
-		 * Gets height of the image.
-		 * @returns Returns the height of the image. If current value is not an image, returns 0.
-		 */
-		int GetImageHeight() const;
-		/**
-		 * Gets format of the image.
-		 * @returns Returns the image format. If current value is not an image, returns ImageFormat::ifInvalid.
-		 */
-		ImageFormat GetImageFormat() const;
-
-		/**
-		 * Make image bits external.
-		 */
-		void ImageExternalize();
-
-		/**
-		 * Alloc image bits as internal.
-		 */
-		void ImageAlloc(const int& width, const int& height, const ImageFormat& format);
-
 	protected:
 		std::shared_ptr<CTypedValue> m_internal;
 	};
@@ -296,30 +251,6 @@ namespace NSJSON
 		 */
 		static void FreeTypedArray(BYTE* data, size_t size);
 
-		// IMAGE
-		/**
-		 * Creates and returns new image object.
-		 * @param bits The pointer to image data. The pointer should be acquired with AllocImageBits().
-		 * @param width The width of the image.
-		 * @param height The height of the image.
-		 * @param format The format of the image.
-		 * @param isExternalize If true the memory will not be reclaimed when the created image is destroyed.
-		 * If this parameter is false then the memory will be released using FreeImageBits() during the image object destruction.
-		 */
-		static CValue CreateImage(BYTE* bits, int width, int height, ImageFormat format = ImageFormat::ifBGRA, bool isExternalize = true);
-		static CValue CreateEmptyImage(ImageFormat format = ImageFormat::ifBGRA);
-		/**
-		 * Allocates the memory for an image.
-		 * @param width The width of the image.
-		 * @param height The height of the image.
-		 */
-		static BYTE* AllocImageBits(int width, int height);
-		/**
-		 * Frees the memory for a image bits.
-		 * @param data The allocated memory to be released.
-		 */
-		static void FreeImageBits(BYTE* bits);
-
 		// OBJECT CONSTRUCTOR
 		/**
 		 * Creates and returns empty object.

DesktopEditor/doctrenderer/json/json_p.h

@@ -17,8 +17,7 @@ namespace NSJSON
 			vtPrimitive,
 			vtArray,
 			vtTypedArray,
-			vtObject,
-			vtImage
+			vtObject
 		};
 
 	public:

DesktopEditor/doctrenderer/json/json_values.cpp

@@ -211,56 +211,4 @@ namespace NSJSON
 		}
 		return ret;
 	}
-
-	CImage::CImage(BYTE* bits, const int& width, const int& height, const ImageFormat& format, const bool& isExternalize) :
-		m_bits(bits), m_width(width), m_height(height), m_format(format), m_isExternalize(isExternalize)
-	{
-	}
-
-	CImage::~CImage()
-	{
-		if (!m_isExternalize)
-		{
-			CValue::FreeImageBits(m_bits);
-		}
-	}
-
-	void CImage::alloc(const int& width, const int& height, const ImageFormat& format)
-	{
-		if (!m_isExternalize && m_bits)
-		{
-			CValue::FreeImageBits(m_bits);
-		}
-
-		m_bits = CValue::AllocImageBits(width, height);
-		m_width = width;
-		m_height = height;
-		m_format = format;
-		m_isExternalize = false;
-	}
-
-	BYTE* CImage::getBits()
-	{
-		return m_bits;
-	}
-
-	int CImage::getWidth()
-	{
-		return m_width;
-	}
-
-	int CImage::getHeight()
-	{
-		return m_height;
-	}
-
-	ImageFormat CImage::getFormat()
-	{
-		return m_format;
-	}
-
-	void CImage::externalize()
-	{
-		m_isExternalize = true;
-	}
 }

DesktopEditor/doctrenderer/json/json_values.h

@@ -113,28 +113,6 @@ namespace NSJSON
 	private:
 		storage_t m_values;
 	};
-
-	class CImage : public IBaseValue
-	{
-	public:
-		CImage(BYTE* bits, const int& width, const int& height, const ImageFormat& format, const bool& isExternalize = true);
-		~CImage();
-
-	public:
-		BYTE* getBits();
-		int getWidth();
-		int getHeight();
-		ImageFormat getFormat();
-		void externalize();
-		void alloc(const int& width, const int& height, const ImageFormat& format);
-
-	private:
-		BYTE* m_bits;
-		int m_width;
-		int m_height;
-		ImageFormat m_format;
-		bool m_isExternalize;
-	};
-} // namespace
+}
 
 #endif	// JSON_VALUES_H_

DesktopEditor/doctrenderer/json/serialization.h

@@ -3,75 +3,9 @@
 
 #include "json.h"
 #include "../js_internal/js_base.h"
-#include "../embed/GraphicsEmbed.h"
 
 #include <cmath>
 
-class CAppImageTo : public CGraphicsAppImage
-{
-private:
-	NSJSON::CValueRef* m_image;
-
-public:
-	CAppImageTo(const NSJSON::CValue& image) : CGraphicsAppImage()
-	{
-		m_image = new NSJSON::CValueRef(image);
-	}
-	virtual ~CAppImageTo()
-	{
-		if (m_image)
-			delete m_image;
-	}
-
-public:
-	virtual unsigned char* GetBits(int& w, int& h)
-	{
-		unsigned char* bits = m_image->GetImageBits();
-		if (NULL != bits)
-		{
-			w = m_image->GetImageWidth();
-			h = m_image->GetImageHeight();
-		}
-		return bits;
-	}
-	virtual unsigned char* AllocBits(const int& w, const int& h)
-	{
-		m_image->ImageAlloc(w, h, GetRgba() ? NSJSON::ImageFormat::ifRGBA : NSJSON::ImageFormat::ifBGRA);
-		return m_image->GetImageBits();
-	}
-};
-
-class CAppImageFrom : public CGraphicsAppImage
-{
-public:
-	unsigned char* m_pData;
-	int m_nW;
-	int m_nH;
-public:
-	CAppImageFrom() : CGraphicsAppImage()
-	{
-		m_pData = NULL;
-		m_nW = 0;
-		m_nH = 0;
-	}
-	virtual ~CAppImageFrom()
-	{
-	}
-
-public:
-	virtual unsigned char* GetBits(int& w, int& h)
-	{
-		return m_pData;
-	}
-	virtual unsigned char* AllocBits(const int& w, const int& h)
-	{
-		m_nW = w;
-		m_nH = h;
-		m_pData = NSJSON::CValue::AllocImageBits(w, h);
-		return m_pData;
-	}
-};
-
 namespace NSJSON
 {
 	static JSSmart<NSJSBase::CJSValue> toJS(const CValue& value)
@@ -116,12 +50,6 @@ namespace NSJSON
 			JSSmart<NSJSBase::CJSTypedArray> jsTypedArr = NSJSBase::CJSContext::createUint8Array(const_cast<BYTE*>(value.GetData()), value.GetCount());
 			ret = jsTypedArr->toValue();
 		}
-		else if (value.IsImage())
-		{
-			JSSmart<CJSObject> wrap = CJSContext::createEmbedObject("CGraphicsEmbed");
-			((CGraphicsEmbed*)wrap->getNative())->SetAppImage(new CAppImageTo(value));
-			ret = wrap->toValue();
-		}
 		// objects (there is no need for IsObject())
 		else
 		{
@@ -202,25 +130,6 @@ namespace NSJSON
 		else if (jsValue->isObject())
 		{
 			JSSmart<NSJSBase::CJSObject> jsObj = jsValue->toObject();
-
-			CJSEmbedObject* pNative = jsObj->getNative();
-			if (pNative != NULL)
-			{
-				CGraphicsEmbed* pGrEmbed = dynamic_cast<CGraphicsEmbed*>(pNative);
-				if (pGrEmbed)
-				{
-					CAppImageFrom* pAppImage = dynamic_cast<CAppImageFrom*>(pGrEmbed->GetAppImage());
-					if (pAppImage)
-					{
-						return NSJSON::CValue::CreateImage(pAppImage->m_pData,
-														   pAppImage->m_nW,
-														   pAppImage->m_nH,
-														   pAppImage->GetRgba() ? ImageFormat::ifRGBA : ImageFormat::ifBGRA,
-														   false);
-					}
-				}
-			}
-
 			std::vector<std::string> properties = jsObj->getPropertyNames();
 			ret = CValue::CreateObject();
 			for (const std::string& name : properties)

DesktopEditor/doctrenderer/nativecontrol.cpp

@@ -44,10 +44,7 @@ CImagesWorker::CImagesWorker(const std::wstring& sFolder)
 std::wstring CImagesWorker::GetImageLocal(const std::wstring& sUrl)
 {
 	if (CServerInstance::getInstance().IsEnable())
-	{
-		if (!CServerInstance::getInstance().CheckTmpDirectory(sUrl))
-			return L"error";
-	}
+		return L"error";
 	std::wstring sExt = NSFile::GetFileExtention(sUrl);
 	std::wstring sRet = L"image" + std::to_wstring(m_nIndex++) + L"." + sExt;
 	m_mapImages.insert(std::make_pair(sUrl, sRet));

DesktopEditor/doctrenderer/samples/.gitignore

@@ -0,0 +1,9 @@
+!*.vcxproj.user
+!Makefile
+
+out/
+
+*.docx
+*.pptx
+*.xlsx
+*.class

DesktopEditor/doctrenderer/samples/README.md

@@ -0,0 +1,156 @@
+- [Document Builder samples](#document-builder-samples)
+  - [About](#about)
+  - [Project generator: configure.py](#project-generator-configurepy)
+  - [Running C++ samples](#running-c-samples)
+    - [Visual Studio](#visual-studio)
+    - [Qt](#qt)
+    - [Makefile](#makefile)
+  - [Running C# samples](#running-c-samples-1)
+    - [Visual Studio](#visual-studio-1)
+  - [Running Python samples](#running-python-samples)
+  - [Running Java samples](#running-java-samples)
+
+# Document Builder samples
+## About
+Here you can find some code samples for Document Builder library in different programming languages:
+ 1. [C++](#running-c-samples)
+ 2. [C# (.NET)](#running-c-samples-1)
+ 3. [Python](#running-python-samples)
+ 4. [Java](#running-java-samples)
+
+## Project generator: configure.py
+For running C++ and C# code samples use python script `configure/configure.py` which is able to generate:
+ + Visual Studio project files
+ + Qt project file
+ + Makefile
+
+To use `configure.py` you need to specify following options:
+ 1. Which project files to generate: `--vs`, `--qt` or `--make`. Several options are available at the same time, but some of them are not supported on all platforms. In case you provide none of these options, all available projects will be generated.
+ 2. Test samples with `--test TEST`. Some available options:
+    - `--test all` – generate projects for both C++ and C#.
+    - `--test cpp` – generate projects only for C++ samples
+    - `--test cs` – generate projects only for C# samples.
+    - `--test cpp/creating_basic_form` – generate only project for the specified sample.
+
+    Several test options are available at the same time. To see all available `TEST` options call `configure.py -l`.
+ 3. Directory to the Document Builder with `--dir DIR`. If Document Builder is not installed in default path you have to provide path to it.
+
+Generated files will be located in the `out` directory inside of the corresponding test folders.
+
+## Running C++ samples
+
+If Document Builder is not installed in `C:/Program Files/ONLYOFFICE/DocumentBuilder`, for every C++ sample you should change the `workDir` variable at the beginning of *main.cpp* to actual location of Document Builder directory.
+
+### Visual Studio
+
+> **NOTE:** Only available on Windows
+
+ 1. Use `configure.py` to generate VS project files. For example:
+
+    ```shell
+    python configure.py --vs --test cpp/creating_basic_form --test cpp/creating_advanced_form
+    ```
+
+ 2. Open `.sln` file in Visual Studio. It will prompt you to retarget Windows SDK and VS toolset to your installed version – click "OK".
+ 3. The solution is ready to be built and run. Documents will be created in the project files directory.
+
+### Qt
+ 1. Use `configure.py` to generate Qt project files. For example:
+
+    ```shell
+    python configure.py --qt --test cpp
+    ```
+
+ 2. Open `.pro` file in Qt Creator.
+ 3. The project is ready to be built and run. Documents will be created in the `build` directory.
+
+### Makefile
+
+> **NOTE:** Only available on Linux and Mac OS.
+
+ 1. Use `configure.py` to generate Makefile. For example:
+
+    ```shell
+    python configure.py --make --test cpp/filling_spreadsheet
+    ```
+
+ 2. Go to the directory with generated Makefile:
+
+    ```shell
+    cd ../out/cpp/filling_spreadsheet
+    ```
+
+ 3. Call
+
+    ```shell
+    make
+    ```
+
+    `make` will build and run the executable. Documents will be created in the same directory as Makefile is.
+
+## Running C# samples
+
+> **NOTE:** Only available on Windows with Visual Studio and .NET SDK installed
+
+If Document Builder is not installed in `C:/Program Files/ONLYOFFICE/DocumentBuilder`, for every C# sample you should change the `workDirectory` variable at the beginning of `Main` function to actual location of Document Builder directory.
+
+### Visual Studio
+ 1. Use `configure.py` to generate VS project files. For example:
+
+    ```shell
+    python configure.py --vs --test cs
+    ```
+
+ 2. Open `.sln` file in Visual Studio. Depending on your installed .NET SDK version you may need to set different target framework by setting it in Visual Studio project properties or editing it directly in the `.csproj` file.
+ 3. The solution is ready to be built and run. Documents will be created in the project files directory.
+
+## Running Python samples
+
+ 1. Go to test directory:
+
+    ```shell
+    cd python/creating_basic_form
+    ```
+
+ 2. If it is needed, edit path to builder directory at the beginning of the python script:
+
+    ```py
+    sys.path.append('C:/Program Files/ONLYOFFICE/DocumentBuilder')
+    ```
+ 3. Run the script
+
+    ```shell
+    python main.py
+    ```
+
+    Documents will be created in the test directory.
+
+## Running Java samples
+
+> **NOTE:** JDK 8 or newer is required
+
+ 1. Go to test directory:
+
+    ```shell
+    cd java/creating_presentation
+    ```
+
+ 2. Compile the `Program.java` providing the path to ***docbuilder.jar***, located in the Document Builder directory:
+
+    ```shell
+    javac -cp "C:\Program Files\ONLYOFFICE\DocumentBuilder\docbuilder.jar" Program.java
+    ```
+
+ 3. `.class` file should appear in the directory. Run the program:
+
+    ```shell
+    java -cp "C:\Program Files\ONLYOFFICE\DocumentBuilder\docbuilder.jar;." Program
+    ```
+
+    Note, that on UNIX systems the path separator is `:` instead of `;`. Thus, on Linux or Mac OS it should be:
+
+    ```shell
+    java -cp "/opt/onlyoffice/documentbuilder/docbuilder.jar:." Program
+    ```
+
+ 3. Documents will be created in the test directory.

DesktopEditor/doctrenderer/samples/configure/configure.py

@@ -0,0 +1,293 @@
+import os
+import argparse
+import platform
+import uuid
+
+langs = ['cpp', 'cs']
+os_name = platform.system().lower()
+
+def mkdir(dir):
+    if not os.path.exists(dir):
+        os.mkdir(dir)
+
+def log(level, message):
+    print('configure.py: ' + level + ': ' + message)
+
+def getDefaultBuilderDir():
+    dir = ''
+    if os_name == 'windows':
+        dir = 'C:\\Program Files\\ONLYOFFICE\\DocumentBuilder'
+    elif os_name == 'linux':
+        dir = '/opt/onlyoffice/documentbuilder'
+    return dir
+
+def getAllTests():
+    tests = {}
+    for lang in langs:
+        tests[lang] = []
+        test_dirs = os.listdir(lang)
+        for test_dir in test_dirs:
+            if not os.path.isdir(lang + '/' + test_dir):
+                continue
+            tests[lang].append(lang + '/' + test_dir)
+    return tests
+
+def printAvailableTests():
+    all_tests = getAllTests()
+    print('all')
+    for lang in langs:
+        print('-----')
+        print(lang)
+        tests = all_tests[lang]
+        for test in tests:
+            print(test)
+
+class PrintTestsList(argparse.Action):
+    def __call__(self, parser, namespace, values, option_string=None):
+        printAvailableTests()
+        exit()
+
+def getSelectedTests(tests):
+    all_tests = getAllTests()
+    # make set of all available tests
+    tests_set = {'all'}
+    for lang in langs:
+        tests_set.add(lang)
+        tests_set.update(all_tests[lang])
+    # make dict with set of selected tests
+    tests_selected = {lang: set() for lang in langs}
+    # filter tests through only available ones
+    for test in tests:
+        if not test in tests_set:
+            log('warning', 'wrong test "' + test + '". Call script with --list (or -l) to see all available tests')
+            continue
+
+        if test == 'all':
+            for lang in langs:
+                tests_selected[lang].update(all_tests[lang])
+        elif not '/' in test:
+            lang = test
+            tests_selected[lang].update(all_tests[lang])
+        else:
+            lang = test.split('/')[0]
+            tests_selected[lang].add(test)
+    # delete empty tests
+    for lang in langs:
+        if not tests_selected[lang]:
+            del tests_selected[lang]
+
+    return tests_selected
+
+def replacePlaceholders(template_file, output_file, replacements):
+    content = ''
+    # open and read template file
+    with open(template_file, 'r') as file:
+        content = file.read()
+    # replace all placeholders with corresponding values
+    for placeholder, replacement in replacements.items():
+        content = content.replace(placeholder, replacement)
+    # write result to output file
+    with open(output_file, 'w') as file:
+        file.write(content)
+
+def genVSProjectsCPP(tests, builder_dir):
+    for test in tests:
+        test_dir = 'out/' + test
+        mkdir(test_dir)
+        test_name = test.split('/')[1]
+        if os.path.exists(test_dir + '/' + test_name + '.vcxproj'):
+            log('info', 'VS C++ project for sample "' + test + '" already exists. Skipping.')
+            continue
+        else:
+            log('info', 'generating VS C++ project for sample "' + test + '"...')
+        # .vcxproj
+        project_guid = str(uuid.uuid4())
+        replacements = {
+            '[PROJECT_GUID]': project_guid,
+            '[TEST_NAME]': test_name,
+            '[BUILDER_DIR]': builder_dir,
+            '[ROOT_DIR]': os.getcwd()
+        }
+        replacePlaceholders('configure/project_templates/cpp/template.vcxproj', test_dir + '/' + test_name + '.vcxproj', replacements)
+        # .sln
+        replacements = {
+            '[SOLUTION_GUID]': str(uuid.uuid4()).upper(),
+            '[TEST_NAME]': test_name,
+            '[PROJECT_GUID]': project_guid.upper(),
+            '[EXT_GLOBALS_GUID]': str(uuid.uuid4()).upper()
+        }
+        replacePlaceholders('configure/project_templates/cpp/template.sln', test_dir + '/' + test_name + '.sln', replacements)
+        # .vcxproj.filters
+        replacements = {
+            '[GUID_SOURCE_FILES]': str(uuid.uuid4()).upper(),
+            '[GUID_HEADER_FILES]': str(uuid.uuid4()).upper(),
+            '[GUID_RESOURCE_FILES]': str(uuid.uuid4()).upper(),
+            '[TEST_NAME]': test_name
+        }
+        replacePlaceholders('configure/project_templates/cpp/template.vcxproj.filters', test_dir + '/' + test_name + '.vcxproj.filters', replacements)
+        # .vcxproj.user
+        replacements = {
+            '[BUILDER_DIR]': builder_dir
+        }
+        replacePlaceholders('configure/project_templates/cpp/template.vcxproj.user', test_dir + '/' + test_name + '.vcxproj.user', replacements)
+
+def genVSProjectsCS(tests, builder_dir):
+    for test in tests:
+        test_dir = 'out/' + test
+        mkdir(test_dir)
+        test_name = test.split('/')[1]
+        if os.path.exists(test_dir + '/' + test_name + '.csproj'):
+            log('info', 'VS C# project for sample "' + test + '" already exists. Skipping.')
+            continue
+        else:
+            log('info', 'generating VS C# project for sample "' + test + '"...')
+        # .csproj
+        project_guid = str(uuid.uuid4())
+        replacements = {
+            '[TEST_NAME]': test_name,
+            '[BUILDER_DIR]': builder_dir,
+        }
+        replacePlaceholders('configure/project_templates/cs/template.csproj', test_dir + '/' + test_name + '.csproj', replacements)
+        # .sln
+        replacements = {
+            '[SOLUTION_GUID]': str(uuid.uuid4()).upper(),
+            '[TEST_NAME]': test_name,
+            '[PROJECT_GUID]': project_guid.upper(),
+            '[EXT_GLOBALS_GUID]': str(uuid.uuid4()).upper()
+        }
+        replacePlaceholders('configure/project_templates/cs/template.sln', test_dir + '/' + test_name + '.sln', replacements)
+
+def genVSProjects(tests_selected, builder_dir):
+    if os_name != 'windows':
+        log('warning', 'generating Visual Studio projects is only available on Windows')
+        return
+
+    builder_dir = builder_dir.replace('/', '\\')
+    for lang, tests in tests_selected.items():
+        mkdir('out/' + lang)
+        if lang == 'cpp':
+            genVSProjectsCPP(tests, builder_dir)
+        elif lang == 'cs':
+            genVSProjectsCS(tests, builder_dir)
+
+def genQtProjects(tests_selected, builder_dir):
+    # only for C++ projects
+    if 'cpp' not in tests_selected:
+        return
+
+    root_dir = os.getcwd()
+    if os_name == 'windows':
+        builder_dir = builder_dir.replace('\\', '/')
+        root_dir = root_dir.replace('\\', '/')
+
+    tests = tests_selected['cpp']
+    mkdir('out/cpp')
+    for test in tests:
+        test_dir = 'out/' + test
+        mkdir(test_dir)
+        test_name = test.split('/')[1]
+        if os.path.exists(test_dir + '/' + test_name + '.pro'):
+            log('info', 'Qt project for sample "' + test + '" already exists. Skipping.')
+            continue
+        else:
+            log('info', 'generating Qt C++ project for sample "' + test + '"...')
+        # .pro
+        replacements = {
+            '[TEST_NAME]': test_name,
+            '[BUILDER_DIR]': builder_dir,
+            '[ROOT_DIR]': root_dir
+        }
+        replacePlaceholders('configure/project_templates/cpp/template.pro', test_dir + '/' + test_name + '.pro', replacements)
+
+def genMakefile(tests_selected, builder_dir):
+    # only for C++ projects
+    if 'cpp' not in tests_selected:
+        return
+
+    if os_name == 'windows':
+        log('warning', 'generating Makefile is not available on Windows')
+        return
+
+    # initialize variables
+    compiler = ''
+    lflags = ''
+    env_lib_path = ''
+    if os_name == 'linux':
+        compiler = 'g++'
+        lflags = '-Wl,--unresolved-symbols=ignore-in-shared-libs'
+        env_lib_path = 'LD_LIBRARY_PATH'
+    elif os_name == 'darwin':
+        compiler = 'clang++'
+        env_lib_path = 'DYLD_LIBRARY_PATH'
+    root_dir = os.getcwd()
+    tests = tests_selected['cpp']
+    mkdir('out/cpp')
+    for test in tests:
+        test_dir = 'out/' + test
+        mkdir(test_dir)
+        test_name = test.split('/')[1]
+        if os.path.exists(test_dir + '/Makefile'):
+            log('info', 'Makefile for sample "' + test + '" already exists. Skipping.')
+        else:
+            log('info', 'generating Makefile for C++ sample "' + test + '"...')
+            continue
+        # Makefile
+        replacements = {
+            '[TEST_NAME]': test_name,
+            '[BUILDER_DIR]': builder_dir,
+            '[ROOT_DIR]': root_dir,
+            '[COMPILER]': compiler,
+            '[LFLAGS]': lflags,
+            '[ENV_LIB_PATH]': env_lib_path
+        }
+        replacePlaceholders('configure/project_templates/cpp/Makefile', test_dir + '/Makefile', replacements)
+
+
+if __name__ == '__main__':
+    # go to root dir
+    file_dir = os.path.dirname(os.path.realpath(__file__))
+    os.chdir(file_dir + '/..')
+    # initialize argument parser
+    parser = argparse.ArgumentParser(description='Generate project files for Document Builder samples')
+    parser.add_argument('--vs', action='store_true', help='create Visual Studio (.vcxproj and .csproj) project files')
+    parser.add_argument('--qt', action='store_true', help='create Qt (.pro) project files')
+    parser.add_argument('--make', action='store_true', help='create Makefile')
+    parser.add_argument('-t', '--test', dest='tests', action='append', help='specifies tests to generate project files', required=True)
+    parser.add_argument('-l', '--list', action=PrintTestsList, nargs=0, help='show list of available tests and exit')
+
+    builder_dir = getDefaultBuilderDir()
+    if builder_dir:
+        parser.add_argument('--dir', action='store', help='specifies Document Builder directory (default: ' + builder_dir + ')', default=builder_dir)
+    else:
+        parser.add_argument('--dir', action='store', help='specifies Document Builder directory', required=True)
+
+    args = parser.parse_args()
+
+    # validate arguments
+    if not os.path.exists(args.dir):
+        log('error', 'Document Builder directory doesn\'t exist: ' + args.dir)
+        exit(1)
+
+    if not (args.vs or args.qt or args.make):
+        if os_name == 'windows':
+            args.vs = True
+        args.qt = True
+        if os_name != 'windows':
+            args.make = True
+
+    # filter tests
+    tests_selected = getSelectedTests(args.tests)
+
+    # generate projects
+    mkdir('out')
+    # VS
+    if args.vs:
+        genVSProjects(tests_selected, args.dir)
+    elif 'cs' in tests_selected:
+        log('warning', 'generating C# projects only available ' + ('on Windows ' if os_name != 'windows' else '') + 'with --vs')
+    # Qt
+    if args.qt:
+        genQtProjects(tests_selected, args.dir)
+    # Makefile
+    if args.make:
+        genMakefile(tests_selected, args.dir)

DesktopEditor/doctrenderer/samples/configure/project_templates/cpp/Makefile

@@ -0,0 +1,29 @@
+CXX 		= [COMPILER]
+CXXFLAGS	= -std=gnu++11 -Wall -W -fPIC
+INCPATH		= -I[BUILDER_DIR]/include -I[ROOT_DIR]
+LINK		= [COMPILER]
+LFLAGS		= [LFLAGS]
+LIBS		= -L[BUILDER_DIR] -ldoctrenderer
+
+BUILD_DIR 	= build
+
+SRC    		= ../../../cpp/[TEST_NAME]/main.cpp
+OBJ  	  	= $(BUILD_DIR)/main.o
+TARGET      = $(BUILD_DIR)/[TEST_NAME]
+
+.PHONY: all run clean
+
+all: $(TARGET) run
+
+$(TARGET): $(OBJ)
+	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJ) $(LIBS)
+
+$(OBJ): $(SRC)
+	@test -d $(BUILD_DIR) || mkdir -p $(BUILD_DIR)
+	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJ) $(SRC)
+
+run: $(TARGET)
+	[ENV_LIB_PATH]="[BUILDER_DIR]" ./$(TARGET)
+
+clean:
+	@rm -rf $(BUILD_DIR)

DesktopEditor/doctrenderer/samples/configure/project_templates/cpp/template.pro

@@ -0,0 +1,17 @@
+TEMPLATE = app
+
+CONFIG += console
+CONFIG -= app_bundle
+
+TARGET = [TEST_NAME]
+DESTDIR = $$PWD/build
+
+BUILDER_DIR = "[BUILDER_DIR]"
+ROOT_DIR = "[ROOT_DIR]"
+INCLUDEPATH += $$BUILDER_DIR/include
+INCLUDEPATH += $$ROOT_DIR
+LIBS += -L$$BUILDER_DIR -ldoctrenderer
+
+linux: QMAKE_LFLAGS += -Wl,--unresolved-symbols=ignore-in-shared-libs
+
+SOURCES += ../../../cpp/[TEST_NAME]/main.cpp

DesktopEditor/doctrenderer/samples/configure/project_templates/cpp/template.sln

@@ -0,0 +1,29 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{[SOLUTION_GUID]}") = "[TEST_NAME]", "[TEST_NAME].vcxproj", "{[PROJECT_GUID]}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{[PROJECT_GUID]}.Debug|x64.ActiveCfg = Debug|x64
+		{[PROJECT_GUID]}.Debug|x64.Build.0 = Debug|x64
+		{[PROJECT_GUID]}.Debug|x86.ActiveCfg = Debug|Win32
+		{[PROJECT_GUID]}.Debug|x86.Build.0 = Debug|Win32
+		{[PROJECT_GUID]}.Release|x64.ActiveCfg = Release|x64
+		{[PROJECT_GUID]}.Release|x64.Build.0 = Release|x64
+		{[PROJECT_GUID]}.Release|x86.ActiveCfg = Release|Win32
+		{[PROJECT_GUID]}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {[EXT_GLOBALS_GUID]}
+	EndGlobalSection
+EndGlobal

DesktopEditor/doctrenderer/samples/configure/project_templates/cpp/template.vcxproj

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{[PROJECT_GUID]}</ProjectGuid>
+    <RootNamespace>[TEST_NAME]</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>[BUILDER_DIR]\include;[ROOT_DIR];$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>[BUILDER_DIR]\include;[ROOT_DIR];$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>[BUILDER_DIR];%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>doctrenderer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>[BUILDER_DIR];%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>doctrenderer.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\cpp\[TEST_NAME]\main.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

DesktopEditor/doctrenderer/samples/configure/project_templates/cpp/template.vcxproj.filters

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{[GUID_SOURCE_FILES]}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{[GUID_HEADER_FILES]}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{[GUID_RESOURCE_FILES]}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\cpp\[TEST_NAME]\main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

DesktopEditor/doctrenderer/samples/configure/project_templates/cpp/template.vcxproj.user

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerEnvironment>PATH=[BUILDER_DIR];%PATH%
+$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerEnvironment>PATH=[BUILDER_DIR];%PATH%
+$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+</Project>

DesktopEditor/doctrenderer/samples/configure/project_templates/cs/template.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\cs\[TEST_NAME]\Program.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="[BUILDER_DIR]\docbuilder.net.dll" />
+  </ItemGroup>
+</Project>

DesktopEditor/doctrenderer/samples/configure/project_templates/cs/template.sln

@@ -0,0 +1,23 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{[SOLUTION_GUID]}") = "[TEST_NAME]", "[TEST_NAME].csproj", "{[PROJECT_GUID]}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{[PROJECT_GUID]}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{[PROJECT_GUID]}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{[PROJECT_GUID]}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{[PROJECT_GUID]}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {[EXT_GLOBALS_GUID]}
+	EndGlobalSection
+EndGlobal

DesktopEditor/doctrenderer/samples/cpp/commenting_errors/main.cpp

@@ -0,0 +1,90 @@
+/*
+* (c) Copyright Ascensio System SIA 2010-2023
+*
+* This program is a free software product. You can redistribute it and/or
+* modify it under the terms of the GNU Affero General Public License (AGPL)
+* version 3 as published by the Free Software Foundation. In accordance with
+* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+* that Ascensio System SIA expressly excludes the warranty of non-infringement
+* of any third-party rights.
+*
+* This program is distributed WITHOUT ANY WARRANTY; without even the implied
+* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+*
+* You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
+* street, Riga, Latvia, EU, LV-1050.
+*
+* The  interactive user interfaces in modified source and object code versions
+* of the Program must display Appropriate Legal Notices, as required under
+* Section 5 of the GNU AGPL version 3.
+*
+* Pursuant to Section 7(b) of the License you must retain the original Product
+* logo when distributing the program. Pursuant to Section 7(e) we decline to
+* grant you any rights under trademark law for use of our trademarks.
+*
+* All the Product's GUI elements, including illustrations and icon sets, as
+* well as technical writing content are licensed under the terms of the
+* Creative Commons Attribution-ShareAlike 4.0 International. See the License
+* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+*
+*/
+
+#include <string>
+#include "common.h"
+#include "docbuilder.h"
+
+#include "resources/utils/utils.h"
+
+using namespace std;
+using namespace NSDoctRenderer;
+
+const wchar_t* workDir = L"C:\\Program Files\\ONLYOFFICE\\DocumentBuilder";
+const wchar_t* resultPath = L"result.xlsx";
+
+// Helper functions
+void CheckCell(CValue oWorksheet, wstring cell, int row, int col)
+{
+    if (cell.find('#') != std::wstring::npos)
+    {
+        wstring commentMsg = L"Error: " + cell;
+        CValue errorCell = oWorksheet.Call("GetRangeByNumber", row, col);
+        errorCell.Call("AddComment", commentMsg.c_str());
+    }
+}
+
+// Main function
+int main()
+{
+    // Init DocBuilder
+    CDocBuilder::Initialize(workDir);
+    CDocBuilder oBuilder;
+    oBuilder.SetProperty("--work-directory", workDir);
+
+    // Open file and get context
+    wstring templatePath = NSUtils::GetResourcesDirectory() + L"/docs/spreadsheet_with_errors.xlsx";
+    oBuilder.OpenFile(templatePath.c_str(), L"");
+    CContext oContext = oBuilder.GetContext();
+    CContextScope oScope = oContext.CreateScope();
+    CValue oGlobal = oContext.GetGlobal();
+    CValue oApi = oGlobal["Api"];
+
+    // Find and comment formula errors
+    CValue oWorksheet = oApi.Call("GetActiveSheet");
+    CValue oRange = oWorksheet.Call("GetUsedRange");
+    CValue data = oRange.Call("GetValue");
+
+    for (int row = 0; row < (int)data.GetLength(); row++)
+    {
+        for (int col = 0; col < (int)data[0].GetLength(); col++)
+        {
+            CheckCell(oWorksheet, data[row][col].ToString().c_str(), row, col);
+        }
+    }
+
+    // Save and close
+    oBuilder.SaveFile(OFFICESTUDIO_FILE_SPREADSHEET_XLSX, resultPath);
+    oBuilder.CloseFile();
+    CDocBuilder::Dispose();
+    return 0;
+}

DesktopEditor/doctrenderer/samples/cpp/creating_advanced_form/main.cpp

@@ -0,0 +1,206 @@
+/*
+* (c) Copyright Ascensio System SIA 2010-2023
+*
+* This program is a free software product. You can redistribute it and/or
+* modify it under the terms of the GNU Affero General Public License (AGPL)
+* version 3 as published by the Free Software Foundation. In accordance with
+* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+* that Ascensio System SIA expressly excludes the warranty of non-infringement
+* of any third-party rights.
+*
+* This program is distributed WITHOUT ANY WARRANTY; without even the implied
+* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+*
+* You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
+* street, Riga, Latvia, EU, LV-1050.
+*
+* The  interactive user interfaces in modified source and object code versions
+* of the Program must display Appropriate Legal Notices, as required under
+* Section 5 of the GNU AGPL version 3.
+*
+* Pursuant to Section 7(b) of the License you must retain the original Product
+* logo when distributing the program. Pursuant to Section 7(e) we decline to
+* grant you any rights under trademark law for use of our trademarks.
+*
+* All the Product's GUI elements, including illustrations and icon sets, as
+* well as technical writing content are licensed under the terms of the
+* Creative Commons Attribution-ShareAlike 4.0 International. See the License
+* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+*
+*/
+
+#include <string>
+#include "common.h"
+#include "docbuilder.h"
+
+using namespace std;
+using namespace NSDoctRenderer;
+
+const wchar_t* workDir = L"C:\\Program Files\\ONLYOFFICE\\DocumentBuilder";
+const wchar_t* resultPath = L"result.docx";
+
+// Helper functions
+string cValueToString(CValue value)
+{
+    wchar_t* txt = value.ToString().c_str();
+    wstring ws(txt);
+    string str(ws.begin(), ws.end());
+    return str;
+}
+
+void setTableBorders(CValue oTable, int borderColor)
+{
+    oTable.Call("SetTableBorderTop", "single", 4, 0, borderColor, borderColor, borderColor);
+    oTable.Call("SetTableBorderBottom", "single", 4, 0, borderColor, borderColor, borderColor);
+    oTable.Call("SetTableBorderLeft", "single", 4, 0, borderColor, borderColor, borderColor);
+    oTable.Call("SetTableBorderRight", "single", 4, 0, borderColor, borderColor, borderColor);
+    oTable.Call("SetTableBorderInsideV", "single", 4, 0, borderColor, borderColor, borderColor);
+    oTable.Call("SetTableBorderInsideH", "single", 4, 0, borderColor, borderColor, borderColor);
+}
+
+CValue createFullWidthTable(CValue oApi, int rows, int cols, int borderColor)
+{
+    CValue oTable = oApi.Call("CreateTable", cols, rows);
+    oTable.Call("SetWidth", "percent", 100);
+    setTableBorders(oTable, borderColor);
+    return oTable;
+}
+
+CValue getTableCellParagraph(CValue oTable, int row, int col)
+{
+    return oTable.Call("GetCell", row, col).Call("GetContent").Call("GetElement", 0);
+}
+
+void addTextToParagraph(CValue oParagraph, std::string text, int fontSize, bool isBold)
+{
+    oParagraph.Call("AddText", text.c_str());
+    oParagraph.Call("SetFontSize", fontSize);
+    oParagraph.Call("SetBold", isBold);
+}
+
+void setPictureFormProperties(CValue oPictureForm, std::string key, std::string tip, bool required, std::string placeholder, std::string scaleFlag, bool lockAspectRatio, bool respectBorders, int shiftX, int shiftY, std::string imageUrl)
+{
+    oPictureForm.Call("SetFormKey", key.c_str());
+    oPictureForm.Call("SetTipText", tip.c_str());
+    oPictureForm.Call("SetRequired", required);
+    oPictureForm.Call("SetPlaceholderText", placeholder.c_str());
+    oPictureForm.Call("SetScaleFlag", scaleFlag.c_str());
+    oPictureForm.Call("SetLockAspectRatio", lockAspectRatio);
+    oPictureForm.Call("SetRespectBorders", respectBorders);
+    oPictureForm.Call("SetPicturePosition", shiftX, shiftY);
+    oPictureForm.Call("SetImage", imageUrl.c_str());
+}
+
+void setTextFormProperties(CValue oTextForm, string key, string tip, bool required, string placeholder, bool comb, int maxCharacters, int cellWidth, bool multiLine, bool autoFit)
+{
+    oTextForm.Call("SetFormKey", key.c_str());
+    oTextForm.Call("SetTipText", tip.c_str());
+    oTextForm.Call("SetRequired", required);
+    oTextForm.Call("SetPlaceholderText", placeholder.c_str());
+    oTextForm.Call("SetComb", comb);
+    oTextForm.Call("SetCharactersLimit", maxCharacters);
+    oTextForm.Call("SetCellWidth", cellWidth);
+    oTextForm.Call("SetCellWidth", multiLine);
+    oTextForm.Call("SetMultiline", autoFit);
+}
+
+void addTextFormToParagraph(CValue oParagraph, CValue oTextForm, int fontSize, string jc, bool hasBorder, int borderColor)
+{
+    if (hasBorder)
+    {
+        oTextForm.Call("SetBorderColor", borderColor, borderColor, borderColor);
+    }
+    oParagraph.Call("AddElement", oTextForm);
+    oParagraph.Call("SetFontSize", fontSize);
+    oParagraph.Call("SetJc", jc.c_str());
+}
+
+// Main function
+int main()
+{
+    // Init DocBuilder
+    CDocBuilder::Initialize(workDir);
+    CDocBuilder oBuilder;
+    oBuilder.SetProperty("--work-directory", workDir);
+    oBuilder.CreateFile(OFFICESTUDIO_FILE_DOCUMENT_DOCX);
+
+    CContext oContext = oBuilder.GetContext();
+    CContextScope oScope = oContext.CreateScope();
+    CValue oGlobal = oContext.GetGlobal();
+    CValue oApi = oGlobal["Api"];
+
+    // Create advanced form
+    CValue oDocument = oApi.Call("GetDocument");
+    CValue oTable = createFullWidthTable(oApi, 1, 2, 255);
+    CValue oParagraph = getTableCellParagraph(oTable, 0, 0);
+    addTextToParagraph(oParagraph, "PURCHASE ORDER", 36, true);
+    oParagraph = getTableCellParagraph(oTable, 0, 1);
+    addTextToParagraph(oParagraph, "Serial # ", 25, true);
+
+    CValue oTextForm = oApi.Call("CreateTextForm");
+    setTextFormProperties(oTextForm, "Serial", "Enter serial number", false, "Serial", true, 6, 1, false, false);
+    addTextFormToParagraph(oParagraph, oTextForm, 25, "left", true, 255);
+    oDocument.Call("Push", oTable);
+
+    CValue oPictureForm = oApi.Call("CreatePictureForm");
+    setPictureFormProperties(oPictureForm, "Photo", "Upload company logo", false, "Photo", "tooBig", false, false, 0, 0, "https://api.onlyoffice.com/content/img/docbuilder/examples/user-profile.png");
+    oParagraph = oApi.Call("CreateParagraph");
+    oParagraph.Call("AddElement", oPictureForm);
+    oDocument.Call("Push", oParagraph);
+
+    oTextForm = oApi.Call("CreateTextForm");
+    setTextFormProperties(oTextForm, "Company Name", "Enter company name", false, "Company Name", true, 20, 1, false, false);
+    oParagraph = oApi.Call("CreateParagraph");
+    addTextFormToParagraph(oParagraph, oTextForm, 35, "left", false, 255);
+    oDocument.Call("Push", oParagraph);
+
+    oParagraph = oApi.Call("CreateParagraph");
+    addTextToParagraph(oParagraph, "Date: ", 25, true);
+    oTextForm = oApi.Call("CreateTextForm");
+    setTextFormProperties(oTextForm, "Date", "Date", false, "DD.MM.YYYY", true, 10, 1, false, false);
+    addTextFormToParagraph(oParagraph, oTextForm, 25, "left", true, 255);
+    oDocument.Call("Push", oParagraph);
+
+    oParagraph = oApi.Call("CreateParagraph");
+    addTextToParagraph(oParagraph, "To:", 35, true);
+    oDocument.Call("Push", oParagraph);
+
+    oTable = createFullWidthTable(oApi, 1, 1, 200);
+    oParagraph = getTableCellParagraph(oTable, 0, 0);
+    oTextForm = oApi.Call("CreateTextForm");
+    setTextFormProperties(oTextForm, "Recipient", "Recipient", false, "Recipient", true, 25, 1, false, false);
+    addTextFormToParagraph(oParagraph, oTextForm, 32, "left", false, 255);
+    oDocument.Call("Push", oTable);
+
+    oTable = createFullWidthTable(oApi, 10, 2, 200);
+    oTable.Call("GetRow", 0).Call("SetBackgroundColor", 245, 245, 245, false);
+    CValue oCell = oTable.Call("GetCell", 0, 0);
+    oCell.Call("SetWidth", "percent", 30);
+    oParagraph = getTableCellParagraph(oTable, 0, 0);
+    addTextToParagraph(oParagraph, "Qty.", 30, true);
+    oParagraph = getTableCellParagraph(oTable, 0, 1);
+    addTextToParagraph(oParagraph, "Description", 30, true);
+
+    for (int i = 1; i < 10; i++)
+    {
+        CValue oTempParagraph = getTableCellParagraph(oTable, i, 0);
+        CValue oTempTextForm = oApi.Call("CreateTextForm");
+        setTextFormProperties(oTempTextForm, "Qty" + std::to_string(i), "Qty" + std::to_string(i), false, " ", true, 9, 1, false, false);
+        addTextFormToParagraph(oTempParagraph, oTempTextForm, 30, "left", false, 255);
+        oTempParagraph = getTableCellParagraph(oTable, i, 1);
+        oTempTextForm = oApi.Call("CreateTextForm");
+        setTextFormProperties(oTempTextForm, "Description" + std::to_string(i), "Description" + std::to_string(i), false, " ", true, 22, 1, false, false);
+        addTextFormToParagraph(oTempParagraph, oTempTextForm, 30, "left", false, 255);
+    }
+
+    oDocument.Call("Push", oTable);
+    oDocument.Call("RemoveElement", 0);
+    oDocument.Call("RemoveElement", 1);
+
+    // Save and close
+    oBuilder.SaveFile(OFFICESTUDIO_FILE_DOCUMENT_DOCX, resultPath);
+    oBuilder.CloseFile();
+    CDocBuilder::Dispose();
+    return 0;
+}

DesktopEditor/doctrenderer/samples/cpp/creating_basic_form/main.cpp

@@ -0,0 +1,108 @@
+/*
+* (c) Copyright Ascensio System SIA 2010-2023
+*
+* This program is a free software product. You can redistribute it and/or
+* modify it under the terms of the GNU Affero General Public License (AGPL)
+* version 3 as published by the Free Software Foundation. In accordance with
+* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+* that Ascensio System SIA expressly excludes the warranty of non-infringement
+* of any third-party rights.
+*
+* This program is distributed WITHOUT ANY WARRANTY; without even the implied
+* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+*
+* You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
+* street, Riga, Latvia, EU, LV-1050.
+*
+* The  interactive user interfaces in modified source and object code versions
+* of the Program must display Appropriate Legal Notices, as required under
+* Section 5 of the GNU AGPL version 3.
+*
+* Pursuant to Section 7(b) of the License you must retain the original Product
+* logo when distributing the program. Pursuant to Section 7(e) we decline to
+* grant you any rights under trademark law for use of our trademarks.
+*
+* All the Product's GUI elements, including illustrations and icon sets, as
+* well as technical writing content are licensed under the terms of the
+* Creative Commons Attribution-ShareAlike 4.0 International. See the License
+* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+*
+*/
+
+#include <string>
+#include "common.h"
+#include "docbuilder.h"
+
+using namespace NSDoctRenderer;
+
+const wchar_t* workDir = L"C:\\Program Files\\ONLYOFFICE\\DocumentBuilder";
+const wchar_t* resultPath = L"result.docx";
+
+// Helper functions
+void setPictureFormProperties(CValue oPictureForm, std::string key, std::string tip, bool required, std::string placeholder, std::string scaleFlag, bool lockAspectRatio, bool respectBorders, int shiftX, int shiftY, std::string imageUrl)
+{
+    oPictureForm.Call("SetFormKey", key.c_str());
+    oPictureForm.Call("SetTipText", tip.c_str());
+    oPictureForm.Call("SetRequired", required);
+    oPictureForm.Call("SetPlaceholderText", placeholder.c_str());
+    oPictureForm.Call("SetScaleFlag", scaleFlag.c_str());
+    oPictureForm.Call("SetLockAspectRatio", lockAspectRatio);
+    oPictureForm.Call("SetRespectBorders", respectBorders);
+    oPictureForm.Call("SetPicturePosition", shiftX, shiftY);
+    oPictureForm.Call("SetImage", imageUrl.c_str());
+}
+void setTextFormProperties(CValue oTextForm, std::string key, std::string tip, bool required, std::string placeholder, bool comb, int maxCharacters, int cellWidth, bool multiLine, bool autoFit)
+{
+    oTextForm.Call("SetFormKey", key.c_str());
+    oTextForm.Call("SetTipText", tip.c_str());
+    oTextForm.Call("SetRequired", required);
+    oTextForm.Call("SetPlaceholderText", placeholder.c_str());
+    oTextForm.Call("SetComb", comb);
+    oTextForm.Call("SetCharactersLimit", maxCharacters);
+    oTextForm.Call("SetCellWidth", cellWidth);
+    oTextForm.Call("SetCellWidth", multiLine);
+    oTextForm.Call("SetMultiline", autoFit);
+}
+
+// Main function
+int main()
+{
+    // Init DocBuilder
+    CDocBuilder::Initialize(workDir);
+    CDocBuilder oBuilder;
+    oBuilder.SetProperty("--work-directory", workDir);
+    oBuilder.CreateFile(OFFICESTUDIO_FILE_DOCUMENT_DOCX);
+
+    CContext oContext = oBuilder.GetContext();
+    CContextScope oScope = oContext.CreateScope();
+    CValue oGlobal = oContext.GetGlobal();
+    CValue oApi = oGlobal["Api"];
+
+    // Create basic form
+    CValue oDocument = oApi.Call("GetDocument");
+    CValue oParagraph = oDocument.Call("GetElement", 0);
+    CValue oHeadingStyle = oDocument.Call("GetStyle", "Heading 3");
+
+    oParagraph.Call("AddText", "Employee pass card");
+    oParagraph.Call("SetStyle", oHeadingStyle);
+    oDocument.Call("Push", oParagraph);
+
+    CValue oPictureForm = oApi.Call("CreatePictureForm");
+    setPictureFormProperties(oPictureForm, "Photo", "Upload your photo", false, "Photo", "tooBig", true, false, 50, 50, "https://api.onlyoffice.com/content/img/docbuilder/examples/user-profile.png");
+    oParagraph = oApi.Call("CreateParagraph");
+    oParagraph.Call("AddElement", oPictureForm);
+    oDocument.Call("Push", oParagraph);
+
+    CValue oTextForm = oApi.Call("CreateTextForm");
+    setTextFormProperties(oTextForm, "First name", "Enter your first name", false, "First name", true, 13, 3, false, false);
+    oParagraph = oApi.Call("CreateParagraph");
+    oParagraph.Call("AddElement", oTextForm);
+    oDocument.Call("Push", oParagraph);
+
+    // Save and close
+    oBuilder.SaveFile(OFFICESTUDIO_FILE_DOCUMENT_DOCX, resultPath);
+    oBuilder.CloseFile();
+    CDocBuilder::Dispose();
+    return 0;
+}

DesktopEditor/doctrenderer/samples/cpp/creating_chart_presentation/main.cpp

@@ -0,0 +1,156 @@
+/*
+* (c) Copyright Ascensio System SIA 2010-2023
+*
+* This program is a free software product. You can redistribute it and/or
+* modify it under the terms of the GNU Affero General Public License (AGPL)
+* version 3 as published by the Free Software Foundation. In accordance with
+* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+* that Ascensio System SIA expressly excludes the warranty of non-infringement
+* of any third-party rights.
+*
+* This program is distributed WITHOUT ANY WARRANTY; without even the implied
+* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+*
+* You can contact Ascensio System SIA at 20A-6 Ernesta Birznieka-Upish
+* street, Riga, Latvia, EU, LV-1050.
+*
+* The  interactive user interfaces in modified source and object code versions
+* of the Program must display Appropriate Legal Notices, as required under
+* Section 5 of the GNU AGPL version 3.
+*
+* Pursuant to Section 7(b) of the License you must retain the original Product
+* logo when distributing the program. Pursuant to Section 7(e) we decline to
+* grant you any rights under trademark law for use of our trademarks.
+*
+* All the Product's GUI elements, including illustrations and icon sets, as
+* well as technical writing content are licensed under the terms of the
+* Creative Commons Attribution-ShareAlike 4.0 International. See the License
+* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+*
+*/
+#include <string>
+#include <vector>
+#include "common.h"
+#include "docbuilder.h"
+
+#include "resources/utils/utils.h"
+
+using namespace std;
+using namespace NSDoctRenderer;
+
+const wchar_t* workDir = L"C:\\Program Files\\ONLYOFFICE\\DocumentBuilder";
+const wchar_t* resultPath = L"result.pptx";
+
+void addText(CValue oApi, int fontSize, string text, CValue oSlide, CValue oShape, CValue oParagraph, CValue oFill, string jc)
+{
+    CValue oRun = oApi.Call("CreateRun");
+    CValue oTextPr = oRun.Call("GetTextPr");
+    oTextPr.Call("SetFontSize", fontSize);
+    oTextPr.Call("SetFill", oFill);
+    oTextPr.Call("SetFontFamily", "Tahoma");
+    oParagraph.Call("SetJc", jc.c_str());
+    oRun.Call("AddText", text.c_str());
+    oRun.Call("AddLineBreak");
+    oParagraph.Call("AddElement", oRun);
+    oSlide.Call("AddObject", oShape);
+}
+
+// Main function
+int main()
+{
+    // Init DocBuilder
+    CDocBuilder::Initialize(workDir);
+    CDocBuilder oBuilder;
+    oBuilder.SetProperty("--work-directory", workDir);
+
+    // Read chart data from xlsx
+    wstring templatePath = NSUtils::GetResourcesDirectory() + L"/docs/chart_data.xlsx";
+    oBuilder.OpenFile(templatePath.c_str(), L"");
+    CContext oContext = oBuilder.GetContext();
+    CContextScope oScope = oContext.CreateScope();
+    CValue oGlobal = oContext.GetGlobal();
+    CValue oApi = oGlobal["Api"];
+    CValue oWorksheet = oApi.Call("GetActiveSheet");
+    CValue values = oWorksheet.Call("GetUsedRange").Call("GetValue");
+
+    int sizeX = values.GetLength();
+    int sizeY = values[0].GetLength();
+    vector<vector<wstring>> data(sizeX, vector<wstring>(sizeY));
+    for (int i = 0; i < sizeX; i++)
+    {
+        for (int j = 0; j < sizeY; j++)
+        {
+            data[i][j] = values[i][j].ToString().c_str();
+        }
+    }
+    oBuilder.CloseFile();
+
+    // Create chart presentation
+    oBuilder.CreateFile(OFFICESTUDIO_FILE_PRESENTATION_PPTX);
+    oContext = oBuilder.GetContext();
+    oScope = oContext.CreateScope();
+    oGlobal = oContext.GetGlobal();
+    oApi = oGlobal["Api"];
+    CValue oPresentation = oApi.Call("GetPresentation");
+    CValue oSlide = oPresentation.Call("GetSlideByIndex", 0);
+    oSlide.Call("RemoveAllObjects");
+
+    CValue oRGBColor = oApi.Call("CreateRGBColor", 255, 244, 240);
+    CValue oFill = oApi.Call("CreateSolidFill", oRGBColor);
+    oSlide.Call("SetBackground", oFill);
+
+    CValue oStroke = oApi.Call("CreateStroke", 0, oApi.Call("CreateNoFill"));
+    CValue oShapeTitle = oApi.Call("CreateShape", "rect", 300 * 36000, 20 * 36000, oApi.Call("CreateNoFill"), oStroke);
+    CValue oShapeText = oApi.Call("CreateShape", "rect", 120 * 36000, 80 * 36000, oApi.Call("CreateNoFill"), oStroke);
+    oShapeTitle.Call("SetPosition", 20 * 36000, 20 * 36000);
+    oShapeText.Call("SetPosition", 210 * 36000, 50 * 36000);
+    CValue oParagraphTitle = oShapeTitle.Call("GetDocContent").Call("GetElement", 0);
+    CValue oParagraphText = oShapeText.Call("GetDocContent").Call("GetElement", 0);
+    oRGBColor = oApi.Call("CreateRGBColor", 115, 81, 68);
+    oFill = oApi.Call("CreateSolidFill", oRGBColor);
+
+    string titleContent = "Price Type Report";
+    string textContent = "This is an overview of price types. As we can see, May was the price peak, but even in June the price went down, the annual upward trend persists.";
+    addText(oApi, 80, titleContent, oSlide, oShapeTitle, oParagraphTitle, oFill, "center");
+    addText(oApi, 42, textContent, oSlide, oShapeText, oParagraphText, oFill, "left");
+
+    // Transform 2d array into cols names, rows names and data
+    CValue cols = oContext.CreateArray(sizeY - 1);
+    for (int col = 1; col < sizeY; col++)
+    {
+        cols[col - 1] = data[0][col].c_str();
+    }
+
+    CValue rows = oContext.CreateArray(sizeX - 1);
+    for (int row = 1; row < sizeX; row++)
+    {
+        rows[row - 1] = data[row][0].c_str();
+    }
+
+    CValue vals = oContext.CreateArray(sizeY - 1);
+    for (int row = 1; row < sizeY; row++)
+    {
+        CValue row_data = oContext.CreateArray(sizeX - 1);
+        for (int col = 1; col < sizeX; col++)
+        {
+            row_data[col - 1] = data[col][row].c_str();
+        }
+        vals[row - 1] = row_data;
+    }
+
+    // Pass CValue data to the CreateChart method
+    CValue oChart = oApi.Call("CreateChart", "lineStacked", vals, cols, rows);
+    oChart.Call("SetSize", 180 * 36000, 100 * 36000);
+    oChart.Call("SetPosition", 20 * 36000, 50 * 36000);
+    oChart.Call("ApplyChartStyle", 24);
+    oChart.Call("SetLegendFontSize", 12);
+    oChart.Call("SetLegendPos", "top");
+    oSlide.Call("AddObject", oChart);
+
+    // Save and close
+    oBuilder.SaveFile(OFFICESTUDIO_FILE_PRESENTATION_PPTX, resultPath);
+    oBuilder.CloseFile();
+    CDocBuilder::Dispose();
+    return 0;
+}