From 454ef30d56db1e3124b7aa6c16886f665916aadb Mon Sep 17 00:00:00 2001 From: Kulikova Svetlana Date: Wed, 11 Jan 2023 17:54:12 +0300 Subject: [PATCH 1/3] creator --- DesktopEditor/graphics/IRenderer.h | 1 + DesktopEditor/graphics/MetafileToRenderer.cpp | 7 +++++++ DesktopEditor/graphics/MetafileToRenderer.h | 1 + 3 files changed, 9 insertions(+) diff --git a/DesktopEditor/graphics/IRenderer.h b/DesktopEditor/graphics/IRenderer.h index f1cb19db54..788a5dc9b0 100644 --- a/DesktopEditor/graphics/IRenderer.h +++ b/DesktopEditor/graphics/IRenderer.h @@ -324,6 +324,7 @@ public: virtual HRESULT AddHyperlink(const double& dX, const double& dY, const double& dW, const double& dH, const std::wstring& wsUrl, const std::wstring& wsTooltip) {return S_OK;} virtual HRESULT AddLink(const double& dX, const double& dY, const double& dW, const double& dH, const double& dDestX, const double& dDestY, const int& nPage) {return S_OK;} virtual HRESULT AddFormField(IFormField* pField) {return S_OK;} + virtual HRESULT DocInfo(std::wstring wsTitle) {return S_OK;} }; #define PROPERTY_RENDERER(NameBase, Name, Type) \ diff --git a/DesktopEditor/graphics/MetafileToRenderer.cpp b/DesktopEditor/graphics/MetafileToRenderer.cpp index 9c8c83bbb5..5b7a21b8cb 100644 --- a/DesktopEditor/graphics/MetafileToRenderer.cpp +++ b/DesktopEditor/graphics/MetafileToRenderer.cpp @@ -1221,6 +1221,13 @@ namespace NSOnlineOfficeBinToPdf break; } + case ctDocInfo: + { + std::wstring wsUrl = ReadString(current, curindex); + std::wstring wsTooltip = ReadString(current, curindex); + + break; + } default: { break; diff --git a/DesktopEditor/graphics/MetafileToRenderer.h b/DesktopEditor/graphics/MetafileToRenderer.h index 09667a582b..7b298fbb07 100644 --- a/DesktopEditor/graphics/MetafileToRenderer.h +++ b/DesktopEditor/graphics/MetafileToRenderer.h @@ -178,6 +178,7 @@ namespace NSOnlineOfficeBinToPdf ctHyperlink = 160, ctLink = 161, ctFormField = 162, + ctDocInfo = 163, ctPageWidth = 200, ctPageHeight = 201, From b1474a84c44655106a36a38a718b7afb73e5e0d3 Mon Sep 17 00:00:00 2001 From: Kulikova Svetlana Date: Thu, 12 Jan 2023 11:05:05 +0300 Subject: [PATCH 2/3] SetDocumentInfo --- DesktopEditor/graphics/IRenderer.h | 2 +- DesktopEditor/graphics/MetafileToRenderer.cpp | 7 +- PdfFile/PdfFile.cpp | 15 +- PdfFile/PdfFile.h | 4 +- PdfFile/PdfWriter.cpp | 32 +--- PdfFile/PdfWriter.h | 156 +++++++++--------- 6 files changed, 101 insertions(+), 115 deletions(-) diff --git a/DesktopEditor/graphics/IRenderer.h b/DesktopEditor/graphics/IRenderer.h index 788a5dc9b0..c441bb54e9 100644 --- a/DesktopEditor/graphics/IRenderer.h +++ b/DesktopEditor/graphics/IRenderer.h @@ -324,7 +324,7 @@ public: virtual HRESULT AddHyperlink(const double& dX, const double& dY, const double& dW, const double& dH, const std::wstring& wsUrl, const std::wstring& wsTooltip) {return S_OK;} virtual HRESULT AddLink(const double& dX, const double& dY, const double& dW, const double& dH, const double& dDestX, const double& dDestY, const int& nPage) {return S_OK;} virtual HRESULT AddFormField(IFormField* pField) {return S_OK;} - virtual HRESULT DocInfo(std::wstring wsTitle) {return S_OK;} + virtual HRESULT DocInfo(const std::wstring& wsTitle, const std::wstring& wsCreator, const std::wstring& wsSubject, const std::wstring& wsKeywords) {return S_OK;} }; #define PROPERTY_RENDERER(NameBase, Name, Type) \ diff --git a/DesktopEditor/graphics/MetafileToRenderer.cpp b/DesktopEditor/graphics/MetafileToRenderer.cpp index 5b7a21b8cb..64532225bb 100644 --- a/DesktopEditor/graphics/MetafileToRenderer.cpp +++ b/DesktopEditor/graphics/MetafileToRenderer.cpp @@ -1223,9 +1223,12 @@ namespace NSOnlineOfficeBinToPdf } case ctDocInfo: { - std::wstring wsUrl = ReadString(current, curindex); - std::wstring wsTooltip = ReadString(current, curindex); + std::wstring wsTitle = ReadString(current, curindex); + std::wstring wsCreator = ReadString(current, curindex); + std::wstring wsSubject = ReadString(current, curindex); + std::wstring wsKeywords = ReadString(current, curindex); + pRenderer->DocInfo(wsTitle, wsCreator, wsSubject, wsKeywords); break; } default: diff --git a/PdfFile/PdfFile.cpp b/PdfFile/PdfFile.cpp index 6aa8a1da73..59b193fada 100644 --- a/PdfFile/PdfFile.cpp +++ b/PdfFile/PdfFile.cpp @@ -835,12 +835,6 @@ void CPdfFile::SetDocumentID(const std::wstring& wsDocumentID) return; m_pInternal->pWriter->SetDocumentID(wsDocumentID); } -void CPdfFile::SetCore(const std::wstring& wsCoreXml) -{ - if (!m_pInternal->pWriter) - return; - m_pInternal->pWriter->SetCore(wsCoreXml); -} HRESULT CPdfFile::OnlineWordToPdf(const std::wstring& wsSrcFile, const std::wstring& wsDstFile, CConvertFromBinParams* pParams) { #ifndef BUILDING_WASM_MODULE @@ -1469,5 +1463,12 @@ HRESULT CPdfFile::AddFormField(IFormField* pFieldInfo) { if (!m_pInternal->pWriter) return S_FALSE; - return m_pInternal->pWriter->AddFormField(m_pInternal->pAppFonts, pFieldInfo); + return m_pInternal->pWriter->AddFormField(m_pInternal->pAppFonts, pFieldInfo); +} +HRESULT CPdfFile::DocInfo(const std::wstring& wsTitle, const std::wstring& wsCreator, const std::wstring& wsSubject, const std::wstring& wsKeywords) +{ + if (!m_pInternal->pWriter) + return S_FALSE; + m_pInternal->pWriter->SetDocumentInfo(wsTitle, wsCreator, wsSubject, wsKeywords); + return S_OK; } diff --git a/PdfFile/PdfFile.h b/PdfFile/PdfFile.h index bd1f55671b..fa7faa6569 100644 --- a/PdfFile/PdfFile.h +++ b/PdfFile/PdfFile.h @@ -130,7 +130,6 @@ public: void RotatePage (int nRotate); void SetPassword (const std::wstring& wsPassword); void SetDocumentID(const std::wstring& wsDocumentID); - void SetCore (const std::wstring& wsCoreXml); void Sign(const double& dX, const double& dY, const double& dW, const double& dH, const std::wstring& wsPicturePath, ICertificate* pCertificate); HRESULT OnlineWordToPdf (const std::wstring& wsSrcFile, const std::wstring& wsDstFile, CConvertFromBinParams* pParams = NULL); HRESULT OnlineWordToPdfFromBinary(const std::wstring& wsSrcFile, const std::wstring& wsDstFile, CConvertFromBinParams* pParams = NULL); @@ -273,7 +272,8 @@ public: virtual HRESULT CommandString(const LONG& lType, const std::wstring& sCommand); virtual HRESULT AddHyperlink(const double& dX, const double& dY, const double& dW, const double& dH, const std::wstring& wsUrl, const std::wstring& wsTooltip); virtual HRESULT AddLink(const double& dX, const double& dY, const double& dW, const double& dH, const double& dDestX, const double& dDestY, const int& nPage); - virtual HRESULT AddFormField(IFormField* pFieldInfo); + virtual HRESULT AddFormField(IFormField* pFieldInfo); + virtual HRESULT DocInfo(const std::wstring& wsTitle, const std::wstring& wsCreator, const std::wstring& wsSubject, const std::wstring& wsKeywords); private: CPdfFile_Private* m_pInternal; diff --git a/PdfFile/PdfWriter.cpp b/PdfFile/PdfWriter.cpp index 044df413cd..3c99dfecae 100644 --- a/PdfFile/PdfWriter.cpp +++ b/PdfFile/PdfWriter.cpp @@ -161,38 +161,20 @@ int CPdfWriter::SaveToFile(const std::wstring& wsPath) return 0; } -void CPdfWriter::SetCore(const std::wstring& wsCoreXml) +void CPdfWriter::SetDocumentInfo(const std::wstring& wsTitle, const std::wstring& wsCreator, const std::wstring& wsSubject, const std::wstring& wsKeywords) { if (!IsValid()) return; - XmlUtils::CXmlLiteReader oCoreReader; - oCoreReader.FromString(wsCoreXml); - oCoreReader.ReadNextNode(); + std::string sTitle = U_TO_UTF8(wsTitle); + std::string sAuthor = U_TO_UTF8(wsCreator); + std::string sSubject = U_TO_UTF8(wsSubject); + std::string sKeywords = U_TO_UTF8(wsKeywords); - std::string sAuthor, sAnnotation, sKeywords, sSubject, sTitle; - int nDeath = oCoreReader.GetDepth(); - while (oCoreReader.ReadNextSiblingNode(nDeath)) - { - std::wstring sName = oCoreReader.GetName(); - std::string sText = oCoreReader.GetText2A(); - if (!sText.empty()) - { - if (sName == L"dc:creator") - sAuthor = sText; - else if (sName == L"dc:title") - sTitle = sText; - else if (sName == L"dc:subject") - sSubject = sText; - else if (sName == L"cp:keywords") - sKeywords = sText; - } - } - - if (!sAuthor.empty()) - m_pDocument->SetAuthor(sAuthor); if (!sTitle.empty()) m_pDocument->SetTitle(sTitle); + if (!sAuthor.empty()) + m_pDocument->SetAuthor(sAuthor); if (!sSubject.empty()) m_pDocument->SetSubject(sSubject); if (!sKeywords.empty()) diff --git a/PdfFile/PdfWriter.h b/PdfFile/PdfWriter.h index bff972b8e4..2403411375 100644 --- a/PdfFile/PdfWriter.h +++ b/PdfFile/PdfWriter.h @@ -44,17 +44,17 @@ namespace PdfWriter { - class CDocument; - class CPage; + class CDocument; + class CPage; class CFontCidTrueType; - class CImageDict; - class CShading; + class CImageDict; + class CShading; class CExtGrState; } namespace Aggplus { - class CImage; + class CImage; } class CPdfWriter @@ -62,22 +62,22 @@ class CPdfWriter public: CPdfWriter(NSFonts::IApplicationFonts* pAppFonts, bool isPDFA = false); ~CPdfWriter(); - int SaveToFile(const std::wstring& wsPath); - void SetPassword(const std::wstring& wsPassword); - void SetDocumentID(const std::wstring& wsDocumentID); - void SetCore(const std::wstring& wsCoreXml); + int SaveToFile(const std::wstring& wsPath); + void SetPassword(const std::wstring& wsPassword); + void SetDocumentID(const std::wstring& wsDocumentID); + void SetDocumentInfo(const std::wstring& wsTitle, const std::wstring& wsCreator, const std::wstring& wsSubject, const std::wstring& wsKeywords); std::wstring GetTempFile(const std::wstring& wsDirectory); - //---------------------------------------------------------------------------------------- - // Функции для работы со страницей - //---------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------- + // Функции для работы со страницей + //---------------------------------------------------------------------------------------- HRESULT NewPage(); HRESULT get_Height(double* dHeight); HRESULT put_Height(const double& dHeight); HRESULT get_Width(double* dWidth); HRESULT put_Width(const double& dWidth); - //---------------------------------------------------------------------------------------- - // Функции для работы с Pen - //---------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------- + // Функции для работы с Pen + //---------------------------------------------------------------------------------------- HRESULT get_PenColor(LONG* lColor); HRESULT put_PenColor(const LONG& lColor); HRESULT get_PenAlpha(LONG* lAlpha); @@ -99,9 +99,9 @@ public: HRESULT get_PenMiterLimit(double* dMiter); HRESULT put_PenMiterLimit(const double& dMiter); HRESULT PenDashPattern(double* pPattern, LONG lCount); - //---------------------------------------------------------------------------------------- - // Функции для работы с Brush - //---------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------- + // Функции для работы с Brush + //---------------------------------------------------------------------------------------- HRESULT get_BrushType(LONG* lType); HRESULT put_BrushType(const LONG& lType); HRESULT get_BrushColor1(LONG* lColor); @@ -122,9 +122,9 @@ public: HRESULT put_BrushLinearAngle(const double& dAngle); HRESULT BrushRect(const INT& nVal, const double& dLeft, const double& dTop, const double& dWidth, const double& dHeight); HRESULT put_BrushGradientColors(LONG* pColors, double* pPositions, LONG lCount); - //---------------------------------------------------------------------------------------- - // Функции для работы со шрифтами - //---------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------- + // Функции для работы со шрифтами + //---------------------------------------------------------------------------------------- HRESULT get_FontName(std::wstring* wsName); HRESULT put_FontName(const std::wstring& wsName); HRESULT get_FontPath(std::wstring* wsPath); @@ -139,21 +139,21 @@ public: HRESULT put_FontCharSpace(const double& dSpace); HRESULT get_FontFaceIndex(int* lFaceIndex); HRESULT put_FontFaceIndex(const int& lFaceIndex); - //---------------------------------------------------------------------------------------- - // Функции для вывода текста - //---------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------- + // Функции для вывода текста + //---------------------------------------------------------------------------------------- HRESULT CommandDrawTextCHAR (const LONG& lUnicode, const double& dX, const double& dY, const double& dW, const double& dH); HRESULT CommandDrawTextExCHAR(const LONG& lUnicode, const LONG& lGid, const double& dX, const double& dY, const double& dW, const double& dH); HRESULT CommandDrawText (const std::wstring& wsUnicodeText, const double& dX, const double& dY, const double& dW, const double& dH); HRESULT CommandDrawTextEx (const std::wstring& wsUnicodeText, const unsigned int* pGids, const unsigned int nGidsCount, const double& dX, const double& dY, const double& dW, const double& dH); HRESULT CommandDrawTextCHAR2 (unsigned int* unUnicode, const unsigned int& unUnicodeCount, const unsigned int& unGid, const double& dX, const double& dY, const double& dW, const double& dH); - //---------------------------------------------------------------------------------------- - // Маркеры команд - //---------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------- + // Маркеры команд + //---------------------------------------------------------------------------------------- HRESULT EndCommand(const DWORD& lType, const LONG& lClipMode); - //---------------------------------------------------------------------------------------- - // Функции для работы с патом - //---------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------- + // Функции для работы с патом + //---------------------------------------------------------------------------------------- HRESULT PathCommandMoveTo(const double& dX, const double& dY); HRESULT PathCommandLineTo(const double& dX, const double& dY); HRESULT PathCommandLinesTo(double* pPoints, const int& nCount); @@ -169,31 +169,31 @@ public: HRESULT PathCommandTextExCHAR(const LONG& lUnicode, const LONG& lGid, const double& dX, const double& dY, const double& dW, const double& dH); HRESULT PathCommandText (const std::wstring& wsUnicodeText, const double& dX, const double& dY, const double& dW, const double& dH); HRESULT PathCommandTextEx (const std::wstring& wsUnicodeText, const unsigned int* pGids, const unsigned int nGidsCount, const double& dX, const double& dY, const double& dW, const double& dH); - //---------------------------------------------------------------------------------------- - // Функции для вывода изображений - //---------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------- + // Функции для вывода изображений + //---------------------------------------------------------------------------------------- HRESULT DrawImage(IGrObject* pImage, const double& dX, const double& dY, const double& dW, const double& dH); HRESULT DrawImageFromFile(NSFonts::IApplicationFonts* pAppFonts, const std::wstring& wsTempDirectory, const std::wstring& wsImagePath, const double& dX, const double& dY, const double& dW, const double& dH, const BYTE& nAlpha = 255); - //---------------------------------------------------------------------------------------- - // Функции для выставления преобразования - //---------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------- + // Функции для выставления преобразования + //---------------------------------------------------------------------------------------- HRESULT SetTransform(const double& dM11, const double& dM12, const double& dM21, const double& dM22, const double& dX, const double& dY); HRESULT GetTransform(double* dM11, double* dM12, double* dM21, double* dM22, double* dX, double* dY); HRESULT ResetTransform(); - //---------------------------------------------------------------------------------------- - // Дополнительные функции - //---------------------------------------------------------------------------------------- + //---------------------------------------------------------------------------------------- + // Дополнительные функции + //---------------------------------------------------------------------------------------- HRESULT AddHyperlink(const double& dX, const double& dY, const double& dW, const double& dH, const std::wstring& wsUrl, const std::wstring& wsTooltip); HRESULT AddLink(const double& dX, const double& dY, const double& dW, const double& dH, const double& dDestX, const double& dDestY, const int& nPage); - HRESULT AddFormField(NSFonts::IApplicationFonts* pAppFonts, IFormField* pFiledInfo); - //---------------------------------------------------------------------------------------- - // Дополнительные функции Pdf рендерера - //---------------------------------------------------------------------------------------- + HRESULT AddFormField(NSFonts::IApplicationFonts* pAppFonts, IFormField* pFiledInfo); + //---------------------------------------------------------------------------------------- + // Дополнительные функции Pdf рендерера + //---------------------------------------------------------------------------------------- HRESULT DrawImage1bpp(NSImages::CPixJbig2* pImageBuffer, const unsigned int& unWidth, const unsigned int& unHeight, const double& dX, const double& dY, const double& dW, const double& dH); - HRESULT EnableBrushRect(const LONG& lEnable); - HRESULT SetLinearGradient(const double& dX1, const double& dY1, const double& dX2, const double& dY2); + HRESULT EnableBrushRect(const LONG& lEnable); + HRESULT SetLinearGradient(const double& dX1, const double& dY1, const double& dX2, const double& dY2); HRESULT SetRadialGradient(const double& dX1, const double& dY1, const double& dR1, const double& dX2, const double& dY2, const double& dR2); - HRESULT DrawImageWith1bppMask(IGrObject* pImage, NSImages::CPixJbig2* pMaskBuffer, const unsigned int& unMaskWidth, const unsigned int& unMaskHeight, const double& dX, const double& dY, const double& dW, const double& dH); + HRESULT DrawImageWith1bppMask(IGrObject* pImage, NSImages::CPixJbig2* pMaskBuffer, const unsigned int& unMaskWidth, const unsigned int& unMaskHeight, const double& dX, const double& dY, const double& dW, const double& dH); //---------------------------------------------------------------------------------------- // Дополнительные функции для дозаписи Pdf @@ -209,22 +209,22 @@ public: PdfWriter::CPage* m_pPage; private: - PdfWriter::CImageDict* LoadImage(Aggplus::CImage* pImage, const BYTE& nAlpha); - bool DrawImage(Aggplus::CImage* pImage, const double& dX, const double& dY, const double& dW, const double& dH, const BYTE& nAlpha); - bool DrawText(unsigned char* pCodes, const unsigned int& unLen, const double& dX, const double& dY); + PdfWriter::CImageDict* LoadImage(Aggplus::CImage* pImage, const BYTE& nAlpha); + bool DrawImage(Aggplus::CImage* pImage, const double& dX, const double& dY, const double& dW, const double& dH, const BYTE& nAlpha); + bool DrawText(unsigned char* pCodes, const unsigned int& unLen, const double& dX, const double& dY); bool PathCommandDrawText(unsigned int* pUnicodes, unsigned int unLen, const double& dX, const double& dY, const unsigned int* pGids = NULL); void UpdateFont(); void GetFontPath(const std::wstring& wsFontName, const bool& bBold, const bool& bItalic, std::wstring& wsFontPath, LONG& lFaceIndex); PdfWriter::CFontCidTrueType* GetFont(const std::wstring& wsFontPath, const LONG& lFontIndex); PdfWriter::CFontCidTrueType* GetFont(const std::wstring& wsFontName, const bool& bBold, const bool& bItalic); - void UpdateTransform(); - void UpdatePen(); + void UpdateTransform(); + void UpdatePen(); void UpdateBrush(NSFonts::IApplicationFonts* pAppFonts, const std::wstring& wsTempDirectory); - void Reset(); - bool IsValid(); - bool IsPageValid(); - void SetError(); - void AddLink(PdfWriter::CPage* pPage, const double& dX, const double& dY, const double& dW, const double& dH, const double& dDestX, const double& dDestY, const unsigned int& unDestPage); + void Reset(); + bool IsValid(); + bool IsPageValid(); + void SetError(); + void AddLink(PdfWriter::CPage* pPage, const double& dX, const double& dY, const double& dW, const double& dH, const double& dDestX, const double& dDestY, const unsigned int& unDestPage); unsigned char* EncodeString(const unsigned int* pUnicodes, const unsigned int& unUnicodesCount, const unsigned int* pGIDs = NULL); unsigned char* EncodeGID(const unsigned int& unGID, const unsigned int* pUnicodes, const unsigned int& unUnicodesCount); std::wstring GetDownloadFile(const std::wstring& sUrl, const std::wstring& wsTempDirectory); @@ -232,31 +232,31 @@ private: private: NSFonts::IFontManager* m_pFontManager; - PdfWriter::CFontCidTrueType* m_pFont; - PdfWriter::CShading* m_pShading; - PdfWriter::CExtGrState* m_pShadingExtGrState; - - bool m_bNeedUpdateTextFont; - bool m_bNeedUpdateTextColor; - bool m_bNeedUpdateTextAlpha; - bool m_bNeedUpdateTextCharSpace; - bool m_bNeedUpdateTextSize; + PdfWriter::CFontCidTrueType* m_pFont; + PdfWriter::CShading* m_pShading; + PdfWriter::CExtGrState* m_pShadingExtGrState; - CCommandManager m_oCommandManager; + bool m_bNeedUpdateTextFont; + bool m_bNeedUpdateTextColor; + bool m_bNeedUpdateTextAlpha; + bool m_bNeedUpdateTextCharSpace; + bool m_bNeedUpdateTextSize; - CPenState m_oPen; - CBrushState m_oBrush; - CFontState m_oFont; - CPath m_oPath; - CTransform m_oTransform; - double m_dPageHeight; - double m_dPageWidth; - LONG m_lClipDepth; - std::vector m_vFonts; - std::vectorm_vDestinations; + CCommandManager m_oCommandManager; + + CPenState m_oPen; + CBrushState m_oBrush; + CFontState m_oFont; + CPath m_oPath; + CTransform m_oTransform; + double m_dPageHeight; + double m_dPageWidth; + LONG m_lClipDepth; + std::vector m_vFonts; + std::vectorm_vDestinations; unsigned int m_unFieldsCounter; - CMultiLineTextManager m_oLinesManager; - + CMultiLineTextManager m_oLinesManager; + bool m_bValid; }; From 13d1d3d3e9d2eb8d67424fa2b6d527a11513721e Mon Sep 17 00:00:00 2001 From: Kulikova Svetlana Date: Fri, 13 Jan 2023 10:37:35 +0300 Subject: [PATCH 3/3] x2t fix --- X2tConverter/src/ASCConverters.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/X2tConverter/src/ASCConverters.cpp b/X2tConverter/src/ASCConverters.cpp index c6a3c8c20d..98f7ea9980 100644 --- a/X2tConverter/src/ASCConverters.cpp +++ b/X2tConverter/src/ASCConverters.cpp @@ -1892,9 +1892,6 @@ namespace NExtractTools if (false == password.empty()) pdfWriter.SetPassword(password); - if (false == sResult.empty()) - pdfWriter.SetCore(sResult); - int nReg = (bPaid == false) ? 0 : 1; nRes = (S_OK == pdfWriter.OnlineWordToPdfFromBinary(sPdfBinFile, sTo, &oBufferParams)) ? nRes : AVS_FILEUTILS_ERROR_CONVERT; RELEASEOBJECT(pApplicationFonts); @@ -3567,9 +3564,6 @@ namespace NExtractTools if (false == password.empty()) pdfWriter.SetPassword(password); - if (false == sResult.empty()) - pdfWriter.SetCore(sResult); - int nReg = (bPaid == false) ? 0 : 1; nRes = (S_OK == pdfWriter.OnlineWordToPdfFromBinary(sFilePathIn, sFilePathOut, &oBufferParams)) ? 0 : AVS_FILEUTILS_ERROR_CONVERT; RELEASEOBJECT(pApplicationFonts);