From 4c9e904d106e36f86183aa51f425b84d0a6a8c9a Mon Sep 17 00:00:00 2001 From: "Elena.Subbotina" Date: Wed, 8 Feb 2023 09:45:16 +0300 Subject: [PATCH] . --- .../DocFormatLib/Windows/DocFormatLib.vcxproj | 4 +- .../PPTFormatLib/Windows/PPTFormatLib.vcxproj | 303 +++++- .../Windows/PPTFormatLib.vcxproj.filters | 903 +++++++++++++++++ .../VbaFormatLib/Windows/VbaFormat.vcxproj | 1 + .../XlsFormatLib/Windows/XlsFormat.vcxproj | 4 +- .../Windows/XlsXlsxConverter.vcxproj | 4 +- .../BinaryFormatLib/BinaryFormatLib.vcxproj | 307 +----- .../BinaryFormatLib.vcxproj.filters | 918 +----------------- .../DocxFormatLib/DocxFormatLib.vcxproj | 4 +- .../Windows/PPTXFormatLib/PPTXFormat.vcxproj | 13 +- .../PPTXFormatLib/PPTXFormat.vcxproj.filters | 18 +- .../XlsbFormatLib/XlsbFormatLib.vcxproj | 9 +- .../Projects/Windows/Oox2OdfConverter.vcxproj | 14 - .../Windows/Win32/RtfFormatLib.vcxproj | 4 +- .../Windows/Win32/TxtXmlFormatLib.vcxproj | 4 +- 15 files changed, 1254 insertions(+), 1256 deletions(-) diff --git a/MsBinaryFile/Projects/DocFormatLib/Windows/DocFormatLib.vcxproj b/MsBinaryFile/Projects/DocFormatLib/Windows/DocFormatLib.vcxproj index a933e7f662..d95dca4547 100644 --- a/MsBinaryFile/Projects/DocFormatLib/Windows/DocFormatLib.vcxproj +++ b/MsBinaryFile/Projects/DocFormatLib/Windows/DocFormatLib.vcxproj @@ -67,8 +67,8 @@ <_ProjectFileVersion>14.0.23107.0 - $(Configuration)\DocFormat\ - $(Configuration)\DocFormat\ + $(Configuration)\ + $(Configuration)\ ..\..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) ..\..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) diff --git a/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj b/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj index 1460f9497d..384d75ff20 100644 --- a/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj +++ b/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj @@ -69,8 +69,8 @@ <_ProjectFileVersion>14.0.23107.0 - $(Configuration)\PPTFormat\ - $(Configuration)\PPTFormat\ + $(Configuration)\ + $(Configuration)\ ..\..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) ..\..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) @@ -234,6 +234,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -488,6 +638,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj.filters b/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj.filters index 646a618746..6fff818d37 100644 --- a/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj.filters +++ b/MsBinaryFile/Projects/PPTFormatLib/Windows/PPTFormatLib.vcxproj.filters @@ -31,6 +31,12 @@ {07ef31dd-8f40-4607-8b27-6104a24bc093} + + {351cd85f-4a78-46e6-9e66-9f894302175e} + + + {89f6a1ff-e7eb-47d9-845c-06f4ebb7c62b} + @@ -781,6 +787,456 @@ Reader + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw + + + ODraw + + + ODraw + + + ODraw + + + ODraw + + + ODraw + + + ODraw + + + ODraw + + + ODraw + @@ -1457,5 +1913,452 @@ OOXElements + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw\oldAutoShapes + + + ODraw + + + ODraw + + + ODraw + + + ODraw + + + ODraw + + + ODraw + + + ODraw + + + ODraw + \ No newline at end of file diff --git a/MsBinaryFile/Projects/VbaFormatLib/Windows/VbaFormat.vcxproj b/MsBinaryFile/Projects/VbaFormatLib/Windows/VbaFormat.vcxproj index 79703687e4..c147a30ecf 100644 --- a/MsBinaryFile/Projects/VbaFormatLib/Windows/VbaFormat.vcxproj +++ b/MsBinaryFile/Projects/VbaFormatLib/Windows/VbaFormat.vcxproj @@ -86,6 +86,7 @@ ..\..\..\..\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath); ..\..\..\..\Common\3dParty\boost\build\win_32\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 + $(Configuration)\ ..\..\..\Common\3dParty\boost\build\win_64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath); diff --git a/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsFormat.vcxproj b/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsFormat.vcxproj index 751c7bf614..30dcde0c80 100644 --- a/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsFormat.vcxproj +++ b/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsFormat.vcxproj @@ -1656,8 +1656,8 @@ <_ProjectFileVersion>14.0.23107.0 - $(Configuration)\XlsFormat\ - $(Configuration)\XlsFormat\ + $(Configuration)\ + $(Configuration)\ ..\..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) ..\..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) diff --git a/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj b/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj index 4f2d56a468..10f6dc21ce 100644 --- a/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj +++ b/MsBinaryFile/Projects/XlsFormatLib/Windows/XlsXlsxConverter.vcxproj @@ -414,8 +414,8 @@ <_ProjectFileVersion>14.0.23107.0 - $(Configuration)\XlsXlsxConvert\ - $(Configuration)\XlsXlsxConvert\ + $(Configuration)\Convert\ + $(Configuration)\Convert\ ..\..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) ..\..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) diff --git a/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj b/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj index b5fa24fa76..29bec53c54 100644 --- a/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj +++ b/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj @@ -19,156 +19,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -192,6 +42,7 @@ + @@ -201,157 +52,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -381,6 +81,7 @@ + @@ -445,8 +146,8 @@ ..\..\..\..\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath); ..\..\..\..\Common\3dParty\boost\build\win_32\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 - $(Configuration)\BinaryFormat\ - $(Configuration)\BinaryFormat\ + $(Configuration)\ + $(Configuration)\ diff --git a/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj.filters b/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj.filters index 07b421b119..7b303ae293 100644 --- a/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj.filters +++ b/OOXML/Projects/Windows/BinaryFormatLib/BinaryFormatLib.vcxproj.filters @@ -16,23 +16,14 @@ {b6409d43-86dc-4a80-9c85-487973eecfff} - - {ea17fe5e-7d71-4808-95b0-40eaf6f15ea4} - - - {eb4f16d3-cf7a-423a-ac35-fb7ff9f4ddcd} - {ee9f01b6-8750-426f-9c7e-76016233b4d7} {63082177-c204-4667-ba6f-ded707e17637} - - {8b47fd81-7fa6-4def-a182-bc9f1365fb2a} - - - {bd530a5f-0aad-40cb-b344-83534183090b} + + {02739917-e580-44c9-9b2c-8e80c7a2164d} @@ -126,455 +117,8 @@ Document\Writer - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\Xml + + Common @@ -692,458 +236,8 @@ MathEquation - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\ODraw\oldAutoShapes - - - Common\Xml + + Common \ No newline at end of file diff --git a/OOXML/Projects/Windows/DocxFormatLib/DocxFormatLib.vcxproj b/OOXML/Projects/Windows/DocxFormatLib/DocxFormatLib.vcxproj index fef061e877..b720d121f9 100644 --- a/OOXML/Projects/Windows/DocxFormatLib/DocxFormatLib.vcxproj +++ b/OOXML/Projects/Windows/DocxFormatLib/DocxFormatLib.vcxproj @@ -95,8 +95,8 @@ <_ProjectFileVersion>14.0.23107.0 - $(Configuration)\DocxFormat\ - $(Configuration)\DocxFormat\ + $(Configuration)\ + $(Configuration)\ ..\..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) ..\..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) diff --git a/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj b/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj index 37626f4a01..2e44b2b212 100644 --- a/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj +++ b/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj @@ -30,6 +30,7 @@ + @@ -429,7 +430,6 @@ - @@ -813,6 +813,7 @@ + @@ -1188,6 +1189,7 @@ + @@ -1200,7 +1202,6 @@ - @@ -1217,7 +1218,9 @@ - + + $(IntDir)\BevelTypeLimit.obj + @@ -1632,8 +1635,8 @@ <_ProjectFileVersion>14.0.23107.0 - $(Configuration)\PPTXFormat\ - $(Configuration)\PPTXFormat\ + $(Configuration)\ + $(Configuration)\ ..\..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) ..\..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) diff --git a/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj.filters b/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj.filters index c2e469cbed..32d64731ed 100644 --- a/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj.filters +++ b/OOXML/Projects/Windows/PPTXFormatLib/PPTXFormat.vcxproj.filters @@ -1120,9 +1120,6 @@ Binary - - Binary - Vml @@ -2320,6 +2317,9 @@ Common + + Common\Xml + @@ -3429,9 +3429,6 @@ Binary - - Binary - Vml @@ -4572,6 +4569,12 @@ Common + + Common\Xml + + + Vml\PptxShape + @@ -4643,5 +4646,8 @@ {b5bd29c4-aaa3-42c1-bcb4-7ef80a910b35} + + {1461f41f-a436-4c57-bb70-199577dca246} + \ No newline at end of file diff --git a/OOXML/Projects/Windows/XlsbFormatLib/XlsbFormatLib.vcxproj b/OOXML/Projects/Windows/XlsbFormatLib/XlsbFormatLib.vcxproj index b0c7ee296f..567e166388 100644 --- a/OOXML/Projects/Windows/XlsbFormatLib/XlsbFormatLib.vcxproj +++ b/OOXML/Projects/Windows/XlsbFormatLib/XlsbFormatLib.vcxproj @@ -2093,6 +2093,11 @@ + + + {a100103a-353e-45e8-a9b8-90b87cc5c0b0} + + {13E13907-49DA-482E-AD58-026D06A5CD11} Win32Proj @@ -2145,10 +2150,10 @@ - $(Configuration)\XlsbFormat\ + $(Configuration)\ ..\..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) ..\..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) - $(Configuration)\XlsbFormat\ + $(Configuration)\ ..\..\..\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath); diff --git a/OdfFile/Projects/Windows/Oox2OdfConverter.vcxproj b/OdfFile/Projects/Windows/Oox2OdfConverter.vcxproj index 3e20fb36d8..cfd9fe6bad 100644 --- a/OdfFile/Projects/Windows/Oox2OdfConverter.vcxproj +++ b/OdfFile/Projects/Windows/Oox2OdfConverter.vcxproj @@ -36,20 +36,6 @@ - - - {a100103a-353e-45e8-a9b8-90b87cc5c0b0} - - - {36636678-ae25-4be6-9a34-2561d1bcf302} - - - {609ed938-3ca8-4bed-b363-25096d4c4812} - - - {e5a67556-44da-4481-8f87-0a3aedbd20dd} - - {BEE01B53-244A-44E6-8947-ED9342D9247E} Oox2OdfConverter diff --git a/RtfFile/Projects/Windows/Win32/RtfFormatLib.vcxproj b/RtfFile/Projects/Windows/Win32/RtfFormatLib.vcxproj index 8b0b286031..f03b66ed3f 100644 --- a/RtfFile/Projects/Windows/Win32/RtfFormatLib.vcxproj +++ b/RtfFile/Projects/Windows/Win32/RtfFormatLib.vcxproj @@ -67,8 +67,8 @@ <_ProjectFileVersion>14.0.23107.0 - $(Configuration)\RTFFormat\ - $(Configuration)\RTFFormat\ + $(Configuration) + $(Configuration) ..\..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) ..\..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) diff --git a/TxtFile/Projects/Windows/Win32/TxtXmlFormatLib.vcxproj b/TxtFile/Projects/Windows/Win32/TxtXmlFormatLib.vcxproj index 23842b46a4..a0d51fe475 100644 --- a/TxtFile/Projects/Windows/Win32/TxtXmlFormatLib.vcxproj +++ b/TxtFile/Projects/Windows/Win32/TxtXmlFormatLib.vcxproj @@ -68,8 +68,8 @@ <_ProjectFileVersion>14.0.23107.0 - $(Configuration)\TXTFormat\ - $(Configuration)\TXTFormat\ + $(Configuration)\ + $(Configuration)\ ..\..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) ..\..\..\..\Common\3dParty\boost\build\win_32\ib;$(LibraryPath)