pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

For bug 65400

Browse Source
This commit is contained in:
Oleg Korshul
2024-02-14 20:06:36 +03:00
parent ae8b458f79
commit 0a9356f54b
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DesktopEditor/graphics/pro/js/before.py
View File

@ -13,6 +13,8 @@ if not base.is_dir("xml"):
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")

2
DesktopEditor/graphics/pro/js/drawingfile.json
View File

@ -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",

7
DjVuFile/DjVuFileImplementation.cpp
View File

@ -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);

6
HtmlRenderer/include/HTMLRendererText.h
View File

@ -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_

7
Test/Applications/gradient/Gradient/Gradient.pro
View File

@ -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

2
Test/Applications/gradient/Gradient/mainwindow.cpp
View File

@ -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;