pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v8.3.0' into feature/hwpx

Browse Source
This commit is contained in:
Green
2025-01-21 11:50:09 +03:00
parent 9faa7fb69d 6b66c8fb50
commit 99fa27e693
96 changed files with 1912 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
X2tConverter/build/Android/libx2t/src/main/cpp/CMakeLists.txt
View File

@ -70,7 +70,7 @@ set(CORE_DIR ${ARG_PATH_SRC_CORE})
set(X2T_CONVERTER_LIBS ${ARG_PATH_LIB_BUILD_TOOLS}/${ANDROID_ABI})
message(STATUS "Prebuild libraries path: ${X2T_CONVERTER_LIBS}")
SET(new_list libUnicodeConverter.so libkernel.so libkernel_network.so libgraphics.so libPdfFile.so libDjVuFile.so libXpsFile.so libHtmlFile2.so libFb2File.so libEpubFile.so libIWorkFile.so libDocxRenderer.so libdoctrenderer.so libx2t.so)
SET(new_list libUnicodeConverter.so libkernel.so libkernel_network.so libgraphics.so libPdfFile.so libDjVuFile.so libXpsFile.so libHtmlFile2.so libFb2File.so libEpubFile.so libIWorkFile.so libDocxRenderer.so libdoctrenderer.so libx2t.so libHWPFile.so)
SET(libs_list "")
FOREACH(file_path ${new_list})

5
X2tConverter/build/Android/libx2t/src/main/cpp/jni/X2t.cpp
View File

@ -67,6 +67,7 @@ extern "C" {
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_PRESENTATION_POTM", AVS_OFFICESTUDIO_FILE_PRESENTATION_POTM);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP_FLAT", AVS_OFFICESTUDIO_FILE_PRESENTATION_ODP_FLAT);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_PRESENTATION_OTP", AVS_OFFICESTUDIO_FILE_PRESENTATION_OTP);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_PRESENTATION_KEY", AVS_OFFICESTUDIO_FILE_PRESENTATION_KEY);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_SPREADSHEET", AVS_OFFICESTUDIO_FILE_SPREADSHEET);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX", AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSX);
@ -78,6 +79,7 @@ extern "C" {
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLTM", AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLTM);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS_FLAT", AVS_OFFICESTUDIO_FILE_SPREADSHEET_ODS_FLAT);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_SPREADSHEET_OTS", AVS_OFFICESTUDIO_FILE_SPREADSHEET_OTS);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_SPREADSHEET_NUMBERS", AVS_OFFICESTUDIO_FILE_SPREADSHEET_NUMBERS);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_CROSSPLATFORM", AVS_OFFICESTUDIO_FILE_CROSSPLATFORM);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF", AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF);
@ -127,6 +129,9 @@ extern "C" {
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION", AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_CANVAS_PDF", AVS_OFFICESTUDIO_FILE_CANVAS_PDF);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM_PDF", AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM_PDF);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_DOCUMENT_PAGES", AVS_OFFICESTUDIO_FILE_DOCUMENT_PAGES);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_DOCUMENT_HWP", AVS_OFFICESTUDIO_FILE_DOCUMENT_HWP);
jjniHashMap.put(env, "AVS_OFFICESTUDIO_FILE_DOCUMENT_HWPX", AVS_OFFICESTUDIO_FILE_DOCUMENT_HWPX);
jobject res = jjniHashMap.toJniObject(env);
jjniHashMap.destroy(env);

4
X2tConverter/test/win32Test/X2tTest.cpp
View File

@ -42,6 +42,7 @@
#pragma comment(lib, "../../../build/lib/win_64/DEBUG/HtmlFile2.lib")
#pragma comment(lib, "../../../build/lib/win_64/DEBUG/graphics.lib")
#pragma comment(lib, "../../../build/lib/win_64/DEBUG/IWorkFile.lib")
#pragma comment(lib, "../../../build/lib/win_64/DEBUG/HWPFile.lib")
#pragma comment(lib, "../../../build/lib/win_64/DEBUG/kernel_network.lib")
#pragma comment(lib, "../../../build/lib/win_64/DEBUG/kernel.lib")
#pragma comment(lib, "../../../build/lib/win_64/DEBUG/UnicodeConverter.lib")
@ -56,6 +57,7 @@
#pragma comment(lib, "../../../build/lib/win_64/HtmlFile2.lib")
#pragma comment(lib, "../../../build/lib/win_64/graphics.lib")
#pragma comment(lib, "../../../build/lib/win_64/IWorkFile.lib")
#pragma comment(lib, "../../../build/lib/win_64/HWPFile.lib")
#pragma comment(lib, "../../../build/lib/win_64/kernel_network.lib")
#pragma comment(lib, "../../../build/lib/win_64/kernel.lib")
#pragma comment(lib, "../../../build/lib/win_64/UnicodeConverter.lib")
@ -74,6 +76,7 @@
#pragma comment(lib, "../../../build/lib/win_32/DEBUG/HtmlFile2.lib")
#pragma comment(lib, "../../../build/lib/win_32/DEBUG/graphics.lib")
#pragma comment(lib, "../../../build/lib/win_32/DEBUG/IWorkFile.lib")
#pragma comment(lib, "../../../build/lib/win_32/DEBUG/HWPFile.lib")
#pragma comment(lib, "../../../build/lib/win_32/DEBUG/kernel.lib")
#pragma comment(lib, "../../../build/lib/win_32/DEBUG/kernel_network.lib")
#pragma comment(lib, "../../../build/lib/win_32/DEBUG/UnicodeConverter.lib")
@ -89,6 +92,7 @@
#pragma comment(lib, "../../../build/lib/win_32/HtmlFile2.lib")
#pragma comment(lib, "../../../build/lib/win_32/graphics.lib")
#pragma comment(lib, "../../../build/lib/win_32/IWorkFile.lib")
#pragma comment(lib, "../../../build/lib/win_32/HWPFile.lib")
#pragma comment(lib, "../../../build/lib/win_32/kernel_network.lib")
#pragma comment(lib, "../../../build/lib/win_32/kernel.lib")
#pragma comment(lib, "../../../build/lib/win_32/UnicodeConverter.lib")

1
X2tConverter/test/win32Test/X2tTest.vcxproj
View File

@ -183,6 +183,7 @@
<ClInclude Include="..\..\src\lib\doc.h" />
<ClInclude Include="..\..\src\lib\docx.h" />
<ClInclude Include="..\..\src\lib\html.h" />
<ClInclude Include="..\..\src\lib\hwp.h" />
<ClInclude Include="..\..\src\lib\iwork.h" />
<ClInclude Include="..\..\src\lib\odf.h" />
<ClInclude Include="..\..\src\lib\pdf_image.h" />

3
X2tConverter/test/win32Test/X2tTest.vcxproj.filters
View File

@ -58,6 +58,9 @@
<ClInclude Include="..\..\src\lib\iwork.h">
<Filter>libs</Filter>
</ClInclude>
<ClInclude Include="..\..\src\lib\hwp.h">
<Filter>libs</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="libs">