From 604aa08a36c4e5a079bb69c4216fafbb0a796688 Mon Sep 17 00:00:00 2001 From: Kulikova Svetlana Date: Wed, 17 Feb 2021 12:02:37 +0300 Subject: [PATCH] fix spaces and tabs --- DesktopEditor/doctrenderer/graphics.cpp | 8 +- DesktopEditor/doctrenderer/graphics.h | 18 +- X2tConverter/src/ASCConverters.cpp | 556 ++++++++++++------------ 3 files changed, 291 insertions(+), 291 deletions(-) diff --git a/DesktopEditor/doctrenderer/graphics.cpp b/DesktopEditor/doctrenderer/graphics.cpp index a85c56a7fd..5406051340 100644 --- a/DesktopEditor/doctrenderer/graphics.cpp +++ b/DesktopEditor/doctrenderer/graphics.cpp @@ -866,10 +866,10 @@ void CGraphics::AddClipRect(double x, double y, double w, double h) _histClip->Transform.SetElements(sx, shy, shx, sy, tx, ty); _histClip->IsIntegerGrid = m_pRenderer->get_IntegerGrid(); - _histClip->Rect.left = x; - _histClip->Rect.top = y; - _histClip->Rect.right = x + w; - _histClip->Rect.bottom = y + h; + _histClip->Rect.left = x; + _histClip->Rect.top = y; + _histClip->Rect.right = x + w; + _histClip->Rect.bottom = y + h; m_oGrState.Clips.push_back(_histClip); diff --git a/DesktopEditor/doctrenderer/graphics.h b/DesktopEditor/doctrenderer/graphics.h index 8ab9ecaa3f..b8127fa61c 100644 --- a/DesktopEditor/doctrenderer/graphics.h +++ b/DesktopEditor/doctrenderer/graphics.h @@ -12,11 +12,11 @@ namespace NSGraphics { enum EGrStateType { - gstPen = 0, - gstBrush = 1, - gstPenBrush = 2, - gstState = 3, - gstNone = 4 + gstPen = 0, + gstBrush = 1, + gstPenBrush = 2, + gstState = 3, + gstNone = 4 }; struct IGrState @@ -50,16 +50,16 @@ namespace NSGraphics struct CHist_Clip { Aggplus::CDoubleRect Rect; - bool IsIntegerGrid; - Aggplus::CMatrix Transform; + bool IsIntegerGrid; + Aggplus::CMatrix Transform; CHist_Clip() : IsIntegerGrid(false) {} }; struct CGrStateState : public IGrState { - Aggplus::CMatrix Transform; - bool IsIntegerGrid; + Aggplus::CMatrix Transform; + bool IsIntegerGrid; std::vector Clips; CGrStateState() diff --git a/X2tConverter/src/ASCConverters.cpp b/X2tConverter/src/ASCConverters.cpp index 4b1824a979..214e1c0a3e 100644 --- a/X2tConverter/src/ASCConverters.cpp +++ b/X2tConverter/src/ASCConverters.cpp @@ -1500,119 +1500,119 @@ namespace NExtractTools return nRes; } - // doct_bin -> epub - _UINT32 doct_bin2epub(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params) - { - _UINT32 nRes = 0; - NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::HTML; - std::wstring sFileFromDir = NSDirectory::GetFolderPath(sFrom); - std::wstring sFileToDir = NSDirectory::GetFolderPath(sTo); - std::wstring sImagesDirectory = sFileFromDir + FILE_SEPARATOR_STR + L"media"; - std::wstring sHtmlFile = sFileFromDir + FILE_SEPARATOR_STR + L"index.html"; - NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : L""); - std::wstring sXml = getDoctXml(eFromType, eToType, sFileFromDir, sHtmlFile, sImagesDirectory, sThemeDir, -1, L"", params); - std::wstring sResult; - oDoctRenderer.Execute(sXml, sResult); - if (sResult.find(L"error") != std::wstring::npos) - { - std::wcerr << L"DoctRenderer:" << sResult << std::endl; - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - else - { - CEpubFile oFile; - std::wstring sEpubTemp = sTemp + FILE_SEPARATOR_STR + L"tmp"; - NSDirectory::CreateDirectory(sEpubTemp); - oFile.SetTempDirectory(sEpubTemp); - if (S_FALSE == oFile.FromHtml(sFileFromDir + FILE_SEPARATOR_STR + L"..", sTo)) - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - return nRes; - } - // doct_bin -> fb2 - _UINT32 doct_bin2fb(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params) - { - _UINT32 nRes = 0; - NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::HTML; - std::wstring sFileFromDir = NSDirectory::GetFolderPath(sFrom); - std::wstring sFileToDir = NSDirectory::GetFolderPath(sTo); - std::wstring sImagesDirectory = sFileFromDir + FILE_SEPARATOR_STR + L"media"; - std::wstring sHtmlFile = sFileFromDir + FILE_SEPARATOR_STR + L"index.html"; - NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : L""); - std::wstring sXml = getDoctXml(eFromType, eToType, sFileFromDir, sHtmlFile, sImagesDirectory, sThemeDir, -1, L"", params); - std::wstring sResult; - oDoctRenderer.Execute(sXml, sResult); - if (sResult.find(L"error") != std::wstring::npos) - { - std::wcerr << L"DoctRenderer:" << sResult << std::endl; - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - else - { - CFb2File fb2File; - fb2File.SetTmpDirectory(sTemp); - if (S_FALSE == fb2File.FromHtml(sFileFromDir + FILE_SEPARATOR_STR + L"..", sTo)) - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - return nRes; - } - // doct_bin -> html_zip - _UINT32 doct_bin2html_zip(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params) - { - _UINT32 nRes = 0; - NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::HTML; - std::wstring sFileFromDir = NSDirectory::GetFolderPath(sFrom); - std::wstring sFileToDir = NSDirectory::GetFolderPath(sTo); - std::wstring sImagesDirectory = sFileFromDir + FILE_SEPARATOR_STR + L"media"; - std::wstring sHtmlFile = sFileFromDir + FILE_SEPARATOR_STR + L"index.html"; - NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : L""); - std::wstring sXml = getDoctXml(eFromType, eToType, sFileFromDir, sHtmlFile, sImagesDirectory, sThemeDir, -1, L"", params); - std::wstring sResult; - oDoctRenderer.Execute(sXml, sResult); - if (sResult.find(L"error") != std::wstring::npos) - { - std::wcerr << L"DoctRenderer:" << sResult << std::endl; - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - else - { - // Удаляем Editor.bin, иначе он попадёт в архив - NSFile::CFileBinary::Remove(sFileFromDir + FILE_SEPARATOR_STR + L"Editor.bin"); - NSDirectory::DeleteDirectory(sImagesDirectory); - std::wstring sName = NSFile::GetFileName(sFrom); - size_t nDot = sName.rfind(L'.'); - if(nDot != std::wstring::npos) - sName.erase(nDot); - COfficeUtils oZip; - if (S_FALSE == oZip.CompressFileOrDirectory(sFileFromDir, sFileToDir + FILE_SEPARATOR_STR + sName + L".zip")) - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - return nRes; - } - // doct_bin -> pdf + // doct_bin -> epub + _UINT32 doct_bin2epub(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params) + { + _UINT32 nRes = 0; + NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::HTML; + std::wstring sFileFromDir = NSDirectory::GetFolderPath(sFrom); + std::wstring sFileToDir = NSDirectory::GetFolderPath(sTo); + std::wstring sImagesDirectory = sFileFromDir + FILE_SEPARATOR_STR + L"media"; + std::wstring sHtmlFile = sFileFromDir + FILE_SEPARATOR_STR + L"index.html"; + NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : L""); + std::wstring sXml = getDoctXml(eFromType, eToType, sFileFromDir, sHtmlFile, sImagesDirectory, sThemeDir, -1, L"", params); + std::wstring sResult; + oDoctRenderer.Execute(sXml, sResult); + if (sResult.find(L"error") != std::wstring::npos) + { + std::wcerr << L"DoctRenderer:" << sResult << std::endl; + nRes = AVS_FILEUTILS_ERROR_CONVERT; + } + else + { + CEpubFile oFile; + std::wstring sEpubTemp = sTemp + FILE_SEPARATOR_STR + L"tmp"; + NSDirectory::CreateDirectory(sEpubTemp); + oFile.SetTempDirectory(sEpubTemp); + if (S_FALSE == oFile.FromHtml(sFileFromDir + FILE_SEPARATOR_STR + L"..", sTo)) + nRes = AVS_FILEUTILS_ERROR_CONVERT; + } + return nRes; + } + // doct_bin -> fb2 + _UINT32 doct_bin2fb(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params) + { + _UINT32 nRes = 0; + NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::HTML; + std::wstring sFileFromDir = NSDirectory::GetFolderPath(sFrom); + std::wstring sFileToDir = NSDirectory::GetFolderPath(sTo); + std::wstring sImagesDirectory = sFileFromDir + FILE_SEPARATOR_STR + L"media"; + std::wstring sHtmlFile = sFileFromDir + FILE_SEPARATOR_STR + L"index.html"; + NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : L""); + std::wstring sXml = getDoctXml(eFromType, eToType, sFileFromDir, sHtmlFile, sImagesDirectory, sThemeDir, -1, L"", params); + std::wstring sResult; + oDoctRenderer.Execute(sXml, sResult); + if (sResult.find(L"error") != std::wstring::npos) + { + std::wcerr << L"DoctRenderer:" << sResult << std::endl; + nRes = AVS_FILEUTILS_ERROR_CONVERT; + } + else + { + CFb2File fb2File; + fb2File.SetTmpDirectory(sTemp); + if (S_FALSE == fb2File.FromHtml(sFileFromDir + FILE_SEPARATOR_STR + L"..", sTo)) + nRes = AVS_FILEUTILS_ERROR_CONVERT; + } + return nRes; + } + // doct_bin -> html_zip + _UINT32 doct_bin2html_zip(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params) + { + _UINT32 nRes = 0; + NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::HTML; + std::wstring sFileFromDir = NSDirectory::GetFolderPath(sFrom); + std::wstring sFileToDir = NSDirectory::GetFolderPath(sTo); + std::wstring sImagesDirectory = sFileFromDir + FILE_SEPARATOR_STR + L"media"; + std::wstring sHtmlFile = sFileFromDir + FILE_SEPARATOR_STR + L"index.html"; + NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : L""); + std::wstring sXml = getDoctXml(eFromType, eToType, sFileFromDir, sHtmlFile, sImagesDirectory, sThemeDir, -1, L"", params); + std::wstring sResult; + oDoctRenderer.Execute(sXml, sResult); + if (sResult.find(L"error") != std::wstring::npos) + { + std::wcerr << L"DoctRenderer:" << sResult << std::endl; + nRes = AVS_FILEUTILS_ERROR_CONVERT; + } + else + { + // Удаляем Editor.bin, иначе он попадёт в архив + NSFile::CFileBinary::Remove(sFileFromDir + FILE_SEPARATOR_STR + L"Editor.bin"); + NSDirectory::DeleteDirectory(sImagesDirectory); + std::wstring sName = NSFile::GetFileName(sFrom); + size_t nDot = sName.rfind(L'.'); + if(nDot != std::wstring::npos) + sName.erase(nDot); + COfficeUtils oZip; + if (S_FALSE == oZip.CompressFileOrDirectory(sFileFromDir, sFileToDir + FILE_SEPARATOR_STR + sName + L".zip")) + nRes = AVS_FILEUTILS_ERROR_CONVERT; + } + return nRes; + } + // doct_bin -> pdf _UINT32 doct_bin2pdf(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params) - { - _UINT32 nRes = 0; - NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::PDF; - std::wstring sTFileDir = NSDirectory::GetFolderPath(sFrom); - std::wstring sImagesDirectory = sTFileDir + FILE_SEPARATOR_STR + _T("media"); - std::wstring sPdfBinFile = sTFileDir + FILE_SEPARATOR_STR + _T("pdf.bin"); - NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : _T("")); - std::wstring sXml = getDoctXml(eFromType, eToType, sTFileDir, sPdfBinFile, sImagesDirectory, sThemeDir, -1, _T(""), params); - std::wstring sResult; - bool bRes = oDoctRenderer.Execute(sXml, sResult); - if (sResult.find(L"error") != std::wstring::npos) - { - std::wcerr << _T("DoctRenderer:") << sResult << std::endl; - nRes = AVS_FILEUTILS_ERROR_CONVERT; - } - else - { - NSFonts::IApplicationFonts* pApplicationFonts = NSFonts::NSApplication::Create(); - initApplicationFonts(pApplicationFonts, params); + { + _UINT32 nRes = 0; + NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::PDF; + std::wstring sTFileDir = NSDirectory::GetFolderPath(sFrom); + std::wstring sImagesDirectory = sTFileDir + FILE_SEPARATOR_STR + _T("media"); + std::wstring sPdfBinFile = sTFileDir + FILE_SEPARATOR_STR + _T("pdf.bin"); + NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : _T("")); + std::wstring sXml = getDoctXml(eFromType, eToType, sTFileDir, sPdfBinFile, sImagesDirectory, sThemeDir, -1, _T(""), params); + std::wstring sResult; + bool bRes = oDoctRenderer.Execute(sXml, sResult); + if (sResult.find(L"error") != std::wstring::npos) + { + std::wcerr << _T("DoctRenderer:") << sResult << std::endl; + nRes = AVS_FILEUTILS_ERROR_CONVERT; + } + else + { + NSFonts::IApplicationFonts* pApplicationFonts = NSFonts::NSApplication::Create(); + initApplicationFonts(pApplicationFonts, params); + + CPdfRenderer pdfWriter(pApplicationFonts, params.getIsPDFA()); - CPdfRenderer pdfWriter(pApplicationFonts, params.getIsPDFA()); - pdfWriter.SetTempFolder(sTemp); pdfWriter.SetThemesPlace(sThemeDir); @@ -1623,23 +1623,23 @@ namespace NExtractTools std::wstring password = params.getSavePassword(); if (false == password.empty()) pdfWriter.SetPassword(password); - - int nReg = (bPaid == false) ? 0 : 1; - nRes = (S_OK == pdfWriter.OnlineWordToPdfFromBinary(sPdfBinFile, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - RELEASEOBJECT(pApplicationFonts); - } - //удаляем sPdfBinFile, потому что он не в Temp - if (NSFile::CFileBinary::Exists(sPdfBinFile)) - NSFile::CFileBinary::Remove(sPdfBinFile); - return nRes; - } - // doct_bin -> image + int nReg = (bPaid == false) ? 0 : 1; + nRes = (S_OK == pdfWriter.OnlineWordToPdfFromBinary(sPdfBinFile, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; + RELEASEOBJECT(pApplicationFonts); + } + //удаляем sPdfBinFile, потому что он не в Temp + if (NSFile::CFileBinary::Exists(sPdfBinFile)) + NSFile::CFileBinary::Remove(sPdfBinFile); + return nRes; + } + + // doct_bin -> image _UINT32 doct_bin2image(NSDoctRenderer::DoctRendererFormat::FormatFile eFromType, const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, bool bPaid, const std::wstring &sThemeDir, InputParams& params) { _UINT32 nRes = 0; NSDoctRenderer::DoctRendererFormat::FormatFile eToType = NSDoctRenderer::DoctRendererFormat::FormatFile::PDF; - std::wstring sTFileDir = NSDirectory::GetFolderPath(sFrom); + std::wstring sTFileDir = NSDirectory::GetFolderPath(sFrom); std::wstring sImagesDirectory = sTFileDir + FILE_SEPARATOR_STR + _T("media"); std::wstring sPdfBinFile = sTFileDir + FILE_SEPARATOR_STR + _T("pdf.bin"); NSDoctRenderer::CDoctrenderer oDoctRenderer(NULL != params.m_sAllFontsPath ? *params.m_sAllFontsPath : _T("")); @@ -3309,7 +3309,7 @@ namespace NExtractTools if (!bIsOnlyFirst) { sThumbnailDir = sTemp + FILE_SEPARATOR_STR + _T("thumbnails"); - NSDirectory::CreateDirectory(sThumbnailDir); + NSDirectory::CreateDirectory(sThumbnailDir); sFileToExt = getExtentionByRasterFormat(nRasterFormat); } int nPagesCount = pReader->GetPagesCount(); @@ -3380,15 +3380,15 @@ namespace NExtractTools } _UINT32 fromDocxDir(const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params) - { + { _UINT32 nRes = 0; bool bIsNeedDoct = false; switch (nFormatTo) { // перечислить все "документные" форматы, которым нужна конвертация через doct - case AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML_IN_CONTAINER: - case AVS_OFFICESTUDIO_FILE_DOCUMENT_FB2: - case AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB: + case AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML_IN_CONTAINER: + case AVS_OFFICESTUDIO_FILE_DOCUMENT_FB2: + case AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB: bIsNeedDoct = true; break; default: @@ -3427,98 +3427,98 @@ namespace NExtractTools nRes = dir2zip(sFrom, sTo, true); } } - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_DOC == nFormatTo) - { - nRes = docx_dir2doc(sFrom, sTo, sTemp, params); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT == nFormatTo) - { - nRes = docx_dir2odt(sFrom, sTo, sTemp, params, false); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_OTT == nFormatTo) - { - nRes = docx_dir2odt(sFrom, sTo, sTemp, params, true); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_RTF == nFormatTo) - { - nRes = docx_dir2rtf(sFrom, sTo, sTemp, params); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_TXT == nFormatTo) - { - nRes = docx_dir2txt(sFrom, sTo, sTemp, params); - } - else - nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS; - } - else if(AVS_OFFICESTUDIO_FILE_CANVAS_WORD == nFormatTo) - { - nRes = docx_dir2doct_bin(sFrom, sTo, sTemp, params); - } - else - { - std::wstring sDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked"); - NSDirectory::CreateDirectory(sDoctDir); - std::wstring sTFile = sDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin"); + } + else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_DOC == nFormatTo) + { + nRes = docx_dir2doc(sFrom, sTo, sTemp, params); + } + else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_ODT == nFormatTo) + { + nRes = docx_dir2odt(sFrom, sTo, sTemp, params, false); + } + else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_OTT == nFormatTo) + { + nRes = docx_dir2odt(sFrom, sTo, sTemp, params, true); + } + else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_RTF == nFormatTo) + { + nRes = docx_dir2rtf(sFrom, sTo, sTemp, params); + } + else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_TXT == nFormatTo) + { + nRes = docx_dir2txt(sFrom, sTo, sTemp, params); + } + else + nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS; + } + else if(AVS_OFFICESTUDIO_FILE_CANVAS_WORD == nFormatTo) + { + nRes = docx_dir2doct_bin(sFrom, sTo, sTemp, params); + } + else + { + std::wstring sDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked"); + NSDirectory::CreateDirectory(sDoctDir); + std::wstring sTFile = sDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin"); - nRes = docx_dir2doct_bin(sFrom, sTFile, sTemp, params); - - if(SUCCEEDED_X2T(nRes)) - { - nRes = fromDoctBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - } - return nRes; - } + nRes = docx_dir2doct_bin(sFrom, sTFile, sTemp, params); + + if(SUCCEEDED_X2T(nRes)) + { + nRes = fromDoctBin(sTFile, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); + } + } + return nRes; + } _UINT32 fromDoctBin(const std::wstring &sFrom, const std::wstring &sTo, int nFormatTo, const std::wstring &sTemp, const std::wstring &sThemeDir, bool bFromChanges, bool bPaid, InputParams& params) - { - _UINT32 nRes = 0; - if(AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY == nFormatTo) - { - std::wstring sFromDir = NSDirectory::GetFolderPath(sFrom); - nRes = dir2zip(sFromDir, sTo); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB == nFormatTo) - { - NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; - nRes = doct_bin2epub(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_FB2 == nFormatTo) - { - NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; - nRes = doct_bin2fb(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); - } - else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML_IN_CONTAINER == nFormatTo) - { - NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; - nRes = doct_bin2html_zip(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); - } - else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatTo) - { - NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; - nRes = doct_bin2pdf(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); - } - else if(0 != (AVS_OFFICESTUDIO_FILE_IMAGE & nFormatTo)) - { - NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; - nRes = doct_bin2image(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); - } - else if(0 != (AVS_OFFICESTUDIO_FILE_DOCUMENT & nFormatTo)) - { - std::wstring sDocxDir = sTemp + FILE_SEPARATOR_STR + _T("docx_unpacked"); - NSDirectory::CreateDirectory(sDocxDir); - nRes = doct_bin2docx_dir(sFrom, sTo, sDocxDir, bFromChanges, sThemeDir, params); - if(SUCCEEDED_X2T(nRes)) - { - nRes = fromDocxDir(sDocxDir, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); - } - } - else - nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS; - return nRes; - } + { + _UINT32 nRes = 0; + if(AVS_OFFICESTUDIO_FILE_TEAMLAB_DOCY == nFormatTo) + { + std::wstring sFromDir = NSDirectory::GetFolderPath(sFrom); + nRes = dir2zip(sFromDir, sTo); + } + else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_EPUB == nFormatTo) + { + NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; + nRes = doct_bin2epub(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); + } + else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_FB2 == nFormatTo) + { + NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; + nRes = doct_bin2fb(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); + } + else if(AVS_OFFICESTUDIO_FILE_DOCUMENT_HTML_IN_CONTAINER == nFormatTo) + { + NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; + nRes = doct_bin2html_zip(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); + } + else if(AVS_OFFICESTUDIO_FILE_CROSSPLATFORM_PDF == nFormatTo) + { + NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; + nRes = doct_bin2pdf(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); + } + else if(0 != (AVS_OFFICESTUDIO_FILE_IMAGE & nFormatTo)) + { + NSDoctRenderer::DoctRendererFormat::FormatFile eFromType = NSDoctRenderer::DoctRendererFormat::FormatFile::DOCT; + nRes = doct_bin2image(eFromType, sFrom, sTo, sTemp, bPaid, sThemeDir, params); + } + else if(0 != (AVS_OFFICESTUDIO_FILE_DOCUMENT & nFormatTo)) + { + std::wstring sDocxDir = sTemp + FILE_SEPARATOR_STR + _T("docx_unpacked"); + NSDirectory::CreateDirectory(sDocxDir); + nRes = doct_bin2docx_dir(sFrom, sTo, sDocxDir, bFromChanges, sThemeDir, params); + if(SUCCEEDED_X2T(nRes)) + { + nRes = fromDocxDir(sDocxDir, sTo, nFormatTo, sTemp, sThemeDir, bFromChanges, bPaid, params); + } + } + else + nRes = AVS_FILEUTILS_ERROR_CONVERT_PARAMS; + return nRes; + } _UINT32 fromDocument(const std::wstring &sFrom, int nFormatFrom, const std::wstring &sTemp, InputParams& params) - { + { std::wstring sTo = *params.m_sFileTo; int nFormatTo = AVS_OFFICESTUDIO_FILE_UNKNOWN; if(NULL != params.m_nFormatTo) @@ -4204,30 +4204,30 @@ namespace NExtractTools return AVS_FILEUTILS_ERROR_CONVERT; } _UINT32 xls2xlsx_dir (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - bool bMacros = false; + { + bool bMacros = false; - int lcid = (NULL != params.m_nLcid) ? *params.m_nLcid : -1; - - _UINT32 nRes = ConvertXls2Xlsx( sFrom, sTo, params.getPassword(), params.getFontPath(), sTemp, lcid, bMacros); + int lcid = (NULL != params.m_nLcid) ? *params.m_nLcid : -1; + + _UINT32 nRes = ConvertXls2Xlsx( sFrom, sTo, params.getPassword(), params.getFontPath(), sTemp, lcid, bMacros); - nRes = processEncryptionError(nRes, sFrom, params); - return nRes; - } + nRes = processEncryptionError(nRes, sFrom, params); + return nRes; + } // xls -> xlsm _UINT32 xls2xlsm (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) { - std::wstring sResultXlsmDir = sTemp + FILE_SEPARATOR_STR + _T("xlsm_unpacked"); + std::wstring sResultXlsmDir = sTemp + FILE_SEPARATOR_STR + _T("xlsm_unpacked"); - NSDirectory::CreateDirectory(sResultXlsmDir); + NSDirectory::CreateDirectory(sResultXlsmDir); - _UINT32 nRes = xls2xlsm_dir(sFrom, sResultXlsmDir, sTemp, params); + _UINT32 nRes = xls2xlsm_dir(sFrom, sResultXlsmDir, sTemp, params); if(SUCCEEDED_X2T(nRes)) { - COfficeUtils oCOfficeUtils(NULL); - if(S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultXlsmDir, sTo, true)) - return 0; + COfficeUtils oCOfficeUtils(NULL); + if(S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultXlsmDir, sTo, true)) + return 0; } return nRes; } @@ -4239,48 +4239,48 @@ namespace NExtractTools nRes = processEncryptionError(nRes, sFrom, params); return nRes; - } + } // xls -> xlst _UINT32 xls2xlst (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - // Extract xlsx to temp directory - std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked"); - std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin"); + { + // Extract xlsx to temp directory + std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("xlst_unpacked"); + std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin"); - NSDirectory::CreateDirectory(sResultDoctDir); + NSDirectory::CreateDirectory(sResultDoctDir); - _UINT32 nRes = xls2xlst_bin(sFrom, sResultDoctFileEditor, sTemp, params); + _UINT32 nRes = xls2xlst_bin(sFrom, sResultDoctFileEditor, sTemp, params); - if (SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } + if (SUCCEEDED_X2T(nRes)) + { + COfficeUtils oCOfficeUtils(NULL); + nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; + } - return nRes; - } + return nRes; + } // xls -> xlst_bin _UINT32 xls2xlst_bin (const std::wstring &sFrom, const std::wstring &sTo, const std::wstring &sTemp, InputParams& params) - { - std::wstring sResultXlsxDir = sTemp + FILE_SEPARATOR_STR + _T("xlsx_unpacked"); + { + std::wstring sResultXlsxDir = sTemp + FILE_SEPARATOR_STR + _T("xlsx_unpacked"); - NSDirectory::CreateDirectory(sResultXlsxDir); + NSDirectory::CreateDirectory(sResultXlsxDir); bool bMacros = true; _UINT32 nRes = ConvertXls2Xlsx( sFrom, sResultXlsxDir, params.getPassword(), params.getFontPath(), sTemp, NULL, bMacros); nRes = processEncryptionError(nRes, sFrom, params); if (SUCCEEDED_X2T(nRes)) - { - BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer; + { + BinXlsxRW::CXlsxSerializer m_oCXlsxSerializer; - m_oCXlsxSerializer.setFontDir(params.getFontPath()); + m_oCXlsxSerializer.setFontDir(params.getFontPath()); return m_oCXlsxSerializer.saveToFile (sTo, sResultXlsxDir, params.getXmlOptions()); - } - return nRes; - } + } + return nRes; + } _UINT32 html2doct_bin(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) { std::wstring sDocxDir = sTemp + FILE_SEPARATOR_STR + _T("docx_unpacked"); @@ -4305,18 +4305,18 @@ namespace NExtractTools } _UINT32 html2doct(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) { - std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked"); - std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin"); + std::wstring sResultDoctDir = sTemp + FILE_SEPARATOR_STR + _T("doct_unpacked"); + std::wstring sResultDoctFileEditor = sResultDoctDir + FILE_SEPARATOR_STR + _T("Editor.bin"); - NSDirectory::CreateDirectory(sResultDoctDir); + NSDirectory::CreateDirectory(sResultDoctDir); - _UINT32 nRes = html2doct_bin(sFrom, sResultDoctFileEditor, sTemp, params); + _UINT32 nRes = html2doct_bin(sFrom, sResultDoctFileEditor, sTemp, params); - if (SUCCEEDED_X2T(nRes)) - { - COfficeUtils oCOfficeUtils(NULL); - nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; - } + if (SUCCEEDED_X2T(nRes)) + { + COfficeUtils oCOfficeUtils(NULL); + nRes = (S_OK == oCOfficeUtils.CompressFileOrDirectory(sResultDoctDir, sTo)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; + } return nRes; } _UINT32 html_zip2doct(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) @@ -4335,7 +4335,7 @@ namespace NExtractTools } return nRes; } - _UINT32 html2docx(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) + _UINT32 html2docx(const std::wstring &sFrom, const std::wstring &sTo, const std::wstring & sTemp, InputParams& params) { std::wstring sDocxDir = sTemp + FILE_SEPARATOR_STR + _T("docx_unpacked"); NSDirectory::CreateDirectory(sDocxDir); @@ -4366,17 +4366,17 @@ namespace NExtractTools //------------------------------------------------------------------------------------------------------------------ _UINT32 detectMacroInFile(InputParams& oInputParams) { - _UINT32 nRes = 0;// no macro + _UINT32 nRes = 0;// no macro std::wstring sFileFrom = *oInputParams.m_sFileFrom; COfficeFileFormatChecker OfficeFileFormatChecker; if (OfficeFileFormatChecker.isOfficeFile(sFileFrom)) - { - if (OfficeFileFormatChecker.bMacroEnabled) - { - nRes = AVS_ERROR_MACRO; - } + { + if (OfficeFileFormatChecker.bMacroEnabled) + { + nRes = AVS_ERROR_MACRO; + } } return nRes; @@ -4458,7 +4458,7 @@ namespace NExtractTools return AVS_FILEUTILS_ERROR_CONVERT_LIMITS; } - NSDoctRenderer::CDocBuilder::Initialize(); + NSDoctRenderer::CDocBuilder::Initialize(); _UINT32 result = 0; switch(conversion) @@ -4663,20 +4663,20 @@ namespace NExtractTools }break; case TCD_BIN2T: { - result = dir2zip (NSDirectory::GetFolderPath(sFileFrom), sFileTo); + result = dir2zip (NSDirectory::GetFolderPath(sFileFrom), sFileTo); }break; case TCD_T2BIN: { - result = zip2dir (sFileFrom, NSDirectory::GetFolderPath(sFileTo)); + result = zip2dir (sFileFrom, NSDirectory::GetFolderPath(sFileTo)); }break; case TCD_PPT2PPTX: { result = ppt2pptx (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; + }break; case TCD_PPT2PPTM: { result = ppt2pptm (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; + }break; case TCD_PPT2PPTT: { result = ppt2pptt (sFileFrom, sFileTo, sTempDir, oInputParams); @@ -4760,7 +4760,7 @@ namespace NExtractTools case TCD_ODF2OOT_BIN: { result = odf2oot_bin (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; + }break; case TCD_ODF_FLAT2OOX: { result = odf_flat2oox (sFileFrom, sFileTo, sTempDir, oInputParams); @@ -4772,7 +4772,7 @@ namespace NExtractTools case TCD_ODF_FLAT2OOT_BIN: { result = odf_flat2oot_bin (sFileFrom, sFileTo, sTempDir, oInputParams); - }break; + }break; case TCD_DOCX2ODT: { result = docx2odt (sFileFrom, sFileTo, sTempDir, oInputParams); @@ -4894,7 +4894,7 @@ namespace NExtractTools } //clean up v8 - // NSDoctRenderer::CDocBuilder::Dispose(); + // NSDoctRenderer::CDocBuilder::Dispose(); if (SUCCEEDED_X2T(result) && oInputParams.m_bOutputConvertCorrupted) { return AVS_FILEUTILS_ERROR_CONVERT_CORRUPTED;