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 remote-tracking branch 'origin/release/v9.0.0' into feature/pdf-page

Browse Source 
# Conflicts:
#	DesktopEditor/graphics/pro/js/wasm/js/drawingfile.js
This commit is contained in:
Svetlana Kulikova
2025-04-16 14:15:21 +03:00
parent 48c9a001dd 0d55fddd02
commit 15370bcbce
78 changed files with 2356 additions and 992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DesktopEditor/doctrenderer/app_builder/main.cpp
View File

@ -81,6 +81,8 @@ 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);

4
DesktopEditor/doctrenderer/docbuilder.python/src/docbuilder.py
View File

@ -618,6 +618,8 @@ 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)
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)