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

Refactoring

Browse Source
This commit is contained in:
Oleg Korshul
2025-02-09 00:32:48 +03:00
parent f8ba0c59a6
commit d251682639
2 changed files with 10 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
DesktopEditor/doctrenderer/docbuilder_p.h
View File

@ -63,9 +63,7 @@
#include "../common/ProcessEnv.h"
#ifdef DOCBUILDER_LICENSING
#include "license_gen/src/common/utils.h"
#endif
#include "docbuilder_addon.h"
#ifdef CreateFile
#undef CreateFile
@ -998,15 +996,11 @@ namespace NSDoctRenderer
{
Init();
#ifdef DOCBUILDER_LICENSING
std::wstring licenseFilePath = m_sX2tPath + L"/sdkjs/license.xml";
NSLicenseUtils::LicenseData licenseData = NSLicenseUtils::parseLicenseFile(licenseFilePath);
if (!NSLicenseUtils::verify(licenseData))
{
CV8RealTimeWorker::_LOGGING_ERROR_(L"error (save)", L"license is invalid!");
return 1;
}
#endif
CDocBuilderAddon oSaveAddon(m_sX2tPath);
int nPreSaveError = oSaveAddon.GetX2tPreSaveError();
if (0 != nPreSaveError)
return nPreSaveError;
if (-1 == m_nFileType)
{
@ -1100,6 +1094,8 @@ namespace NSDoctRenderer
if (!sOptions.empty())
oBuilder.WriteString(UTF8_TO_U(sOptions));
oBuilder.WriteString(oSaveAddon.GetX2tSaveAddon());
oBuilder.WriteString(L"</TaskQueueDataConvert>");
std::wstring sXmlConvert = oBuilder.GetData();