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

pdf/xps/djvu -> docx_dir -> fromDocxDir

Browse Source
This commit is contained in:
Kulikova Svetlana
2021-12-14 11:45:26 +03:00
parent b6cc7c823a
commit b78fca4290
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
X2tConverter/src/ASCConverters.cpp
View File

@ -4443,7 +4443,7 @@ namespace NExtractTools
nRes = PdfDjvuXpsToImage(&pReader, sFrom, nFormatFrom, sTo, sTemp, params, pApplicationFonts);
RELEASEOBJECT(pReader);
}
else if (AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX == nFormatTo)
else
{
IOfficeDrawingFile* pReader = NULL;
switch (nFormatFrom)
@ -4502,15 +4502,14 @@ namespace NExtractTools
oDocxRenderer.SetTempFolder(sTempDirOut);
oDocxRenderer.Convert(pReader, sTo, AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX == nFormatTo);
if (AVS_OFFICESTUDIO_FILE_DOCUMENT_DOCX != nFormatTo)
nRes = fromDocxDir(sTempDirOut, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params, L"");
}
else
nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS;
RELEASEOBJECT(pReader);
}
else
{
nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS;
}
RELEASEOBJECT(pApplicationFonts);
return nRes;
}