For bug 65400

ONLYOFFICE · Feb 14, 2024 · 0a9356f · 0a9356f
1 parent ae8b458
commit 0a9356f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/DesktopEditor/graphics/pro/js/before.py b/DesktopEditor/graphics/pro/js/before.py
@@ -13,6 +13,8 @@
   base.replaceInFile("./xml/src/xmllight_private.h", "#include \"../../common/", "#include \"../../../../../common/")
   base.replaceInFile("./xml/src/xmllight_private.h", "#include \"../../../UnicodeConverter/", "#include \"../../../../../../UnicodeConverter/")
   base.replaceInFile("./xml/include/xmlutils.h", "#include \"../../common/", "#include \"../../../../../common/")
+  base.replaceInFile("./xml/libxml2/globals.c", "int xmlGetWarningsDefaultValue = 1;", "int xmlGetWarningsDefaultValue = 0;")
+  base.replaceInFile("./xml/libxml2/globals.c", "static int xmlGetWarningsDefaultValueThrDef = 1;", "static int xmlGetWarningsDefaultValueThrDef = 0;")
 
 if not base.is_dir("freetype-2.10.4"):
   base.copy_dir("../../../freetype-2.10.4", "./freetype-2.10.4")

diff --git a/DesktopEditor/graphics/pro/js/drawingfile.json b/DesktopEditor/graphics/pro/js/drawingfile.json
@@ -61,7 +61,7 @@
 		"LIBXML_READER_ENABLED", "LIBXML_PUSH_ENABLED", "LIBXML_HTML_ENABLED", 
 		"LIBXML_XPATH_ENABLED", "LIBXML_OUTPUT_ENABLED", "LIBXML_C14N_ENABLED", 
 		"LIBXML_SAX1_ENABLED", "LIBXML_TREE_ENABLED", "LIBXML_XPTR_ENABLED", 
-		"IN_LIBXML", "LIBXML_STATIC", "BUILD_ZLIB_AS_SOURCES", 
+		"XML_ERROR_DISABLE_MODE", "IN_LIBXML", "LIBXML_STATIC", "BUILD_ZLIB_AS_SOURCES", 
 		"_ARM_ALIGN_", 
 		"_tcsnicmp=strncmp", "_lseek=lseek", "_getcwd=getcwd", 
 		"NO_CONSOLE_IO", "USE_EXTERNAL_JPEG2000", "USE_JPIP", "OPJ_STATIC", "FONT_ENGINE_DISABLE_FILESYSTEM",

diff --git a/DjVuFile/DjVuFileImplementation.cpp b/DjVuFile/DjVuFileImplementation.cpp
@@ -896,7 +896,12 @@ XmlUtils::CXmlNode CDjVuFileImplementation::ParseText(GP<DjVuImage> pPage)
 		XmlUtils::CXmlNode hiddenText;
 		XmlUtils::CXmlNode pageColumn;
 		XmlUtils::CXmlNode region;
-		hiddenText.FromXmlStringA(NSDjvu::MakeCString(pageText));
+		std::string sPageText = NSDjvu::MakeCString(pageText);
+		if (!hiddenText.FromXmlStringA(sPageText))
+		{
+			std::wstring sPageTextW = UTF8_TO_U(sPageText);
+			hiddenText.FromXmlString(sPageTextW);
+		}
 		hiddenText.GetNode(L"PAGECOLUMN", pageColumn);
 		pageColumn.GetNode(L"REGION", region);
 		region.GetNode(L"PARAGRAPH", paragraph);

diff --git a/HtmlRenderer/include/HTMLRendererText.h b/HtmlRenderer/include/HTMLRendererText.h
@@ -29,8 +29,8 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#ifndef _ASC_HTMLRENDERER3_H_
-#define _ASC_HTMLRENDERER3_H_
+#ifndef _ASC_HTMLRENDERER3_TEXT_H_
+#define _ASC_HTMLRENDERER3_TEXT_H_
 
 #include "../../DesktopEditor/graphics/IRenderer.h"
 #include "../../DesktopEditor/graphics/pro/officedrawingfile.h"
@@ -187,4 +187,4 @@ namespace NSHtmlRenderer
 	};
 }
 
-#endif // _ASC_HTMLRENDERER3_H_
+#endif // _ASC_HTMLRENDERER3_TEXT_H_
diff --git a/Test/Applications/gradient/Gradient/Gradient.pro b/Test/Applications/gradient/Gradient/Gradient.pro
@@ -14,10 +14,5 @@ PWD_ROOT_DIR = $$PWD
 CORE_ROOT_DIR = $$PWD/../../../../../core
 include($$CORE_ROOT_DIR/Common/base.pri)
 
-ADD_DEPENDENCY(kernel, graphics, UnicodeConverter)
-ADD_DEPENDENCY(PdfReader)
-ADD_DEPENDENCY(HtmlRenderer)
+ADD_DEPENDENCY(kernel, graphics, UnicodeConverter, HtmlRenderer, PdfFile)
 core_linux:include($$CORE_ROOT_DIR/Common/3dParty/icu/icu.pri)
-
-LIBS += -L$$CORE_BUILDS_LIBRARIES_PATH -lkernel -lgraphics
-
diff --git a/Test/Applications/gradient/Gradient/mainwindow.cpp b/Test/Applications/gradient/Gradient/mainwindow.cpp
@@ -5,7 +5,7 @@
 #include "../../../../DesktopEditor/graphics/pro/Graphics.h"
 #include "../../../../DesktopEditor/fontengine/ApplicationFontsWorker.h"
 #include "../../../../DesktopEditor/common/Directory.h"
-#include "../../../../PdfReader/PdfReader.h"
+#include "../../../../PdfFile/PdfFile.h"
 
 std::vector<Point> drawCircle1(int n, double cx, double cy, double r) {
     std::vector<Point> res;