Merge pull request #579 from ONLYOFFICE/fix/v6.3.0-fix-bugs

Fix/v6.3.0 fix bugs
fix bug #49738
2026-04-07 13:55:33 +08:00 · 2021-04-22 17:18:47 +03:00 · 2021-04-22 17:13:49 +03:00 · 2021-04-22 16:17:16 +03:00 · 2021-04-22 16:16:03 +03:00 · 2021-04-20 13:16:43 +03:00
12 changed files with 724 additions and 853 deletions
--- a/ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp
+++ b/ASCOfficeDocFile/DocDocxConverter/FormFieldData.cpp
@ -93,8 +93,10 @@ void FormFieldData::_FFData::read(VirtualStreamReader *reader)
 	{
 		xstzTextDef = readXstz(reader);
 	}
-	
-	wDef = reader->ReadUInt16();
+	else if (iType == 1 || iType == 2)
+	{
+		wDef = reader->ReadUInt16();
+	}
 	
 	xstzTextFormat	= readXstz(reader);
 	xstzHelpText	= readXstz(reader);
--- a/ASCOfficeDocFile/DocDocxConverter/FormFieldDataMapping.h
+++ b/ASCOfficeDocFile/DocDocxConverter/FormFieldDataMapping.h
@ -60,7 +60,7 @@ namespace DocFileFormat
                m_pXmlWriter->WriteNodeBegin( L"w:ffData");

 					m_pXmlWriter->WriteNodeBegin( L"w:name", true);
-						m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.xstzName);
+						m_pXmlWriter->WriteAttribute(L"w:val", XmlUtils::EncodeXmlString(ffData->FFData.xstzName));
 					m_pXmlWriter->WriteNodeEnd(L"w:name", true, true );
 					
 					m_pXmlWriter->WriteNodeBegin(L"w:enabled", true);
@ -76,26 +76,26 @@ namespace DocFileFormat
 					{
 						m_pXmlWriter->WriteNodeBegin(L"w:helpText", true);
 						m_pXmlWriter->WriteAttribute(L"w:type", ffData->FFData.fOwnHelp ? L"text" : L"autoText");
-						m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.xstzHelpText);
+						m_pXmlWriter->WriteAttribute(L"w:val", XmlUtils::EncodeXmlString(ffData->FFData.xstzHelpText));
 						m_pXmlWriter->WriteNodeEnd(L"w:helpText", true, true);
 					}
 					if (false == ffData->FFData.xstzStatText.empty())
 					{
 						m_pXmlWriter->WriteNodeBegin(L"w:statusText", true);
 						m_pXmlWriter->WriteAttribute(L"w:type", ffData->FFData.fOwnStat ? L"text" : L"autoText");
-						m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.xstzStatText);
+						m_pXmlWriter->WriteAttribute(L"w:val", XmlUtils::EncodeXmlString(ffData->FFData.xstzStatText));
 						m_pXmlWriter->WriteNodeEnd(L"w:statusText", true, true);
 					}
 					if (false == ffData->FFData.xstzEntryMcr.empty())
 					{
 						m_pXmlWriter->WriteNodeBegin(L"w:entryMacro", true);
-						m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.xstzEntryMcr);
+						m_pXmlWriter->WriteAttribute(L"w:val", XmlUtils::EncodeXmlString(ffData->FFData.xstzEntryMcr));
 						m_pXmlWriter->WriteNodeEnd(L"w:entryMacro", true, true);
 					}
 					if (false == ffData->FFData.xstzExitMcr.empty())
 					{
 						m_pXmlWriter->WriteNodeBegin(L"w:exitMacro", true);
-						m_pXmlWriter->WriteAttribute(L"w:val", ffData->FFData.xstzExitMcr);
+						m_pXmlWriter->WriteAttribute(L"w:val", XmlUtils::EncodeXmlString(ffData->FFData.xstzExitMcr));
 						m_pXmlWriter->WriteNodeEnd(L"w:exitMacro", true, true);
 					}
 					if (ffData->FFData.iType == 1)
--- a/ASCOfficeDocxFile2/BinReader/ReaderClasses.h
+++ b/ASCOfficeDocxFile2/BinReader/ReaderClasses.h
@ -452,7 +452,7 @@ public:
 				sShd += L" w:color=\"" + Color.ToString() + L"\"";

 			if (bFill)
-				sShd += L" w:fill=\"#" + Fill.ToString() + L"\"";
+				sShd += L" w:fill=\"" + Fill.ToString() + L"\"";
 			
 			if (!bColor && !bFill)
 				sShd += L" w:color=\"auto\"";
--- a/ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.cpp
+++ b/ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.cpp
@ -1660,7 +1660,13 @@ void ods_table_state::start_conditional_rule(int rule_type)
 				boost::algorithm::split(splitted, test, boost::algorithm::is_any_of(L":"), boost::algorithm::token_compress_on);
 				cell = splitted[0];

-				condition->attr_.calcext_base_cell_address_ = table + cell;
+				std::wstring col, row;
+
+				utils::splitCellAddress(cell, col, row);
+				if (col.empty()) col = L".A";
+				if (row.empty()) row = L"1";
+
+				condition->attr_.calcext_base_cell_address_ = table + col + row;
 			}
 			switch(rule_type)
 			{
--- a/ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.h
+++ b/ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.h
@ -154,8 +154,8 @@ namespace utils
 		if (strCol.empty() || strRow.empty()) 
 			return;
 		
-		col = getColAddressInv(strCol)+1;
-		row = getRowAdderssInv(strRow)+1;
+		col = getColAddressInv(strCol) + 1;
+		row = getRowAdderssInv(strRow) + 1;

 	}
 }
--- a/ASCOfficeRtfFile/RtfFormatLib/source/DestinationCommand.cpp
+++ b/ASCOfficeRtfFile/RtfFormatLib/source/DestinationCommand.cpp
@ -2907,7 +2907,11 @@ bool RtfParagraphPropDestination::ExecuteCommand(RtfDocument& oDocument, RtfRead
 		oNewShape->m_oPicture			= RtfPicturePtr( new RtfPicture() );

 		RtfPictureReader oPictureReader( oReader, *oNewShape);
-		oAbstrReader.StartSubReader( oPictureReader, oDocument, oReader );
+		if (false == oAbstrReader.StartSubReader(oPictureReader, oDocument, oReader))
+		{
+			//open-rtf-document-image-error.rtf
+			oPictureReader.Parse(oDocument, oReader);
+		}

 		if ( oNewShape->IsValid() )
 			m_oCurParagraph->AddItem( oNewShape );
--- a/Fb2File/Fb2File.cpp
+++ b/Fb2File/Fb2File.cpp
@ -59,11 +59,11 @@ struct STitleInfo
    std::vector<std::wstring> m_arGenres; // Жанры
    std::vector<SAuthor> m_arAuthors;     // Авторы
    std::wstring m_sBookTitle;            // Название
-
+    std::wstring m_pKeywords;             // Ключевые слова
    /*
    std::vector<SAuthor> m_arTranslator;  // Переводчики
    std::wstring m_sLang;      // Язык после перевода
-    std::wstring* m_pKeywords;                      // Ключевые слова
+
    std::pair<std::wstring, std::wstring>* m_pDate; // Дата
    std::wstring* m_pSrcLang;                       // Язык до перевода
    std::map<std::wstring, std::wstring> m_mSequence; // Серии книг
@ -83,7 +83,6 @@ struct STitleInfo
        /*
        m_arTranslator.clear();
        m_mSequence.clear();
-        RELEASEARRAYOBJECTS(m_pKeywords);
        RELEASEARRAYOBJECTS(m_pDate);
        RELEASEARRAYOBJECTS(m_pSrcLang);
        */
@ -216,8 +215,6 @@ public:
        m_oLightReader.Clear();
        m_mFootnotes.clear();
        m_mImages.clear();
-        m_oTitleInfo.m_arAuthors.clear();
-        m_oTitleInfo.m_arGenres.clear();
        /*
        m_mCustomInfo.clear();
        if(m_pSrcTitleInfo)
@ -1317,15 +1314,10 @@ public:
               getAuthor(oTitleInfo.m_arAuthors);
            else if (sName == L"book-title")
                oTitleInfo.m_sBookTitle = content();
-            /*
            // Читаем keywords (ноль или один)
            else if(sName == L"keywords")
-            {
-                if(oTitleInfo.m_pKeywords)
-                    delete[] oTitleInfo.m_pKeywords;
-                oTitleInfo.m_pKeywords = new std::wstring[1];
-                *oTitleInfo.m_pKeywords = content();
-            }
+                oTitleInfo.m_pKeywords = content();
+            /*
            // Читаем date (ноль или один)
            else if(sName == L"date")
            {
@ -1535,8 +1527,16 @@ HRESULT CFb2File::Open(const std::wstring& sPath, const std::wstring& sDirectory
    // Авторы
    oCore += L"</dc:subject><dc:creator>";
    oCore.WriteEncodeXmlString(m_internal->m_oTitleInfo.getAuthors());
+    oCore.WriteString(L"</dc:creator>");
+    // Ключевые слова
+    if (!m_internal->m_oTitleInfo.m_pKeywords.empty())
+    {
+        oCore.WriteString(L"<cp:keywords>");
+        oCore.WriteEncodeXmlString(m_internal->m_oTitleInfo.m_pKeywords);
+        oCore.WriteString(L"</cp:keywords>");
+    }
    // Конец core
-    oCore += L"</dc:creator><cp:revision>1</cp:revision></cp:coreProperties>";
+    oCore += L"<cp:revision>1</cp:revision></cp:coreProperties>";
    // Пишем core в файл
    NSFile::CFileBinary oCoreWriter;
    if (oCoreWriter.CreateFileW(sDocPropsDirectory + L"/core.xml"))
@ -1810,7 +1810,7 @@ HRESULT CFb2File::FromHtml(const std::wstring& sHtmlFile, const std::wstring& sC
    oDocument.WriteString(L"<title-info>");
    std::wstring sBookTitle = sInpTitle.empty() ? NSFile::GetFileName(sDst) : sInpTitle;
    std::wstring sAuthor = sBookTitle;
-    std::wstring sAnnotation, sKeywords;
+    std::wstring sAnnotation, sKeywords, sGenre;
    std::wstring sLanguage = L"en-EN", sVersion = L"1.0";
    std::wstring sIdentifier = GenerateUUID();
    XmlUtils::CXmlLiteReader oCoreReader;
@ -1826,8 +1826,10 @@ HRESULT CFb2File::FromHtml(const std::wstring& sHtmlFile, const std::wstring& sC
            sBookTitle  = oCoreReader.GetText2();
        else if (sName == L"dc:description")
            sAnnotation = oCoreReader.GetText2();
-        else if (sName == L"dc:subject" || sName == L"cp:keywords")
-            sKeywords  += oCoreReader.GetText2() + L' ';
+        else if (sName == L"dc:subject")
+            sGenre      = oCoreReader.GetText2();
+        else if (sName == L"cp:keywords")
+            sKeywords   = oCoreReader.GetText2();
        else if (sName == L"dc:identifier")
            sIdentifier = oCoreReader.GetText2();
        else if (sName == L"dc:language")
@ -1836,7 +1838,9 @@ HRESULT CFb2File::FromHtml(const std::wstring& sHtmlFile, const std::wstring& sC
            sVersion    = oCoreReader.GetText2();
    }

-    oDocument.WriteString(L"<genre>dramaturgy</genre><author><nickname>");
+    oDocument.WriteString(L"<genre>");
+    oDocument.WriteString(sGenre);
+    oDocument.WriteString(L"</genre><author><nickname>");
    oDocument.WriteString(sAuthor);
    oDocument.WriteString(L"</nickname></author><book-title>");
    oDocument.WriteString(sBookTitle);
--- a/PdfWriter/PdfWriterLibTest/PdfWriterLibTest.cpp
+++ b/PdfWriter/PdfWriterLibTest/PdfWriterLibTest.cpp
--- a/PdfWriter/PdfWriterLibTest/PdfWriterLibTest.sln
+++ b/PdfWriter/PdfWriterLibTest/PdfWriterLibTest.sln
@ -5,22 +5,154 @@ VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PdfWriterLibTest", "PdfWriterLibTest.vcxproj", "{7DBC8195-1D94-4B34-863F-8F35CC59C231}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\..\Common\3dParty\cryptopp\cryptlib.vcxproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\..\DesktopEditor\freetype-2.10.4\builds\windows\vc2010\freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug Multithreaded|x64 = Debug Multithreaded|x64
+		Debug Multithreaded|x86 = Debug Multithreaded|x86
+		Debug Singlethreaded|x64 = Debug Singlethreaded|x64
+		Debug Singlethreaded|x86 = Debug Singlethreaded|x86
+		Debug Static|x64 = Debug Static|x64
+		Debug Static|x86 = Debug Static|x86
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		DLL-Import Debug|x64 = DLL-Import Debug|x64
+		DLL-Import Debug|x86 = DLL-Import Debug|x86
+		DLL-Import Release|x64 = DLL-Import Release|x64
+		DLL-Import Release|x86 = DLL-Import Release|x86
+		Release Multithreaded|x64 = Release Multithreaded|x64
+		Release Multithreaded|x86 = Release Multithreaded|x86
+		Release Singlethreaded|x64 = Release Singlethreaded|x64
+		Release Singlethreaded|x86 = Release Singlethreaded|x86
+		Release Static|x64 = Release Static|x64
+		Release Static|x86 = Release Static|x86
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug Multithreaded|x64.Build.0 = Debug|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug Multithreaded|x86.ActiveCfg = Debug|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug Multithreaded|x86.Build.0 = Debug|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug Singlethreaded|x64.Build.0 = Debug|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug Singlethreaded|x86.ActiveCfg = Debug|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug Singlethreaded|x86.Build.0 = Debug|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug Static|x64.ActiveCfg = Debug|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug Static|x64.Build.0 = Debug|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug Static|x86.ActiveCfg = Debug|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug Static|x86.Build.0 = Debug|Win32
 		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug|x64.ActiveCfg = Debug|x64
 		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug|x64.Build.0 = Debug|x64
 		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug|x86.ActiveCfg = Debug|Win32
 		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Debug|x86.Build.0 = Debug|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.DLL-Import Debug|x86.ActiveCfg = Debug|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.DLL-Import Debug|x86.Build.0 = Debug|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.DLL-Import Release|x64.Build.0 = Release|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.DLL-Import Release|x86.ActiveCfg = Release|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.DLL-Import Release|x86.Build.0 = Release|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release Multithreaded|x64.ActiveCfg = Release|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release Multithreaded|x64.Build.0 = Release|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release Multithreaded|x86.ActiveCfg = Release|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release Multithreaded|x86.Build.0 = Release|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release Singlethreaded|x64.ActiveCfg = Release|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release Singlethreaded|x64.Build.0 = Release|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release Singlethreaded|x86.ActiveCfg = Release|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release Singlethreaded|x86.Build.0 = Release|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release Static|x64.ActiveCfg = Release|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release Static|x64.Build.0 = Release|x64
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release Static|x86.ActiveCfg = Release|Win32
+		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release Static|x86.Build.0 = Release|Win32
 		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release|x64.ActiveCfg = Release|x64
 		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release|x64.Build.0 = Release|x64
 		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release|x86.ActiveCfg = Release|Win32
 		{7DBC8195-1D94-4B34-863F-8F35CC59C231}.Release|x86.Build.0 = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug Multithreaded|x64.ActiveCfg = Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug Multithreaded|x64.Build.0 = Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug Multithreaded|x86.ActiveCfg = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug Multithreaded|x86.Build.0 = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug Singlethreaded|x64.ActiveCfg = Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug Singlethreaded|x64.Build.0 = Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug Singlethreaded|x86.ActiveCfg = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug Singlethreaded|x86.Build.0 = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug Static|x64.ActiveCfg = Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug Static|x64.Build.0 = Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug Static|x86.ActiveCfg = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug Static|x86.Build.0 = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.ActiveCfg = Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.Build.0 = Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x86.ActiveCfg = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x86.Build.0 = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|x86.ActiveCfg = DLL-Import Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|x86.Build.0 = DLL-Import Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|x86.ActiveCfg = DLL-Import Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|x86.Build.0 = DLL-Import Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release Multithreaded|x64.ActiveCfg = Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release Multithreaded|x64.Build.0 = Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release Multithreaded|x86.ActiveCfg = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release Multithreaded|x86.Build.0 = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release Singlethreaded|x64.ActiveCfg = Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release Singlethreaded|x64.Build.0 = Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release Singlethreaded|x86.ActiveCfg = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release Singlethreaded|x86.Build.0 = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release Static|x64.ActiveCfg = Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release Static|x64.Build.0 = Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release Static|x86.ActiveCfg = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release Static|x86.Build.0 = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.ActiveCfg = Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.Build.0 = Release|x64
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x86.ActiveCfg = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x86.Build.0 = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.ActiveCfg = Debug Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.Build.0 = Debug Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x86.ActiveCfg = Debug Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x86.Build.0 = Debug Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.ActiveCfg = Debug Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.Build.0 = Debug Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x86.ActiveCfg = Debug Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x86.Build.0 = Debug Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|x64.ActiveCfg = Debug Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|x64.Build.0 = Debug Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|x86.ActiveCfg = Debug Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Static|x86.Build.0 = Debug Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x86.ActiveCfg = Debug|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x86.Build.0 = Debug|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Debug|x64.Build.0 = Debug|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Debug|x86.ActiveCfg = Debug|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Debug|x86.Build.0 = Debug|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Release|x64.ActiveCfg = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Release|x64.Build.0 = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Release|x86.ActiveCfg = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Release|x86.Build.0 = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.ActiveCfg = Release Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.Build.0 = Release Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x86.ActiveCfg = Release Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x86.Build.0 = Release Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.ActiveCfg = Release Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.Build.0 = Release Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x86.ActiveCfg = Release Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x86.Build.0 = Release Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|x64.ActiveCfg = Release Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|x64.Build.0 = Release Static|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|x86.ActiveCfg = Release Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Static|x86.Build.0 = Release Static|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x86.ActiveCfg = Release|Win32
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/PdfWriter/PdfWriterLibTest/PdfWriterLibTest.vcxproj
+++ b/PdfWriter/PdfWriterLibTest/PdfWriterLibTest.vcxproj
@ -71,10 +71,12 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(IncludePath);D:\_Work\core-release-next\DesktopEditor\freetype-2.10.4\include;D:\_Work\core-release-next\DesktopEditor\freetype-2.10.4\include\freetype</IncludePath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <LinkIncremental>true</LinkIncremental>
    <LibraryPath>..\..\build\lib\win_64\DEBUG;$(LibraryPath)</LibraryPath>
+    <IncludePath>D:\_Work\core-release-next\DesktopEditor\freetype-2.10.4\include\freetype;D:\_Work\core-release-next\DesktopEditor\freetype-2.10.4\include;$(IncludePath)</IncludePath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
@ -90,6 +92,7 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <SDLCheck>true</SDLCheck>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    </ClCompile>
    <Link>
      <SubSystem>Console</SubSystem>
@ -104,7 +107,6 @@
      <Optimization>Disabled</Optimization>
      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;NOMINMAX;FT2_BUILD_LIBRARY;CRYPTOPP_DISABLE_ASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\DesktopEditor\freetype-2.5.2\include;..\..\DesktopEditor\agg-2.4\include;..\..\DesktopEditor\cximage\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DisableSpecificWarnings>4018;4005;4267;4146;4703</DisableSpecificWarnings>
    </ClCompile>
    <Link>
@ -182,44 +184,6 @@
    <ClInclude Include="targetver.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftbbox.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftgxval.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftlcdfil.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftmm.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftotval.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftpatent.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftpfr.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftsynth.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\fttype1.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftwinfnt.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftxf86.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\pcf\pcf.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\pfr\pfr.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\psaux\psaux.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\pshinter\pshinter.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\psnames\psmodule.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\raster\raster.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\sfnt\sfnt.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\truetype\truetype.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\type1\type1.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\cid\type1cid.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\type42\type42.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\winfonts\winfnt.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\autofit\autofit.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\bdf\bdf.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\cff\cff.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftbase.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftbitmap.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\cache\ftcache.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftfstype.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftgasp.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftglyph.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\gzip\ftgzip.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftinit.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\lzw\ftlzw.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftstroke.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftsystem.c" />
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\smooth\smooth.c" />
    <ClCompile Include="..\OnlineOfficeBinToPdf.cpp" />
    <ClCompile Include="..\PdfRenderer.cpp" />
    <ClCompile Include="..\Src\Annotation.cpp" />
@ -244,7 +208,14 @@
    <ClCompile Include="..\Src\Streams.cpp" />
    <ClCompile Include="..\Src\Utils.cpp" />
    <ClCompile Include="PdfWriterLibTest.cpp" />
-    <ClCompile Include="stdafx.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Common\3dParty\cryptopp\cryptlib.vcxproj">
+      <Project>{3423ec9a-52e4-4a4d-9753-edebc38785ef}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\DesktopEditor\freetype-2.10.4\builds\windows\vc2010\freetype.vcxproj">
+      <Project>{78b079bd-9fc7-4b9e-b4a6-96da0f00248b}</Project>
+    </ProjectReference>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/PdfWriter/PdfWriterLibTest/PdfWriterLibTest.vcxproj.filters
+++ b/PdfWriter/PdfWriterLibTest/PdfWriterLibTest.vcxproj.filters
@ -13,9 +13,6 @@
      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
    </Filter>
-    <Filter Include="FreeType">
-      <UniqueIdentifier>{21d59946-a4de-4629-bd36-fd186a3b2900}</UniqueIdentifier>
-    </Filter>
    <Filter Include="PdfWriterLib">
      <UniqueIdentifier>{850ba345-bd3e-4b71-ae5b-f14f4f265a1b}</UniqueIdentifier>
    </Filter>
@ -113,123 +110,6 @@
    <ClCompile Include="PdfWriterLibTest.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\autofit\autofit.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\bdf\bdf.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\cff\cff.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftbase.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftbbox.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftbitmap.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\cache\ftcache.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftfstype.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftgasp.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftglyph.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftgxval.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\gzip\ftgzip.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftinit.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftlcdfil.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\lzw\ftlzw.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftmm.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftotval.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftpatent.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftpfr.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftstroke.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftsynth.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftsystem.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\fttype1.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftwinfnt.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\base\ftxf86.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\pcf\pcf.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\pfr\pfr.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\psaux\psaux.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\pshinter\pshinter.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\psnames\psmodule.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\raster\raster.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\sfnt\sfnt.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\smooth\smooth.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\truetype\truetype.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\type1\type1.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\cid\type1cid.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\type42\type42.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\DesktopEditor\freetype-2.5.2\src\winfonts\winfnt.c">
-      <Filter>FreeType</Filter>
-    </ClCompile>
    <ClCompile Include="..\Src\Annotation.cpp">
      <Filter>PdfWriterLib</Filter>
    </ClCompile>
--- a/PdfWriter/PdfWriterLibTest/stdafx.h
+++ b/PdfWriter/PdfWriterLibTest/stdafx.h
@ -10,20 +10,29 @@
 #include <stdio.h>
 #include <tchar.h>

-#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
-
-#ifdef _DEBUG
-#pragma comment(lib, "CryptoPPLib.lib")
-#pragma comment(lib, "UnicodeConverter.lib")
-#pragma comment(lib, "graphics.lib")
-#pragma comment(lib, "kernel.lib")
-#pragma comment(lib, "Ws2_32.lib")
+#if defined(_WIN64)
+#if defined(_DEBUG)
+#pragma comment(lib, "../../build/lib/win_64/DEBUG/graphics.lib")
+#pragma comment(lib, "../../build/lib/win_64/DEBUG/kernel.lib")
+#pragma comment(lib, "../../build/lib/win_64/DEBUG/UnicodeConverter.lib")
 #else
-#pragma comment(lib, "../../build/lib/win_64/CryptoPPLib.lib")
-#pragma comment(lib, "../../build/lib/win_64/UnicodeConverter.lib")
 #pragma comment(lib, "../../build/lib/win_64/graphics.lib")
 #pragma comment(lib, "../../build/lib/win_64/kernel.lib")
-#pragma comment(lib, "Ws2_32.lib")
+#pragma comment(lib, "../../build/lib/win_64/UnicodeConverter.lib")
 #endif
+#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
+#elif defined (_WIN32)
+#if defined(_DEBUG)
+#pragma comment(lib, "../../build/lib/win_32/DEBUG/graphics.lib")
+#pragma comment(lib, "../../build/lib/win_32/DEBUG/kernel.lib")
+#pragma comment(lib, "../../build/lib/win_32/DEBUG/UnicodeConverter.lib")
+#else
+#pragma comment(lib, "../../build/lib/win_32/graphics.lib")
+#pragma comment(lib, "../../build/lib/win_32/kernel.lib")
+#pragma comment(lib, "../../build/lib/win_32/UnicodeConverter.lib")
+#endif
+#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
+#endif
+#pragma comment(lib, "Ws2_32.lib")

 // TODO: reference additional headers your program requires here
Author	SHA1	Message	Date
Elena Subbotina	c7c9199fd4	Merge pull request #579 from ONLYOFFICE/fix/v6.3.0-fix-bugs Fix/v6.3.0 fix bugs	2021-04-22 17:18:47 +03:00
Elena	18db1b9966	fix bug #49738	2021-04-22 17:13:49 +03:00
Elena	b1686a04ba	.	2021-04-22 16:17:16 +03:00
Elena	bdf2c213c0	fix bug #49730	2021-04-22 16:16:03 +03:00
Oleg Korshul	dcfe6a2362	Merge pull request #578 from ONLYOFFICE/fix/bug49713 Fix bug 49713	2021-04-20 13:16:43 +03:00
Kulikova Svetlana	baebe1da12	fix m_pKeywords	2021-04-20 13:15:49 +03:00
Kulikova Svetlana	c8733a6d6f	Fix bug 49713 also added support for keywords	2021-04-20 13:02:38 +03:00
Elena	ad5ed9f2e3	for bug #48778	2021-04-19 15:22:55 +03:00
Elena	bdda7e24dd	fix bug #47996	2021-04-14 12:14:05 +03:00