From 5d524369b8094ff89a1a62c074ab3f13514429ef Mon Sep 17 00:00:00 2001 From: ElenaSubbotina Date: Thu, 14 Dec 2017 19:31:33 +0300 Subject: [PATCH] . --- .../DocFormatLib/Win32/DocFormatLib.vcproj | 2 +- ASCOfficeDocxFile2/BinReader/Readers.h | 33 ++++++++++++++----- ASCOfficeDocxFile2/BinWriter/BinWriters.h | 9 ++--- ASCOfficeOdfFile/win32/cpcommon.vcproj | 2 +- ASCOfficeOdfFile/win32/cpodf.vcproj | 2 +- ASCOfficeOdfFile/win32/cpxml.vcproj | 2 +- ASCOfficeOdfFile/win32/formulasconvert.vcproj | 2 +- .../source/win32/OdfFormat.vcproj | 2 +- .../source/win32/Oox2OdfConverter.vcproj | 4 +-- .../PPTFormatLib/Win32/PPTFormatLib.vcproj | 10 +++++- .../ASCOfficeDrawingConverter.cpp | 13 ++++++-- ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj | 2 +- .../RtfFormatLib/Win32/RtfFormatLib.vcproj | 2 +- .../Win32/TxtXmlFormatLib.vcproj | 2 +- .../source/win32/XlsFormat.vcproj | 2 +- .../source/win32/XlsXlsxConverter.vcproj | 2 +- Common/3dParty/cryptopp/cryptlib.vcproj | 2 +- .../DocxFormat/Projects/DocxFormat2005.vcproj | 2 +- .../cximage/CxImage/cximage_vs2005.vcproj | 2 +- .../cximage/jasper/jasper_vs2005.vcproj | 2 +- DesktopEditor/cximage/jpeg/Jpeg_vs2005.vcproj | 2 +- .../cximage/libpsd/libpsd_vs2005.vcproj | 2 +- DesktopEditor/cximage/mng/mng_vs2005.vcproj | 2 +- DesktopEditor/cximage/png/png_vs2005.vcproj | 2 +- .../cximage/raw/libdcr_vs2005.vcproj | 2 +- DesktopEditor/cximage/tiff/Tiff_vs2005.vcproj | 2 +- .../fontengine/font_engine_vs2005.vcproj | 2 +- .../builds/windows/vc2005/freetype.vcproj | 2 +- DesktopEditor/graphics/graphics_vs2005.vcproj | 2 +- DesktopEditor/raster/JBig2/win32/jbig2.vcproj | 2 +- DesktopEditor/raster/raster_vs2005.vcproj | 2 +- .../win32/ECMACryptReader.vcproj | 2 +- OfficeUtils/win32/OfficeUtilsLib.vcproj | 2 +- X2tConverter/test/win32Test/X2tTest.vcproj | 3 +- 34 files changed, 80 insertions(+), 48 deletions(-) diff --git a/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj b/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj index 54fb633d85..af0c526908 100644 --- a/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj +++ b/ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" diff --git a/ASCOfficeDocxFile2/BinReader/Readers.h b/ASCOfficeDocxFile2/BinReader/Readers.h index 97a941a682..963e93a0b3 100644 --- a/ASCOfficeDocxFile2/BinReader/Readers.h +++ b/ASCOfficeDocxFile2/BinReader/Readers.h @@ -61,6 +61,13 @@ enum ETblStyleOverrideType tblstyleoverridetypeSwCell = 11, tblstyleoverridetypeWholeTable = 12 }; + +struct RowHeight +{ + unsigned char HRule = 0; + long nHeight = 0; +}; + class SdtWraper { public: @@ -2111,7 +2118,17 @@ public: } else if( c_oSerProp_rowPrType::Height == type ) { - res = Read2(length, &Binary_tblPrReader::ReadHeight, this, poResult); + RowHeight val; + res = Read2(length, &Binary_tblPrReader::ReadHeight, this, &val); + + pCStringWriter->WriteString(L"WriteString(L" w:hRule=\"auto\""); break; + case 2: pCStringWriter->WriteString(L" w:hRule=\"exact\""); break; + } + pCStringWriter->WriteString(L"/>"); } else if( c_oSerProp_rowPrType::TableHeader == type ) { @@ -2180,17 +2197,17 @@ public: int ReadHeight(BYTE type, long length, void* poResult) { int res = c_oSerConstants::ReadOk; - XmlUtils::CStringWriter* pCStringWriter = static_cast(poResult); - /*if( c_oSerProp_rowPrType::Height_Rule == type ) + + RowHeight* pHeight = static_cast(poResult); + + if( c_oSerProp_rowPrType::Height_Rule == type ) { - Height.HRule = this.stream.GetUChar(); + pHeight->HRule = m_oBufferedStream.GetUChar(); } - else */if( c_oSerProp_rowPrType::Height_Value == type ) + else if( c_oSerProp_rowPrType::Height_Value == type ) { double dHeight = m_oBufferedStream.GetDouble(); - long nHeight = SerializeCommon::Round( g_dKoef_mm_to_twips * dHeight); - - pCStringWriter->WriteString(L""); + pHeight->nHeight = SerializeCommon::Round( g_dKoef_mm_to_twips * dHeight); } else res = c_oSerConstants::ReadUnknown; diff --git a/ASCOfficeDocxFile2/BinWriter/BinWriters.h b/ASCOfficeDocxFile2/BinWriter/BinWriters.h index 6c0ea61fe1..038e084d9d 100644 --- a/ASCOfficeDocxFile2/BinWriter/BinWriters.h +++ b/ASCOfficeDocxFile2/BinWriter/BinWriters.h @@ -2104,14 +2104,11 @@ namespace BinDocxRW SimpleTypes::EHeightRule eHRule = SimpleTypes::heightruleAtLeast; if(rowHeight.m_oHRule.IsInit()) eHRule = rowHeight.m_oHRule->GetValue(); + m_oBcw.m_oStream.WriteBYTE(c_oSerProp_rowPrType::Height_Rule); m_oBcw.m_oStream.WriteBYTE(c_oSerPropLenType::Byte); - switch(eHRule) - { - case SimpleTypes::heightruleAtLeast : - case SimpleTypes::heightruleExact :m_oBcw.m_oStream.WriteBYTE(heightrule_AtLeast);break; - default :m_oBcw.m_oStream.WriteBYTE(heightrule_Auto);break; - } + m_oBcw.m_oStream.WriteBYTE(eHRule); + //Value m_oBcw.m_oStream.WriteBYTE(c_oSerProp_rowPrType::Height_Value); diff --git a/ASCOfficeOdfFile/win32/cpcommon.vcproj b/ASCOfficeOdfFile/win32/cpcommon.vcproj index 8d9baf0a8e..33e39e5289 100644 --- a/ASCOfficeOdfFile/win32/cpcommon.vcproj +++ b/ASCOfficeOdfFile/win32/cpcommon.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderThrough="" WarningLevel="3" diff --git a/ASCOfficeOdfFile/win32/cpodf.vcproj b/ASCOfficeOdfFile/win32/cpodf.vcproj index c88b892877..4fecf5a676 100644 --- a/ASCOfficeOdfFile/win32/cpodf.vcproj +++ b/ASCOfficeOdfFile/win32/cpodf.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderThrough="" WarningLevel="3" diff --git a/ASCOfficeOdfFile/win32/cpxml.vcproj b/ASCOfficeOdfFile/win32/cpxml.vcproj index 5072b9abba..9f7156b030 100644 --- a/ASCOfficeOdfFile/win32/cpxml.vcproj +++ b/ASCOfficeOdfFile/win32/cpxml.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderThrough="" WarningLevel="3" diff --git a/ASCOfficeOdfFile/win32/formulasconvert.vcproj b/ASCOfficeOdfFile/win32/formulasconvert.vcproj index 5aa97ecd05..4d91850067 100644 --- a/ASCOfficeOdfFile/win32/formulasconvert.vcproj +++ b/ASCOfficeOdfFile/win32/formulasconvert.vcproj @@ -45,7 +45,7 @@ AdditionalIncludeDirectories="" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" WarningLevel="3" Detect64BitPortabilityProblems="true" DebugInformationFormat="4" diff --git a/ASCOfficeOdfFileW/source/win32/OdfFormat.vcproj b/ASCOfficeOdfFileW/source/win32/OdfFormat.vcproj index 46abe9a87b..a80e7f85bc 100644 --- a/ASCOfficeOdfFileW/source/win32/OdfFormat.vcproj +++ b/ASCOfficeOdfFileW/source/win32/OdfFormat.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="_DEBUG;_LIB;DONT_WRITE_EMBEDDED_FONTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" PrecompiledHeaderThrough="" WarningLevel="3" diff --git a/ASCOfficeOdfFileW/source/win32/Oox2OdfConverter.vcproj b/ASCOfficeOdfFileW/source/win32/Oox2OdfConverter.vcproj index ac6a554621..4ec5be70db 100644 --- a/ASCOfficeOdfFileW/source/win32/Oox2OdfConverter.vcproj +++ b/ASCOfficeOdfFileW/source/win32/Oox2OdfConverter.vcproj @@ -1,7 +1,7 @@ + + + diff --git a/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp b/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp index f4d9ae4b44..53b52976a5 100644 --- a/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp +++ b/ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp @@ -3247,14 +3247,23 @@ std::wstring CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, P oWriter.WriteAttribute(L"distR", margR); oWriter.EndAttributes(); - oWriter.StartNode(L"wp:extent"); + oWriter.StartNode(L"wp:extent"); oWriter.StartAttributes(); oWriter.WriteAttribute(L"cx", width); oWriter.WriteAttribute(L"cy", height); oWriter.EndAttributes(); oWriter.EndNode(L"wp:extent"); - std::wstring strId = L""; + oWriter.StartNode(L"wp:effectExtent"); + oWriter.StartAttributes(); + oWriter.WriteAttribute(L"l", 0); + oWriter.WriteAttribute(L"t", 0); + oWriter.WriteAttribute(L"r", 0); + oWriter.WriteAttribute(L"b", 0); + oWriter.EndAttributes(); + oWriter.EndNode(L"wp:effectExtent"); + + std::wstring strId = L""; m_lNextId++; oWriter.WriteString(strId); diff --git a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj index d046a493f4..d6555c6ba0 100644 --- a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj +++ b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj @@ -48,7 +48,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" diff --git a/ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcproj b/ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcproj index 8b4afb877e..7910a69292 100644 --- a/ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcproj +++ b/ASCOfficeRtfFile/RtfFormatLib/Win32/RtfFormatLib.vcproj @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" diff --git a/ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcproj b/ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcproj index ef29554bd2..c9af14818b 100644 --- a/ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcproj +++ b/ASCOfficeTxtFile/TxtXmlFormatLib/Win32/TxtXmlFormatLib.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;DONT_WRITE_EMBEDDED_FONTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" diff --git a/ASCOfficeXlsFile2/source/win32/XlsFormat.vcproj b/ASCOfficeXlsFile2/source/win32/XlsFormat.vcproj index c46dd282e6..dbcb61a65a 100644 --- a/ASCOfficeXlsFile2/source/win32/XlsFormat.vcproj +++ b/ASCOfficeXlsFile2/source/win32/XlsFormat.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;DONT_WRITE_EMBEDDED_FONTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="false" diff --git a/ASCOfficeXlsFile2/source/win32/XlsXlsxConverter.vcproj b/ASCOfficeXlsFile2/source/win32/XlsXlsxConverter.vcproj index 43688616ef..c0250f9190 100644 --- a/ASCOfficeXlsFile2/source/win32/XlsXlsxConverter.vcproj +++ b/ASCOfficeXlsFile2/source/win32/XlsXlsxConverter.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;DONT_WRITE_EMBEDDED_FONTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="false" diff --git a/Common/3dParty/cryptopp/cryptlib.vcproj b/Common/3dParty/cryptopp/cryptlib.vcproj index 5787071efd..9feafbbb08 100644 --- a/Common/3dParty/cryptopp/cryptlib.vcproj +++ b/Common/3dParty/cryptopp/cryptlib.vcproj @@ -335,7 +335,7 @@ Optimization="0" EnableIntrinsicFunctions="true" PreprocessorDefinitions="_DEBUG;_WINDOWS;USE_PRECOMPILED_HEADERS;WIN32" - RuntimeLibrary="3" + RuntimeLibrary="1" EnableEnhancedInstructionSet="1" UsePrecompiledHeader="2" PrecompiledHeaderThrough="pch.h" diff --git a/Common/DocxFormat/Projects/DocxFormat2005.vcproj b/Common/DocxFormat/Projects/DocxFormat2005.vcproj index 5e5fad3253..a7225228ff 100644 --- a/Common/DocxFormat/Projects/DocxFormat2005.vcproj +++ b/Common/DocxFormat/Projects/DocxFormat2005.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;DONT_WRITE_EMBEDDED_FONTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" ProgramDataBaseFileName="$(IntDir)\DocxFormat.pdb" WarningLevel="3" DebugInformationFormat="4" diff --git a/DesktopEditor/cximage/CxImage/cximage_vs2005.vcproj b/DesktopEditor/cximage/CxImage/cximage_vs2005.vcproj index 0cec5eb4cc..c3edbe4983 100644 --- a/DesktopEditor/cximage/CxImage/cximage_vs2005.vcproj +++ b/DesktopEditor/cximage/CxImage/cximage_vs2005.vcproj @@ -501,7 +501,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;JAS_WIN_MSVC_BUILD;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" PrecompiledHeaderFile="" AssemblerListingLocation="$(ConfigurationName)\" ObjectFile="$(IntDir)\" diff --git a/DesktopEditor/cximage/jasper/jasper_vs2005.vcproj b/DesktopEditor/cximage/jasper/jasper_vs2005.vcproj index 857a1b2a6f..43266942c8 100644 --- a/DesktopEditor/cximage/jasper/jasper_vs2005.vcproj +++ b/DesktopEditor/cximage/jasper/jasper_vs2005.vcproj @@ -49,7 +49,7 @@ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;JAS_WIN_MSVC_BUILD;_CRT_SECURE_NO_DEPRECATE;EXCLUDE_JPG_SUPPORT" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" PrecompiledHeaderFile="" AssemblerListingLocation="$(ConfigurationName)\" ObjectFile="$(IntDir)\" diff --git a/DesktopEditor/cximage/jpeg/Jpeg_vs2005.vcproj b/DesktopEditor/cximage/jpeg/Jpeg_vs2005.vcproj index 138c52c081..6b3ca838b9 100644 --- a/DesktopEditor/cximage/jpeg/Jpeg_vs2005.vcproj +++ b/DesktopEditor/cximage/jpeg/Jpeg_vs2005.vcproj @@ -338,7 +338,7 @@ Optimization="0" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" PrecompiledHeaderFile="" AssemblerListingLocation="$(ConfigurationName)\" ObjectFile="$(IntDir)\" diff --git a/DesktopEditor/cximage/libpsd/libpsd_vs2005.vcproj b/DesktopEditor/cximage/libpsd/libpsd_vs2005.vcproj index 458d760497..34c5bb1932 100644 --- a/DesktopEditor/cximage/libpsd/libpsd_vs2005.vcproj +++ b/DesktopEditor/cximage/libpsd/libpsd_vs2005.vcproj @@ -344,7 +344,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" PrecompiledHeaderFile="" AssemblerListingLocation="$(ConfigurationName)\" ObjectFile="$(IntDir)\" diff --git a/DesktopEditor/cximage/mng/mng_vs2005.vcproj b/DesktopEditor/cximage/mng/mng_vs2005.vcproj index ac7279faad..14b42839a2 100644 --- a/DesktopEditor/cximage/mng/mng_vs2005.vcproj +++ b/DesktopEditor/cximage/mng/mng_vs2005.vcproj @@ -49,7 +49,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;MNG_SUPPORT_DISPLAY;MNG_SUPPORT_READ;MNG_SUPPORT_WRITE;MNG_ACCESS_CHUNKS;MNG_STORE_CHUNKS;_CRT_SECURE_NO_DEPRECATE;MNG_ERROR_TELLTALE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" PrecompiledHeaderFile="" AssemblerListingLocation="$(IntDir)\" ObjectFile="$(IntDir)\" diff --git a/DesktopEditor/cximage/png/png_vs2005.vcproj b/DesktopEditor/cximage/png/png_vs2005.vcproj index 46dae4dd73..95d295cfbc 100644 --- a/DesktopEditor/cximage/png/png_vs2005.vcproj +++ b/DesktopEditor/cximage/png/png_vs2005.vcproj @@ -49,7 +49,7 @@ AdditionalIncludeDirectories="..\zlib" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" PrecompiledHeaderFile="" AssemblerListingLocation="$(ConfigurationName)\" ObjectFile="$(IntDir)\" diff --git a/DesktopEditor/cximage/raw/libdcr_vs2005.vcproj b/DesktopEditor/cximage/raw/libdcr_vs2005.vcproj index e5c077a3ed..e4ddd71250 100644 --- a/DesktopEditor/cximage/raw/libdcr_vs2005.vcproj +++ b/DesktopEditor/cximage/raw/libdcr_vs2005.vcproj @@ -195,7 +195,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" PrecompiledHeaderFile="" AssemblerListingLocation="$(ConfigurationName)\" ObjectFile="$(IntDir)\" diff --git a/DesktopEditor/cximage/tiff/Tiff_vs2005.vcproj b/DesktopEditor/cximage/tiff/Tiff_vs2005.vcproj index d2915ef785..7decc81e0e 100644 --- a/DesktopEditor/cximage/tiff/Tiff_vs2005.vcproj +++ b/DesktopEditor/cximage/tiff/Tiff_vs2005.vcproj @@ -50,7 +50,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" PrecompiledHeaderFile="" AssemblerListingLocation="$(ConfigurationName)\" ObjectFile="$(IntDir)\" diff --git a/DesktopEditor/fontengine/font_engine_vs2005.vcproj b/DesktopEditor/fontengine/font_engine_vs2005.vcproj index 984105a3ff..94a6b3019a 100644 --- a/DesktopEditor/fontengine/font_engine_vs2005.vcproj +++ b/DesktopEditor/fontengine/font_engine_vs2005.vcproj @@ -198,7 +198,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" PrecompiledHeaderFile="" AssemblerListingLocation="$(ConfigurationName)\" ObjectFile="$(IntDir)\" diff --git a/DesktopEditor/freetype-2.5.2/builds/windows/vc2005/freetype.vcproj b/DesktopEditor/freetype-2.5.2/builds/windows/vc2005/freetype.vcproj index ab8764e56d..2b8f686575 100644 --- a/DesktopEditor/freetype-2.5.2/builds/windows/vc2005/freetype.vcproj +++ b/DesktopEditor/freetype-2.5.2/builds/windows/vc2005/freetype.vcproj @@ -500,7 +500,7 @@ AdditionalIncludeDirectories="..\..\..\include" PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" DisableLanguageExtensions="true" PrecompiledHeaderFile="" AssemblerListingLocation="$(ConfigurationName)/" diff --git a/DesktopEditor/graphics/graphics_vs2005.vcproj b/DesktopEditor/graphics/graphics_vs2005.vcproj index 1362e74f48..34185eddaf 100644 --- a/DesktopEditor/graphics/graphics_vs2005.vcproj +++ b/DesktopEditor/graphics/graphics_vs2005.vcproj @@ -214,7 +214,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;$(NOINHERIT)" MinimalRebuild="false" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" StructMemberAlignment="0" DisableLanguageExtensions="false" PrecompiledHeaderFile="" diff --git a/DesktopEditor/raster/JBig2/win32/jbig2.vcproj b/DesktopEditor/raster/JBig2/win32/jbig2.vcproj index 22f7a4a8e2..af42b6fce5 100644 --- a/DesktopEditor/raster/JBig2/win32/jbig2.vcproj +++ b/DesktopEditor/raster/JBig2/win32/jbig2.vcproj @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" ObjectFile="$(IntDir)\" ProgramDataBaseFileName="$(IntDir)\vc80.pdb" diff --git a/DesktopEditor/raster/raster_vs2005.vcproj b/DesktopEditor/raster/raster_vs2005.vcproj index a95987b8a3..9d71c243c6 100644 --- a/DesktopEditor/raster/raster_vs2005.vcproj +++ b/DesktopEditor/raster/raster_vs2005.vcproj @@ -495,7 +495,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;$(NOINHERIT)" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" PrecompiledHeaderFile="" AssemblerListingLocation="$(ConfigurationName)\" ObjectFile="$(IntDir)\" diff --git a/OfficeCryptReader/win32/ECMACryptReader.vcproj b/OfficeCryptReader/win32/ECMACryptReader.vcproj index 80cb433c0f..29b1b4d732 100644 --- a/OfficeCryptReader/win32/ECMACryptReader.vcproj +++ b/OfficeCryptReader/win32/ECMACryptReader.vcproj @@ -46,7 +46,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" diff --git a/OfficeUtils/win32/OfficeUtilsLib.vcproj b/OfficeUtils/win32/OfficeUtilsLib.vcproj index 186483f2c5..bb5df7fef8 100644 --- a/OfficeUtils/win32/OfficeUtilsLib.vcproj +++ b/OfficeUtils/win32/OfficeUtilsLib.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_LIB" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" diff --git a/X2tConverter/test/win32Test/X2tTest.vcproj b/X2tConverter/test/win32Test/X2tTest.vcproj index 90b471fd59..9b4c7e6597 100644 --- a/X2tConverter/test/win32Test/X2tTest.vcproj +++ b/X2tConverter/test/win32Test/X2tTest.vcproj @@ -47,7 +47,7 @@ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;FILE_FORMAT_CHECKER_WITH_MACRO;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;DONT_WRITE_EMBEDDED_FONTS" MinimalRebuild="true" BasicRuntimeChecks="3" - RuntimeLibrary="3" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="true" @@ -336,6 +336,7 @@ >