diff --git a/OdfFile/Projects/Linux/OdfFormatLib.pro b/OdfFile/Projects/Linux/OdfFormatLib.pro index c3ee3faf09..13e305a43d 100644 --- a/OdfFile/Projects/Linux/OdfFormatLib.pro +++ b/OdfFile/Projects/Linux/OdfFormatLib.pro @@ -23,7 +23,6 @@ DEFINES += UNICODE \ _UNICODE \ DONT_WRITE_EMBEDDED_FONTS -INCLUDEPATH += ../../DataTypes INCLUDEPATH += ../../Common CONFIG(debug, debug|release){ diff --git a/OdfFile/Projects/Windows/OdfFileTest/OdfFileTest.vcxproj b/OdfFile/Projects/Windows/OdfFileTest/OdfFileTest.vcxproj index 5bf9e8d760..4675226e14 100644 --- a/OdfFile/Projects/Windows/OdfFileTest/OdfFileTest.vcxproj +++ b/OdfFile/Projects/Windows/OdfFileTest/OdfFileTest.vcxproj @@ -70,8 +70,8 @@ $(Configuration)\ $(Configuration)\ true - ../../Common\3dParty\boost\build\win_32\include;$(IncludePath) - ../../Common\3dParty\boost\build\win_32\lib;$(LibraryPath) + ../../../Common\3dParty\boost\build\win_32\include;../../Common;$(IncludePath) + ../../../Common\3dParty\boost\build\win_32\lib;$(LibraryPath) $(Platform)\$(Configuration)\ @@ -168,20 +168,25 @@ - - - - - - - - - + + + {609ed938-3ca8-4bed-b363-25096d4c4812} + + + {50e20601-4a8d-4afb-8870-63828d328429} + + + {41bed424-4eaf-4053-8a5f-1e2a387d53d1} + + + {94954a67-a853-43b1-a727-6ef2774c5a6a} + + diff --git a/OdfFile/Projects/Windows/OdfFileTest/OdfFileTest.vcxproj.filters b/OdfFile/Projects/Windows/OdfFileTest/OdfFileTest.vcxproj.filters index 960876b00b..cfbb75a92a 100644 --- a/OdfFile/Projects/Windows/OdfFileTest/OdfFileTest.vcxproj.filters +++ b/OdfFile/Projects/Windows/OdfFileTest/OdfFileTest.vcxproj.filters @@ -1,28 +1,6 @@  - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common - - - - - Common - - - Common - - - Common - - - Common - + \ No newline at end of file diff --git a/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.cpp b/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.cpp index 803711ad5b..73bf078f7b 100644 --- a/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.cpp +++ b/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.cpp @@ -32,33 +32,33 @@ // ASCOfficeOdfFileWTest.cpp : Defines the entry point for the console application. // -#include "../../Common/OfficeFileFormatChecker.h" -#include "../../OfficeUtils/src/OfficeUtils.h" +#include "../../../../Common/OfficeFileFormatChecker.h" +#include "../../../../OfficeUtils/src/OfficeUtils.h" #include #include -#include "../../Common/DocxFormat/Source/Base/Base.h" -#include "../../DesktopEditor/common/Directory.h" +#include "../../../../OOXML/Base/Base.h" +#include "../../../../DesktopEditor/common/Directory.h" -#include "../source/Oox2OdfConverter/Oox2OdfConverter.h" +#include "../../../Writer/Converter/Oox2OdfConverter.h" #if defined(_WIN64) - #pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib") + #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/kernel_network") - #pragma comment(lib, "../../build/lib/win_32/DEBUG/UnicodeConverter.lib") + #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/kernel_network") + #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/kernel_network") - #pragma comment(lib, "../../build/lib/win_32/UnicodeConverter.lib") + #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/kernel_network") + #pragma comment(lib, "../../../../build/lib/win_32/UnicodeConverter.lib") #endif - #pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib") + #pragma comment(lib, "../../../../build/bin/icu/win_32/icuuc.lib") #endif HRESULT convert_single(std::wstring srcFileName) diff --git a/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.sln b/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.sln index 92fa2457b2..935857b664 100644 --- a/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.sln +++ b/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.sln @@ -3,48 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormatWriterLib", "..\source\win32\OdfFormat.vcxproj", "{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}" - ProjectSection(ProjectDependencies) = postProject - {609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812} - {94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Oox2OdfConverter", "..\source\win32\Oox2OdfConverter.vcxproj", "{BEE01B53-244A-44E6-8947-ED9342D9247E}" - ProjectSection(ProjectDependencies) = postProject - {609ED938-3CA8-4BED-B363-25096D4C4812} = {609ED938-3CA8-4BED-B363-25096D4C4812} - {A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0} - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD} = {E5A67556-44DA-4481-8F87-0A3AEDBD20DD} - {94954A67-A853-43B1-A727-6EF2774C5A6A} = {94954A67-A853-43B1-A727-6EF2774C5A6A} - {36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302} - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFileWriterTest", "OdfFileWTest.vcxproj", "{FBA8446A-150F-4A10-B4DA-1022048D6473}" - ProjectSection(ProjectDependencies) = postProject - {A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0} - EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormulasConvert", "..\..\ASCOfficeOdfFile\win32\formulasconvert.vcxproj", "{94954A67-A853-43B1-A727-6EF2774C5A6A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfCommon", "..\cpcommon.vcxproj", "{609ED938-3CA8-4BED-B363-25096D4C4812}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfCommon", "..\..\ASCOfficeOdfFile\win32\cpcommon.vcxproj", "{609ED938-3CA8-4BED-B363-25096D4C4812}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormatWriterLib", "..\OdfFormatW.vcxproj", "{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTXFormatLib", "..\..\ASCOfficePPTXFile\PPTXLib\PPTXFormat.vcxproj", "{36636678-AE25-4BE6-9A34-2561D1BCF302}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Oox2OdfConverter", "..\Oox2OdfConverter.vcxproj", "{BEE01B53-244A-44E6-8947-ED9342D9247E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeFileCrypt", "..\..\OfficeCryptReader\win32\ECMACryptReader.vcxproj", "{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}" - ProjectSection(ProjectDependencies) = postProject - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF} - EndProjectSection -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}") = "DocxFormatLib", "..\..\Common\DocxFormat\Projects\DocxFormatLib.vcxproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}" - ProjectSection(ProjectDependencies) = postProject - {36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XlsbFormatLib", "..\..\Common\DocxFormat\Projects\XlsbFormatLib.vcxproj", "{13E13907-49DA-482E-AD58-026D06A5CD11}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XlsFormatLib", "..\..\ASCOfficeXlsFile2\source\win32\XlsFormat.vcxproj", "{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormulasConvert", "..\formulasconvert.vcxproj", "{94954A67-A853-43B1-A727-6EF2774C5A6A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -60,6 +27,46 @@ Global ReleaseOpenSource|x64 = ReleaseOpenSource|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FBA8446A-150F-4A10-B4DA-1022048D6473}.Debug|Win32.ActiveCfg = Debug|Win32 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.Debug|Win32.Build.0 = Debug|Win32 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.Debug|x64.ActiveCfg = Debug|x64 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.Debug|x64.Build.0 = Debug|x64 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Debug|x64.Build.0 = Debug|x64 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Release|Win32.Build.0 = Release|Win32 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Release|x64.ActiveCfg = Release|x64 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Release|x64.Build.0 = Release|x64 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.Release|Win32.ActiveCfg = Release|Win32 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.Release|Win32.Build.0 = Release|Win32 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.Release|x64.ActiveCfg = Release|x64 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.Release|x64.Build.0 = Release|x64 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 + {FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseOpenSource|x64.Build.0 = Release|x64 + {609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.ActiveCfg = Debug|Win32 + {609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.Build.0 = Debug|Win32 + {609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.ActiveCfg = Debug|x64 + {609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.Build.0 = Debug|x64 + {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 + {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 + {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 + {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|x64.Build.0 = Debug|x64 + {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 + {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|Win32.Build.0 = Release|Win32 + {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|x64.ActiveCfg = Release|x64 + {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|x64.Build.0 = Release|x64 + {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|Win32.ActiveCfg = Release|Win32 + {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|Win32.Build.0 = Release|Win32 + {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|x64.ActiveCfg = Release|x64 + {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|x64.Build.0 = Release|x64 + {609ED938-3CA8-4BED-B363-25096D4C4812}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 + {609ED938-3CA8-4BED-B363-25096D4C4812}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 + {609ED938-3CA8-4BED-B363-25096D4C4812}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 + {609ED938-3CA8-4BED-B363-25096D4C4812}.ReleaseOpenSource|x64.Build.0 = Release|x64 {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Debug|Win32.ActiveCfg = Debug|Win32 {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Debug|Win32.Build.0 = Debug|Win32 {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Debug|x64.ActiveCfg = Debug|x64 @@ -100,26 +107,6 @@ Global {BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 {BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 {BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.Debug|Win32.ActiveCfg = Debug|Win32 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.Debug|Win32.Build.0 = Debug|Win32 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.Debug|x64.ActiveCfg = Debug|x64 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.Debug|x64.Build.0 = Debug|x64 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.DLL-Import Release|x64.Build.0 = Release|x64 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.Release|Win32.ActiveCfg = Release|Win32 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.Release|Win32.Build.0 = Release|Win32 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.Release|x64.ActiveCfg = Release|x64 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.Release|x64.Build.0 = Release|x64 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {FBA8446A-150F-4A10-B4DA-1022048D6473}.ReleaseOpenSource|x64.Build.0 = Release|x64 {94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.ActiveCfg = Debug|Win32 {94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.Build.0 = Debug|Win32 {94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|x64.ActiveCfg = Debug|x64 @@ -140,146 +127,6 @@ Global {94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 {94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 {94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.ActiveCfg = Debug|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.Build.0 = Debug|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.ActiveCfg = Debug|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.Build.0 = Debug|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|x64.Build.0 = Release|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|Win32.ActiveCfg = Release|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|Win32.Build.0 = Release|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|x64.ActiveCfg = Release|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|x64.Build.0 = Release|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.ActiveCfg = Debug|Win32 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.Build.0 = Debug|Win32 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|x64.ActiveCfg = Debug|x64 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|x64.Build.0 = Debug|x64 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.DLL-Import Release|x64.Build.0 = Release|x64 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.ActiveCfg = Release|Win32 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.Build.0 = Release|Win32 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.ActiveCfg = Release|x64 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.Build.0 = Release|x64 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Debug|Win32.ActiveCfg = Debug|Win32 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Debug|Win32.Build.0 = Debug|Win32 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Debug|x64.ActiveCfg = Debug|x64 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Debug|x64.Build.0 = Debug|x64 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.DLL-Import Release|x64.Build.0 = Release|x64 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Release|Win32.ActiveCfg = Release|Win32 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Release|Win32.Build.0 = Release|Win32 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Release|x64.ActiveCfg = Release|x64 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Release|x64.Build.0 = Release|x64 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.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}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|Win32.Build.0 = DLL-Import 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 Release|Win32.ActiveCfg = DLL-Import Release|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|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}.Release|Win32.ActiveCfg = Release|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.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}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.ActiveCfg = Debug|Win32 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.Build.0 = Debug|Win32 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.ActiveCfg = Debug|x64 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.Build.0 = Debug|x64 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.DLL-Import Release|x64.Build.0 = Release|x64 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.ActiveCfg = Release|Win32 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.Build.0 = Release|Win32 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.ActiveCfg = Release|x64 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.Build.0 = Release|x64 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|Win32.ActiveCfg = ReleaseOpenSource|Win32 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|Win32.Build.0 = ReleaseOpenSource|Win32 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|x64.ActiveCfg = ReleaseOpenSource|x64 - {A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|x64.Build.0 = ReleaseOpenSource|x64 - {13E13907-49DA-482E-AD58-026D06A5CD11}.Debug|Win32.ActiveCfg = Debug|Win32 - {13E13907-49DA-482E-AD58-026D06A5CD11}.Debug|Win32.Build.0 = Debug|Win32 - {13E13907-49DA-482E-AD58-026D06A5CD11}.Debug|x64.ActiveCfg = Debug|x64 - {13E13907-49DA-482E-AD58-026D06A5CD11}.Debug|x64.Build.0 = Debug|x64 - {13E13907-49DA-482E-AD58-026D06A5CD11}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {13E13907-49DA-482E-AD58-026D06A5CD11}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {13E13907-49DA-482E-AD58-026D06A5CD11}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {13E13907-49DA-482E-AD58-026D06A5CD11}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {13E13907-49DA-482E-AD58-026D06A5CD11}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {13E13907-49DA-482E-AD58-026D06A5CD11}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {13E13907-49DA-482E-AD58-026D06A5CD11}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {13E13907-49DA-482E-AD58-026D06A5CD11}.DLL-Import Release|x64.Build.0 = Release|x64 - {13E13907-49DA-482E-AD58-026D06A5CD11}.Release|Win32.ActiveCfg = Release|Win32 - {13E13907-49DA-482E-AD58-026D06A5CD11}.Release|Win32.Build.0 = Release|Win32 - {13E13907-49DA-482E-AD58-026D06A5CD11}.Release|x64.ActiveCfg = Release|x64 - {13E13907-49DA-482E-AD58-026D06A5CD11}.Release|x64.Build.0 = Release|x64 - {13E13907-49DA-482E-AD58-026D06A5CD11}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {13E13907-49DA-482E-AD58-026D06A5CD11}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {13E13907-49DA-482E-AD58-026D06A5CD11}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {13E13907-49DA-482E-AD58-026D06A5CD11}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.Debug|Win32.ActiveCfg = Debug|Win32 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.Debug|Win32.Build.0 = Debug|Win32 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.Debug|x64.ActiveCfg = Debug|x64 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.Debug|x64.Build.0 = Debug|x64 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.DLL-Import Release|x64.Build.0 = Release|x64 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.Release|Win32.ActiveCfg = Release|Win32 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.Release|Win32.Build.0 = Release|Win32 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.Release|x64.ActiveCfg = Release|x64 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.Release|x64.Build.0 = Release|x64 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}.ReleaseOpenSource|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.vcxproj b/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.vcxproj index 1464149b0d..6d0c4c0c76 100644 --- a/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.vcxproj +++ b/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.vcxproj @@ -70,8 +70,8 @@ $(Configuration)\ $(Configuration)\ true - ../../../Common\3dParty\boost\build\win_32\include;$(IncludePath) - ../../../Common\3dParty\boost\build\win_32\lib;$(LibraryPath) + ../../../../Common\3dParty\boost\build\win_32\include;../../Common;$(IncludePath) + ../../../../Common\3dParty\boost\build\win_32\lib;$(LibraryPath) $(Platform)\$(Configuration)\ @@ -167,73 +167,23 @@ Rpcrt4.lib;%(AdditionalDependencies) - - - - - - - /bigobj %(AdditionalOptions) - - - - /bigobj %(AdditionalOptions) - - - - - - - - - - - - - - - + {609ed938-3ca8-4bed-b363-25096d4c4812} - false - + {94954a67-a853-43b1-a727-6ef2774c5a6a} - false - - {36636678-ae25-4be6-9a34-2561d1bcf302} - false - - - {77ddc8d7-5b12-4ff2-9629-26aebca8436d} - - - {3423ec9a-52e4-4a4d-9753-edebc38785ef} - false - - - {a100103a-353e-45e8-a9b8-90b87cc5c0b0} - - - {13e13907-49da-482e-ad58-026d06a5cd11} - - - {c27e9a9f-3a17-4482-9c5f-bf15c01e747c} - false - - + {e5a67556-44da-4481-8f87-0a3aedbd20dd} - false - + {bee01b53-244a-44e6-8947-ed9342d9247e} - false diff --git a/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.vcxproj.filters b/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.vcxproj.filters index a674d16738..ab136b296b 100644 --- a/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.vcxproj.filters +++ b/OdfFile/Projects/Windows/OdfFileWTest/OdfFileWTest.vcxproj.filters @@ -5,67 +5,10 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - {86911534-a032-4f20-95fd-78c867b9ea7b} - - - Source Files - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - - - Source Files\oox - Source Files - - Source Files\oox - - - Source Files - \ No newline at end of file diff --git a/OdfFile/Projects/Windows/OdfFormatW.vcxproj b/OdfFile/Projects/Windows/OdfFormatW.vcxproj index 9b8fa2bbf3..47d08f08a8 100644 --- a/OdfFile/Projects/Windows/OdfFormatW.vcxproj +++ b/OdfFile/Projects/Windows/OdfFormatW.vcxproj @@ -18,11 +18,189 @@ x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OdfFormatWriterLib {E5A67556-44DA-4481-8F87-0A3AEDBD20DD} OdfFormat Win32Proj + 8.1 @@ -67,9 +245,9 @@ <_ProjectFileVersion>14.0.23107.0 - $(Configuration)\ - $(Configuration)\ - ..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) + $(Configuration)\Writer\ + $(Configuration)\Writer\ + ..\..\..\Common\3dParty\boost\build\win_32\include;..\..\Common;$(IncludePath) ..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) @@ -151,192 +329,6 @@ ProgramDatabase - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /bigobj %(AdditionalOptions) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - $(IntDir)%(Filename)1.obj - $(IntDir)%(Filename)1.xdc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OdfFile/Projects/Windows/Oox2OdfConverter.vcxproj b/OdfFile/Projects/Windows/Oox2OdfConverter.vcxproj index 7efad7414f..cfd9fe6bad 100644 --- a/OdfFile/Projects/Windows/Oox2OdfConverter.vcxproj +++ b/OdfFile/Projects/Windows/Oox2OdfConverter.vcxproj @@ -18,10 +18,29 @@ x64 + + + + + + + + + + + + + + + + + + {BEE01B53-244A-44E6-8947-ED9342D9247E} Oox2OdfConverter Win32Proj + 8.1 @@ -66,9 +85,9 @@ <_ProjectFileVersion>14.0.23107.0 - $(Configuration)\ - $(Configuration)\ - ..\..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) + $(Configuration)\Writer\ + $(Configuration)\Writer\ + ..\..\..\Common\3dParty\boost\build\win_32\include;..\..\Common;$(IncludePath) ..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) @@ -142,26 +161,6 @@ ProgramDatabase - - - - - - - /bigobj %(AdditionalOptions) - - - - - - - - - - - - - diff --git a/OdfFile/Projects/Windows/cpcommon.vcxproj b/OdfFile/Projects/Windows/cpcommon.vcxproj index c480cd71bb..32ddb2aa0a 100644 --- a/OdfFile/Projects/Windows/cpcommon.vcxproj +++ b/OdfFile/Projects/Windows/cpcommon.vcxproj @@ -171,6 +171,7 @@ + @@ -293,6 +294,7 @@ + diff --git a/OdfFile/Projects/Windows/cpcommon.vcxproj.filters b/OdfFile/Projects/Windows/cpcommon.vcxproj.filters index 21d5187e03..c40734c0d6 100644 --- a/OdfFile/Projects/Windows/cpcommon.vcxproj.filters +++ b/OdfFile/Projects/Windows/cpcommon.vcxproj.filters @@ -355,6 +355,7 @@ + @@ -688,5 +689,6 @@ + \ No newline at end of file diff --git a/OdfFile/Projects/Windows/cpodf.vcxproj b/OdfFile/Projects/Windows/cpodf.vcxproj index 7432ad2c3f..ba862fd8fc 100644 --- a/OdfFile/Projects/Windows/cpodf.vcxproj +++ b/OdfFile/Projects/Windows/cpodf.vcxproj @@ -23,6 +23,7 @@ {50E20601-4A8D-4AFB-8870-63828D328429} cpodf Win32Proj + 8.1 @@ -67,10 +68,10 @@ <_ProjectFileVersion>14.0.23107.0 - $(Configuration)\ - $(Configuration)\ - ..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) - ..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) + $(Configuration)\Reader\ + $(Configuration)\Reader\ + ..\..\..\Common\3dParty\boost\build\win_32\include;..\..\Common;$(IncludePath) + ..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) $(Platform)\$(Configuration)\ @@ -171,170 +172,456 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + + + /bigobj %(AdditionalOptions) + - - - - - - - - diff --git a/OdfFile/Projects/Windows/cpodf.vcxproj.filters b/OdfFile/Projects/Windows/cpodf.vcxproj.filters index 95d9b00d8e..764b6bef8a 100644 --- a/OdfFile/Projects/Windows/cpodf.vcxproj.filters +++ b/OdfFile/Projects/Windows/cpodf.vcxproj.filters @@ -25,9 +25,6 @@ {67b2bf43-5673-4a6f-82cb-fe4be01aee5f} - - {ecbc1bb6-05af-4043-8b7f-731cde436676} - @@ -69,9 +66,6 @@ elements - - elements - elements @@ -93,9 +87,6 @@ elements - - elements - elements @@ -264,12 +255,6 @@ elements - - common - - - common - oox\docx @@ -698,30 +683,6 @@ elements - - common - - - common - - - common - - - common - - - common - - - common - - - common - - - common - oox\docx diff --git a/OdfFile/Projects/Windows/formulasconvert.vcxproj b/OdfFile/Projects/Windows/formulasconvert.vcxproj index 0315d242a8..af3fa747e1 100644 --- a/OdfFile/Projects/Windows/formulasconvert.vcxproj +++ b/OdfFile/Projects/Windows/formulasconvert.vcxproj @@ -75,8 +75,8 @@ $(Configuration)\ $(Configuration)\ - ..\..\Common\3dParty\boost\build\win_32\include;$(IncludePath) - ..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) + ..\..\..\Common\3dParty\boost\build\win_32\include;..\..\Common;$(IncludePath) + ..\..\..\Common\3dParty\boost\build\win_32\lib;$(LibraryPath) $(Platform)\$(Configuration)\ diff --git a/OdfFile/Reader/Format/draw_page_pptx.cpp b/OdfFile/Reader/Format/draw_page_pptx.cpp deleted file mode 100644 index d6ed47c745..0000000000 --- a/OdfFile/Reader/Format/draw_page_pptx.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#include "draw_page.h" - -#include -#include -#include -#include "../formulasconvert/formulasconvert.h" - -#include - -#include "serialize_elements.h" -#include "odfcontext.h" -#include - -#include "calcs_styles.h" -#include "draw_common.h" - -#include - -namespace cpdoccore { - - using namespace odf_types; - -namespace odf_reader { - -void draw_page::pptx_convert(oox::pptx_conversion_context & Context) -{ - const std::wstring pageStyleName = draw_page_attr_.draw_style_name_.get_value_or(L""); - const std::wstring pageName = draw_page_attr_.draw_name_.get_value_or(L""); - const std::wstring layoutName = draw_page_attr_.page_layout_name_.get_value_or(L""); - const std::wstring masterName = draw_page_attr_.master_page_name_.get_value_or(L""); - - _CP_LOG << L"[info][xlsx] process page(slide) \"" << pageName /*L"" */<< L"\"" << std::endl; - - Context.start_page(pageName, pageStyleName, layoutName,masterName); - - if (draw_page_attr_.draw_style_name_) - { - style_instance * style_inst = Context.root()->odf_context().styleContainer().style_by_name(pageStyleName,style_family::DrawingPage,false); - - if ((style_inst) && (style_inst->content())) - { - const style_drawing_page_properties * properties = style_inst->content()->get_style_drawing_page_properties(); - - if (properties) - { - oox::_oox_fill fill; - Compute_GraphicFill(properties->content().common_draw_fill_attlist_, Context.root()->odf_context().drawStyles() ,fill); - Context.get_slide_context().add_background(fill); - } - } - } - BOOST_FOREACH(const office_element_ptr& elm, content_) - { - elm->pptx_convert(Context); - } - - Context.end_page(); -} - -} -} diff --git a/OdfFile/Reader/Format/office_elements.h b/OdfFile/Reader/Format/office_elements.h index dca2edf3c3..9abd84c103 100644 --- a/OdfFile/Reader/Format/office_elements.h +++ b/OdfFile/Reader/Format/office_elements.h @@ -35,7 +35,7 @@ #include "../../Common/CPSharedPtr.h" #include "../../Common/xml/xmlelement.h" -#include "readdocelement.h" +#include "../../Common/readdocelement.h" #include "../../Common/odf_elements_type.h" diff --git a/OdfFile/Writer/Format/anim_elements.h b/OdfFile/Writer/Format/anim_elements.h index 5c36808825..e1e3732286 100644 --- a/OdfFile/Writer/Format/anim_elements.h +++ b/OdfFile/Writer/Format/anim_elements.h @@ -38,8 +38,8 @@ #include "office_elements.h" #include "office_elements_create.h" -#include "common_attlists.h" -#include "smil_transitiontype.h" +#include "../../DataTypes/common_attlists.h" +#include "../../DataTypes/smil_transitiontype.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/draw_base.h b/OdfFile/Writer/Format/draw_base.h index 0a6d6dd797..9c17092657 100644 --- a/OdfFile/Writer/Format/draw_base.h +++ b/OdfFile/Writer/Format/draw_base.h @@ -38,7 +38,7 @@ #include "office_elements_create.h" -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/draw_frame.cpp b/OdfFile/Writer/Format/draw_frame.cpp index c86367fbb4..c017fd61f6 100644 --- a/OdfFile/Writer/Format/draw_frame.cpp +++ b/OdfFile/Writer/Format/draw_frame.cpp @@ -44,11 +44,11 @@ #include #include "style_graphic_properties.h" -#include "length.h" -#include "borderstyle.h" - #include "odf_conversion_context.h" +#include "../../DataTypes/length.h" +#include "../../DataTypes/borderstyle.h" + namespace cpdoccore { using namespace odf_types; diff --git a/OdfFile/Writer/Format/draw_page.h b/OdfFile/Writer/Format/draw_page.h index a6d7261ae6..78baf8cf19 100644 --- a/OdfFile/Writer/Format/draw_page.h +++ b/OdfFile/Writer/Format/draw_page.h @@ -39,7 +39,7 @@ #include "office_elements.h" #include "office_elements_create.h" -#include "presentationclass.h" +#include "../../DataTypes/presentationclass.h" namespace cpdoccore { diff --git a/OdfFile/Writer/Format/draw_shapes.cpp b/OdfFile/Writer/Format/draw_shapes.cpp index edd5aa567a..6cd0b8d518 100644 --- a/OdfFile/Writer/Format/draw_shapes.cpp +++ b/OdfFile/Writer/Format/draw_shapes.cpp @@ -47,9 +47,9 @@ #include "style_graphic_properties.h" -#include "length.h" -#include "borderstyle.h" -#include "custom_shape_types_convert.h" +#include "../../DataTypes/length.h" +#include "../../DataTypes/borderstyle.h" +#include "../../DataTypes/custom_shape_types_convert.h" #include "odf_conversion_context.h" diff --git a/OdfFile/Writer/Format/draw_shapes.h b/OdfFile/Writer/Format/draw_shapes.h index 17c8b175f7..e9bde43e5a 100644 --- a/OdfFile/Writer/Format/draw_shapes.h +++ b/OdfFile/Writer/Format/draw_shapes.h @@ -33,8 +33,8 @@ #include "draw_base.h" -#include "common_attlists.h" -#include "targetframename.h" +#include "../../DataTypes/common_attlists.h" +#include "../../DataTypes/targetframename.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/header_footer.h b/OdfFile/Writer/Format/header_footer.h index 63f5726aed..f511a5c6d6 100644 --- a/OdfFile/Writer/Format/header_footer.h +++ b/OdfFile/Writer/Format/header_footer.h @@ -38,7 +38,7 @@ #include "office_elements_create.h" -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" namespace cpdoccore { diff --git a/OdfFile/Writer/Format/math_elements.h b/OdfFile/Writer/Format/math_elements.h index e05ea10a79..0a0cd13bd2 100644 --- a/OdfFile/Writer/Format/math_elements.h +++ b/OdfFile/Writer/Format/math_elements.h @@ -38,8 +38,9 @@ #include #include "office_elements_create.h" -#include "mathvariant.h" -#include "../DataTypes/common_attlists.h" + +#include "../../DataTypes/mathvariant.h" +#include "../../DataTypes/common_attlists.h" namespace cpdoccore { diff --git a/OdfFile/Writer/Format/number_style.h b/OdfFile/Writer/Format/number_style.h index 409c74d935..86ec5ea1e4 100644 --- a/OdfFile/Writer/Format/number_style.h +++ b/OdfFile/Writer/Format/number_style.h @@ -38,7 +38,7 @@ #include "office_elements_create.h" -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/odf_controls_context.h b/OdfFile/Writer/Format/odf_controls_context.h index c2a63f66d5..a69a5cfdcb 100644 --- a/OdfFile/Writer/Format/odf_controls_context.h +++ b/OdfFile/Writer/Format/odf_controls_context.h @@ -38,7 +38,7 @@ #include #include "office_elements_create.h" -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" namespace cpdoccore { namespace odf_writer diff --git a/OdfFile/Writer/Format/odf_drawing_context.h b/OdfFile/Writer/Format/odf_drawing_context.h index 53e01f41d5..cb36888bea 100644 --- a/OdfFile/Writer/Format/odf_drawing_context.h +++ b/OdfFile/Writer/Format/odf_drawing_context.h @@ -39,9 +39,9 @@ #include "office_elements_create.h" -#include "stylewrap.h" -#include "gradientstyle.h" -#include "common_attlists.h" +#include "../../DataTypes/stylewrap.h" +#include "../../DataTypes/gradientstyle.h" +#include "../../DataTypes/common_attlists.h" namespace OOX {namespace Vml { class CShapeType; }} diff --git a/OdfFile/Writer/Format/odf_number_styles_context.h b/OdfFile/Writer/Format/odf_number_styles_context.h index 0b227c5dac..59d633bbcf 100644 --- a/OdfFile/Writer/Format/odf_number_styles_context.h +++ b/OdfFile/Writer/Format/odf_number_styles_context.h @@ -37,7 +37,7 @@ #include "office_elements_create.h" -#include "officevaluetype.h" +#include "../../DataTypes/officevaluetype.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/odf_page_layout_context.h b/OdfFile/Writer/Format/odf_page_layout_context.h index 926980ca37..a90350b71f 100644 --- a/OdfFile/Writer/Format/odf_page_layout_context.h +++ b/OdfFile/Writer/Format/odf_page_layout_context.h @@ -35,8 +35,8 @@ #include "odf_page_layout_state.h" -#include "length.h" -#include "color.h" +#include "../../DataTypes/length.h" +#include "../../DataTypes/color.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/odf_page_layout_state.h b/OdfFile/Writer/Format/odf_page_layout_state.h index 46afe03548..035acc018f 100644 --- a/OdfFile/Writer/Format/odf_page_layout_state.h +++ b/OdfFile/Writer/Format/odf_page_layout_state.h @@ -36,8 +36,8 @@ #include "office_elements_create.h" -#include "length.h" -#include "stylenumformat.h" +#include "../../DataTypes/length.h" +#include "../../DataTypes/stylenumformat.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/odf_style_state.h b/OdfFile/Writer/Format/odf_style_state.h index 5044569317..271fd15e01 100644 --- a/OdfFile/Writer/Format/odf_style_state.h +++ b/OdfFile/Writer/Format/odf_style_state.h @@ -36,7 +36,7 @@ #include "office_elements_create.h" -#include "stylefamily.h" +#include "../../DataTypes/stylefamily.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/odf_text_context.h b/OdfFile/Writer/Format/odf_text_context.h index ccfcf0cab6..5d266ef5ea 100644 --- a/OdfFile/Writer/Format/odf_text_context.h +++ b/OdfFile/Writer/Format/odf_text_context.h @@ -38,7 +38,7 @@ #include "office_elements_create.h" -#include "fobreak.h" +#include "../../DataTypes/fobreak.h" namespace cpdoccore { namespace odf_writer diff --git a/OdfFile/Writer/Format/ods_table_state.h b/OdfFile/Writer/Format/ods_table_state.h index 0b439acc2e..afe015ee4f 100644 --- a/OdfFile/Writer/Format/ods_table_state.h +++ b/OdfFile/Writer/Format/ods_table_state.h @@ -45,7 +45,7 @@ #include "office_elements_create.h" #include "style_graphic_properties.h" -#include "officevaluetype.h" +#include "../../DataTypes/officevaluetype.h" namespace cpdoccore { diff --git a/OdfFile/Writer/Format/office_annotation.h b/OdfFile/Writer/Format/office_annotation.h index 8f2bf8e35b..156038a1e9 100644 --- a/OdfFile/Writer/Format/office_annotation.h +++ b/OdfFile/Writer/Format/office_annotation.h @@ -39,8 +39,8 @@ #include "office_elements_create.h" -#include "bool.h" -#include "length.h" +#include "../../DataTypes/bool.h" +#include "../../DataTypes/length.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/office_chart.h b/OdfFile/Writer/Format/office_chart.h index a264e1ecb5..825571d1d8 100644 --- a/OdfFile/Writer/Format/office_chart.h +++ b/OdfFile/Writer/Format/office_chart.h @@ -36,12 +36,12 @@ #include #include -#include "common_attlists.h" -#include "charttimeunit.h" -#include "chartclass.h" - #include "text_elements.h" +#include "../../DataTypes/common_attlists.h" +#include "../../DataTypes/charttimeunit.h" +#include "../../DataTypes/chartclass.h" + namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/office_document.h b/OdfFile/Writer/Format/office_document.h index 38631b784c..22f12aa5f4 100644 --- a/OdfFile/Writer/Format/office_document.h +++ b/OdfFile/Writer/Format/office_document.h @@ -39,8 +39,8 @@ #include "office_elements_create.h" -#include "bool.h" -#include "length.h" +#include "../../DataTypes/bool.h" +#include "../../DataTypes/length.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/office_event_listeners.h b/OdfFile/Writer/Format/office_event_listeners.h index 313454cfdd..d0d1bc4b48 100644 --- a/OdfFile/Writer/Format/office_event_listeners.h +++ b/OdfFile/Writer/Format/office_event_listeners.h @@ -38,7 +38,7 @@ #include "office_elements.h" #include "office_elements_create.h" -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/office_forms.h b/OdfFile/Writer/Format/office_forms.h index 5962164ea2..00b85b2f92 100644 --- a/OdfFile/Writer/Format/office_forms.h +++ b/OdfFile/Writer/Format/office_forms.h @@ -39,9 +39,9 @@ #include "office_elements.h" #include "office_elements_create.h" -#include "common_attlists.h" -#include "commandtype.h" -#include "tablecentering.h" +#include "../../DataTypes/common_attlists.h" +#include "../../DataTypes/commandtype.h" +#include "../../DataTypes/tablecentering.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/office_settings.h b/OdfFile/Writer/Format/office_settings.h index 1e7621da9f..1b767cdd3b 100644 --- a/OdfFile/Writer/Format/office_settings.h +++ b/OdfFile/Writer/Format/office_settings.h @@ -38,7 +38,7 @@ #include "office_elements_create.h" -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/office_spreadsheet.h b/OdfFile/Writer/Format/office_spreadsheet.h index 53fbd23a3b..5af1a6d747 100644 --- a/OdfFile/Writer/Format/office_spreadsheet.h +++ b/OdfFile/Writer/Format/office_spreadsheet.h @@ -38,7 +38,7 @@ #include #include "office_elements_create.h" -#include "bool.h" +#include "../../DataTypes/bool.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/office_text.h b/OdfFile/Writer/Format/office_text.h index 4a71b3a192..c560c441ab 100644 --- a/OdfFile/Writer/Format/office_text.h +++ b/OdfFile/Writer/Format/office_text.h @@ -40,7 +40,7 @@ #include -#include "bool.h" +#include "../../DataTypes/bool.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/paragraph_elements.cpp b/OdfFile/Writer/Format/paragraph_elements.cpp index 87efda0cad..53dd327111 100644 --- a/OdfFile/Writer/Format/paragraph_elements.cpp +++ b/OdfFile/Writer/Format/paragraph_elements.cpp @@ -46,17 +46,16 @@ #include #include -#include "targetframename.h" #include "styles.h" //#include "note.h" //#include "ruby.h" #include "office_elements_create.h" - #include "odf_conversion_context.h" - #include "style_text_properties.h" +#include "../../DataTypes/targetframename.h" + namespace cpdoccore { using namespace odf_types; diff --git a/OdfFile/Writer/Format/paragraph_elements.h b/OdfFile/Writer/Format/paragraph_elements.h index 5f5d89e867..3bbac8c3d4 100644 --- a/OdfFile/Writer/Format/paragraph_elements.h +++ b/OdfFile/Writer/Format/paragraph_elements.h @@ -39,11 +39,11 @@ #include "office_elements_create.h" -#include "targetframename.h" -#include "noteclass.h" -#include "bibliography.h" +#include "../../DataTypes/targetframename.h" +#include "../../DataTypes/noteclass.h" +#include "../../DataTypes/bibliography.h" -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/style_chart_properties.h b/OdfFile/Writer/Format/style_chart_properties.h index 423623d0a7..ea4823020b 100644 --- a/OdfFile/Writer/Format/style_chart_properties.h +++ b/OdfFile/Writer/Format/style_chart_properties.h @@ -38,17 +38,17 @@ #include "office_elements_create.h" -#include "chartsymbol.h" -#include "length.h" -#include "chartinterpolation.h" -#include "chartsolidtype.h" -#include "chartlabelarrangement.h" -#include "common_attlists.h" -#include "chartdatalabelnumber.h" -#include "charterrorcategory.h" -#include "chartseriessource.h" -#include "chartregressiontype.h" -#include "direction.h" +#include "../../DataTypes/chartsymbol.h" +#include "../../DataTypes/length.h" +#include "../../DataTypes/chartinterpolation.h" +#include "../../DataTypes/chartsolidtype.h" +#include "../../DataTypes/chartlabelarrangement.h" +#include "../../DataTypes/common_attlists.h" +#include "../../DataTypes/chartdatalabelnumber.h" +#include "../../DataTypes/charterrorcategory.h" +#include "../../DataTypes/chartseriessource.h" +#include "../../DataTypes/chartregressiontype.h" +#include "../../DataTypes/direction.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/style_graphic_properties.h b/OdfFile/Writer/Format/style_graphic_properties.h index 19e092d7f1..0b6f836db4 100644 --- a/OdfFile/Writer/Format/style_graphic_properties.h +++ b/OdfFile/Writer/Format/style_graphic_properties.h @@ -39,22 +39,22 @@ #include "office_elements_create.h" -#include "common_attlists.h" -#include "lengthorpercent.h" -#include "stylehorizontalpos.h" -#include "stylehorizontalrel.h" -#include "styleverticalrel.h" -#include "styleverticalpos.h" -#include "anchortype.h" -#include "stylewrap.h" -#include "wrapoption.h" -#include "hyphenationladdercount.h" -#include "stylewrapcontourmode.h" -#include "runthrough.h" -#include "linestyle.h" -#include "markerstyle.h" -#include "verticalalign.h" -#include "gradientstyle.h" +#include "../../DataTypes/common_attlists.h" +#include "../../DataTypes/lengthorpercent.h" +#include "../../DataTypes/stylehorizontalpos.h" +#include "../../DataTypes/stylehorizontalrel.h" +#include "../../DataTypes/styleverticalrel.h" +#include "../../DataTypes/styleverticalpos.h" +#include "../../DataTypes/anchortype.h" +#include "../../DataTypes/stylewrap.h" +#include "../../DataTypes/wrapoption.h" +#include "../../DataTypes/hyphenationladdercount.h" +#include "../../DataTypes/stylewrapcontourmode.h" +#include "../../DataTypes/runthrough.h" +#include "../../DataTypes/linestyle.h" +#include "../../DataTypes/markerstyle.h" +#include "../../DataTypes/verticalalign.h" +#include "../../DataTypes/gradientstyle.h" namespace cpdoccore { diff --git a/OdfFile/Writer/Format/style_page_layout_properties.h b/OdfFile/Writer/Format/style_page_layout_properties.h index 0e76c7ee02..acf6fbb476 100644 --- a/OdfFile/Writer/Format/style_page_layout_properties.h +++ b/OdfFile/Writer/Format/style_page_layout_properties.h @@ -44,12 +44,12 @@ #include "office_elements_create.h" -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" -#include "tablecentering.h" -#include "layoutgridmode.h" -#include "direction.h" -#include "styleprint.h" +#include "../../DataTypes/tablecentering.h" +#include "../../DataTypes/layoutgridmode.h" +#include "../../DataTypes/direction.h" +#include "../../DataTypes/styleprint.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/style_paragraph_properties.cpp b/OdfFile/Writer/Format/style_paragraph_properties.cpp index 9d2e86281f..ee030a7686 100644 --- a/OdfFile/Writer/Format/style_paragraph_properties.cpp +++ b/OdfFile/Writer/Format/style_paragraph_properties.cpp @@ -38,7 +38,7 @@ #include #include -#include "borderstyle.h" +#include "../../DataTypes/borderstyle.h" namespace cpdoccore { diff --git a/OdfFile/Writer/Format/style_paragraph_properties.h b/OdfFile/Writer/Format/style_paragraph_properties.h index 61b7d45d7b..6503ef9834 100644 --- a/OdfFile/Writer/Format/style_paragraph_properties.h +++ b/OdfFile/Writer/Format/style_paragraph_properties.h @@ -37,33 +37,33 @@ #include "office_elements_create.h" -#include "linewidth.h" -#include "length.h" -#include "textalign.h" -#include "keeptogether.h" -#include "hyphenationkeep.h" -#include "backgroundcolor.h" -#include "shadowtype.h" -#include "percent.h" -#include "writingmode.h" -#include "verticalalign.h" -#include "linebreak.h" -#include "punctuationwrap.h" -#include "textautospace.h" -#include "hyphenationladdercount.h" -#include "lengthorpercent.h" -#include "styletype.h" -#include "linestyle.h" -#include "linetype.h" -#include "styleleadercolor.h" -#include "dropcaplength.h" -#include "fobreak.h" -#include "styleposition.h" -#include "borderwidths.h" +#include "../../DataTypes/linewidth.h" +#include "../../DataTypes/length.h" +#include "../../DataTypes/textalign.h" +#include "../../DataTypes/keeptogether.h" +#include "../../DataTypes/hyphenationkeep.h" +#include "../../DataTypes/backgroundcolor.h" +#include "../../DataTypes/shadowtype.h" +#include "../../DataTypes/percent.h" +#include "../../DataTypes/writingmode.h" +#include "../../DataTypes/verticalalign.h" +#include "../../DataTypes/linebreak.h" +#include "../../DataTypes/punctuationwrap.h" +#include "../../DataTypes/textautospace.h" +#include "../../DataTypes/hyphenationladdercount.h" +#include "../../DataTypes/lengthorpercent.h" +#include "../../DataTypes/styletype.h" +#include "../../DataTypes/linestyle.h" +#include "../../DataTypes/linetype.h" +#include "../../DataTypes/styleleadercolor.h" +#include "../../DataTypes/dropcaplength.h" +#include "../../DataTypes/fobreak.h" +#include "../../DataTypes/styleposition.h" +#include "../../DataTypes/borderwidths.h" //#include "common_draw_data.h" //#include "office_binary_data.h" -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" namespace cpdoccore{ diff --git a/OdfFile/Writer/Format/style_presentation.h b/OdfFile/Writer/Format/style_presentation.h index 8a6337b1e2..fb9e7eac43 100644 --- a/OdfFile/Writer/Format/style_presentation.h +++ b/OdfFile/Writer/Format/style_presentation.h @@ -31,8 +31,6 @@ */ #pragma once -#include "common_attlists.h" - #include #include @@ -41,9 +39,9 @@ #include "office_elements_create.h" #include "anim_elements.h" -#include "presentationclass.h" - -#include "drawfill.h" +#include "../../DataTypes/common_attlists.h" +#include "../../DataTypes/presentationclass.h" +#include "../../DataTypes/drawfill.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/style_section_properties.h b/OdfFile/Writer/Format/style_section_properties.h index 0f458c5a73..6904bca856 100644 --- a/OdfFile/Writer/Format/style_section_properties.h +++ b/OdfFile/Writer/Format/style_section_properties.h @@ -39,8 +39,8 @@ #include "office_elements_create.h" -#include "common_attlists.h" -#include "verticalalign.h" +#include "../../DataTypes/common_attlists.h" +#include "../../DataTypes/verticalalign.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/style_table_properties.cpp b/OdfFile/Writer/Format/style_table_properties.cpp index de74dd3ae3..d7ed6cae52 100644 --- a/OdfFile/Writer/Format/style_table_properties.cpp +++ b/OdfFile/Writer/Format/style_table_properties.cpp @@ -32,7 +32,7 @@ #include #include "style_table_properties.h" -#include "borderstyle.h" +#include "../../DataTypes/borderstyle.h" #include diff --git a/OdfFile/Writer/Format/style_table_properties.h b/OdfFile/Writer/Format/style_table_properties.h index 9a8467fa39..4e3481cd6c 100644 --- a/OdfFile/Writer/Format/style_table_properties.h +++ b/OdfFile/Writer/Format/style_table_properties.h @@ -39,21 +39,21 @@ #include "office_elements_create.h" -#include "length.h" -#include "percent.h" -#include "lengthorpercent.h" -#include "fobreak.h" -#include "tablealign.h" -#include "common_attlists.h" -#include "bordermodel.h" -#include "verticalalign.h" -#include "borderwidths.h" -#include "textalignsource.h" -#include "direction.h" -#include "wrapoption.h" -#include "rotationalign.h" -#include "bool.h" -#include "stylecellprotect.h" +#include "../../DataTypes/length.h" +#include "../../DataTypes/percent.h" +#include "../../DataTypes/lengthorpercent.h" +#include "../../DataTypes/fobreak.h" +#include "../../DataTypes/tablealign.h" +#include "../../DataTypes/common_attlists.h" +#include "../../DataTypes/bordermodel.h" +#include "../../DataTypes/verticalalign.h" +#include "../../DataTypes/borderwidths.h" +#include "../../DataTypes/textalignsource.h" +#include "../../DataTypes/direction.h" +#include "../../DataTypes/wrapoption.h" +#include "../../DataTypes/rotationalign.h" +#include "../../DataTypes/bool.h" +#include "../../DataTypes/stylecellprotect.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/style_text_properties.cpp b/OdfFile/Writer/Format/style_text_properties.cpp index ee017e5ad2..531643e63b 100644 --- a/OdfFile/Writer/Format/style_text_properties.cpp +++ b/OdfFile/Writer/Format/style_text_properties.cpp @@ -32,15 +32,16 @@ #include +#include +#include + #include "style_text_properties.h" -#include "fontvariant.h" -#include "logging.h" +#include "../../DataTypes/fontvariant.h" +#include "../../DataTypes/common_attlists.h" -#include "common_attlists.h" -#include //#include "../docx/oox_drawing_fills.h" diff --git a/OdfFile/Writer/Format/style_text_properties.h b/OdfFile/Writer/Format/style_text_properties.h index 6319cd7385..49289356ba 100644 --- a/OdfFile/Writer/Format/style_text_properties.h +++ b/OdfFile/Writer/Format/style_text_properties.h @@ -39,31 +39,31 @@ #include "office_elements_create.h" -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" -#include "fontvariant.h" -#include "texttransform.h" -#include "color.h" -#include "linetype.h" -#include "linestyle.h" -#include "linewidth.h" -#include "textposition.h" -#include "fontfamilygeneric.h" -#include "fontpitch.h" -#include "fontsize.h" -#include "scripttype.h" -#include "letterspacing.h" -#include "fontstyle.h" -#include "shadowtype.h" -#include "fontweight.h" -#include "linemode.h" -#include "backgroundcolor.h" -#include "underlinecolor.h" -#include "fontrelief.h" -#include "textcombine.h" -#include "textemphasize.h" -#include "textrotationscale.h" -#include "textdisplay.h" +#include "../../DataTypes/fontvariant.h" +#include "../../DataTypes/texttransform.h" +#include "../../DataTypes/color.h" +#include "../../DataTypes/linetype.h" +#include "../../DataTypes/linestyle.h" +#include "../../DataTypes/linewidth.h" +#include "../../DataTypes/textposition.h" +#include "../../DataTypes/fontfamilygeneric.h" +#include "../../DataTypes/fontpitch.h" +#include "../../DataTypes/fontsize.h" +#include "../../DataTypes/scripttype.h" +#include "../../DataTypes/letterspacing.h" +#include "../../DataTypes/fontstyle.h" +#include "../../DataTypes/shadowtype.h" +#include "../../DataTypes/fontweight.h" +#include "../../DataTypes/linemode.h" +#include "../../DataTypes/backgroundcolor.h" +#include "../../DataTypes/underlinecolor.h" +#include "../../DataTypes/fontrelief.h" +#include "../../DataTypes/textcombine.h" +#include "../../DataTypes/textemphasize.h" +#include "../../DataTypes/textrotationscale.h" +#include "../../DataTypes/textdisplay.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/styles.h b/OdfFile/Writer/Format/styles.h index 6854319bf6..e5fe3819a3 100644 --- a/OdfFile/Writer/Format/styles.h +++ b/OdfFile/Writer/Format/styles.h @@ -44,31 +44,30 @@ #include "office_elements_create.h" -#include "stylefamily.h" -#include "textalign.h" -#include "length.h" -#include "styleverticalrel.h" -#include "styleverticalpos.h" -#include "percent.h" -#include "verticalalign.h" -#include "pageusage.h" -#include "tablecentering.h" -#include "layoutgridmode.h" -#include "direction.h" -#include "linestyle.h" -#include "styletype.h" -#include "noteclass.h" -#include "gradientstyle.h" -#include "hatchstyle.h" -#include "fontstyle.h" -#include "fontvariant.h" -#include "fontweight.h" -#include "fontstretch.h" -#include "fontfamilygeneric.h" -#include "fontpitch.h" -#include "drawangle.h" - -#include "common_attlists.h" +#include "../../DataTypes/stylefamily.h" +#include "../../DataTypes/textalign.h" +#include "../../DataTypes/length.h" +#include "../../DataTypes/styleverticalrel.h" +#include "../../DataTypes/styleverticalpos.h" +#include "../../DataTypes/percent.h" +#include "../../DataTypes/verticalalign.h" +#include "../../DataTypes/pageusage.h" +#include "../../DataTypes/tablecentering.h" +#include "../../DataTypes/layoutgridmode.h" +#include "../../DataTypes/direction.h" +#include "../../DataTypes/linestyle.h" +#include "../../DataTypes/styletype.h" +#include "../../DataTypes/noteclass.h" +#include "../../DataTypes/gradientstyle.h" +#include "../../DataTypes/hatchstyle.h" +#include "../../DataTypes/fontstyle.h" +#include "../../DataTypes/fontvariant.h" +#include "../../DataTypes/fontweight.h" +#include "../../DataTypes/fontstretch.h" +#include "../../DataTypes/fontfamilygeneric.h" +#include "../../DataTypes/fontpitch.h" +#include "../../DataTypes/drawangle.h" +#include "../../DataTypes/common_attlists.h" #include "header_footer.h" diff --git a/OdfFile/Writer/Format/styles_list.h b/OdfFile/Writer/Format/styles_list.h index 433d1928f4..83a2ab1d6d 100644 --- a/OdfFile/Writer/Format/styles_list.h +++ b/OdfFile/Writer/Format/styles_list.h @@ -41,7 +41,7 @@ #include "office_elements_create.h" -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" namespace cpdoccore { diff --git a/OdfFile/Writer/Format/table.cpp b/OdfFile/Writer/Format/table.cpp index a6be26bca0..167eae367d 100644 --- a/OdfFile/Writer/Format/table.cpp +++ b/OdfFile/Writer/Format/table.cpp @@ -38,7 +38,7 @@ #include #include -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" namespace cpdoccore { diff --git a/OdfFile/Writer/Format/table.h b/OdfFile/Writer/Format/table.h index cddc04764f..e9d483f393 100644 --- a/OdfFile/Writer/Format/table.h +++ b/OdfFile/Writer/Format/table.h @@ -38,14 +38,14 @@ #include "office_elements_create.h" -#include "tablevisibility.h" -#include "messagetype.h" - -#include "common_attlists.h" -#include "tablemode.h" #include "table_named_expressions.h" #include "table_database_ranges.h" +#include "../../DataTypes/tablevisibility.h" +#include "../../DataTypes/messagetype.h" +#include "../../DataTypes/common_attlists.h" +#include "../../DataTypes/tablemode.h" + namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/table_data_pilot_tables.h b/OdfFile/Writer/Format/table_data_pilot_tables.h index 50a518be9b..a980f79d6b 100644 --- a/OdfFile/Writer/Format/table_data_pilot_tables.h +++ b/OdfFile/Writer/Format/table_data_pilot_tables.h @@ -38,15 +38,15 @@ #include "office_elements_create.h" -#include "common_attlists.h" -#include "bool.h" -#include "grandtotal.h" -#include "membertype.h" -#include "tableorientation.h" -#include "tabletype.h" -#include "tablefunction.h" -#include "tableorder.h" -#include "dategroup.h" +#include "../../DataTypes/common_attlists.h" +#include "../../DataTypes/bool.h" +#include "../../DataTypes/grandtotal.h" +#include "../../DataTypes/membertype.h" +#include "../../DataTypes/tableorientation.h" +#include "../../DataTypes/tabletype.h" +#include "../../DataTypes/tablefunction.h" +#include "../../DataTypes/tableorder.h" +#include "../../DataTypes/dategroup.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/table_database_ranges.h b/OdfFile/Writer/Format/table_database_ranges.h index 62b7208d6f..1273f2b88c 100644 --- a/OdfFile/Writer/Format/table_database_ranges.h +++ b/OdfFile/Writer/Format/table_database_ranges.h @@ -38,7 +38,7 @@ #include "office_elements_create.h" -#include "bool.h" +#include "../../DataTypes/bool.h" namespace cpdoccore { namespace odf_writer { diff --git a/OdfFile/Writer/Format/text_elements.h b/OdfFile/Writer/Format/text_elements.h index 31da4cacac..327ecb85c1 100644 --- a/OdfFile/Writer/Format/text_elements.h +++ b/OdfFile/Writer/Format/text_elements.h @@ -38,10 +38,10 @@ #include #include "office_elements_create.h" -#include "common_attlists.h" +#include "../../DataTypes/common_attlists.h" -#include "bool.h" -#include "textdisplay.h" +#include "../../DataTypes/bool.h" +#include "../../DataTypes/textdisplay.h" namespace cpdoccore { namespace odf_writer { diff --git a/X2tConverter/test/win32Test/X2tConverter_win_test.sln b/X2tConverter/test/win32Test/X2tConverter_win_test.sln index 6ed95ede1a..7fda775727 100644 --- a/X2tConverter/test/win32Test/X2tConverter_win_test.sln +++ b/X2tConverter/test/win32Test/X2tConverter_win_test.sln @@ -21,18 +21,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XlsXlsxConverter", "..\..\. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VbaFormatLib", "..\..\..\MsBinaryFile\Projects\VbaFormatLib\Windows\VbaFormat.vcxproj", "{041DD428-2D5C-4D97-8AB7-7207F3D5B801}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfCommon", "..\..\..\OdfFile\Projects\Windows\win32\cpcommon.vcxproj", "{609ED938-3CA8-4BED-B363-25096D4C4812}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormatReaderLib", "..\..\..\OdfFile\Projects\Windows\win32\cpodf.vcxproj", "{50E20601-4A8D-4AFB-8870-63828D328429}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormulasConvert", "..\..\..\OdfFile\Projects\Windows\win32\formulasconvert.vcxproj", "{94954A67-A853-43B1-A727-6EF2774C5A6A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OdfFormatWriterLib", "..\..\..\OdfFile\Projects\Windows\win32\OdfFormatW.vcxproj", "{E5A67556-44DA-4481-8F87-0A3AEDBD20DD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Oox2OdfConverter", "..\..\..\OdfFile\Projects\Windows\win32\Oox2OdfConverter.vcxproj", "{BEE01B53-244A-44E6-8947-ED9342D9247E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml_wrapper", "..\..\..\OdfFile\Projects\Windows\win32\cpxml.vcxproj", "{41BED424-4EAF-4053-8A5F-1E2A387D53D1}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTFormatLib", "..\..\..\MsBinaryFile\Projects\PPTFormatLib\Windows\PPTFormatLib.vcxproj", "{7B27E40E-F70A-4A74-A77C-0944D7931D15}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TxtFormatLib", "..\..\..\TxtFile\Projects\Windows\Win32\TxtXmlFormatLib.vcxproj", "{DACBE6CA-E089-47D1-8CE7-C7DB59C15417}" @@ -235,126 +223,6 @@ Global {041DD428-2D5C-4D97-8AB7-7207F3D5B801}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 {041DD428-2D5C-4D97-8AB7-7207F3D5B801}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 {041DD428-2D5C-4D97-8AB7-7207F3D5B801}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.ActiveCfg = Debug|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|Win32.Build.0 = Debug|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.ActiveCfg = Debug|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Debug|x64.Build.0 = Debug|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.DLL-Import Release|x64.Build.0 = Release|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|Win32.ActiveCfg = Release|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|Win32.Build.0 = Release|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|x64.ActiveCfg = Release|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.Release|x64.Build.0 = Release|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {609ED938-3CA8-4BED-B363-25096D4C4812}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {609ED938-3CA8-4BED-B363-25096D4C4812}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {50E20601-4A8D-4AFB-8870-63828D328429}.Debug|Win32.ActiveCfg = Debug|Win32 - {50E20601-4A8D-4AFB-8870-63828D328429}.Debug|Win32.Build.0 = Debug|Win32 - {50E20601-4A8D-4AFB-8870-63828D328429}.Debug|x64.ActiveCfg = Debug|x64 - {50E20601-4A8D-4AFB-8870-63828D328429}.Debug|x64.Build.0 = Debug|x64 - {50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {50E20601-4A8D-4AFB-8870-63828D328429}.DLL-Import Release|x64.Build.0 = Release|x64 - {50E20601-4A8D-4AFB-8870-63828D328429}.Release|Win32.ActiveCfg = Release|Win32 - {50E20601-4A8D-4AFB-8870-63828D328429}.Release|Win32.Build.0 = Release|Win32 - {50E20601-4A8D-4AFB-8870-63828D328429}.Release|x64.ActiveCfg = Release|x64 - {50E20601-4A8D-4AFB-8870-63828D328429}.Release|x64.Build.0 = Release|x64 - {50E20601-4A8D-4AFB-8870-63828D328429}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {50E20601-4A8D-4AFB-8870-63828D328429}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {50E20601-4A8D-4AFB-8870-63828D328429}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {50E20601-4A8D-4AFB-8870-63828D328429}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.ActiveCfg = Debug|Win32 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|Win32.Build.0 = Debug|Win32 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|x64.ActiveCfg = Debug|x64 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.Debug|x64.Build.0 = Debug|x64 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.DLL-Import Release|x64.Build.0 = Release|x64 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|Win32.ActiveCfg = Release|Win32 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|Win32.Build.0 = Release|Win32 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|x64.ActiveCfg = Release|x64 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.Release|x64.Build.0 = Release|x64 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {94954A67-A853-43B1-A727-6EF2774C5A6A}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Debug|Win32.ActiveCfg = Debug|Win32 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Debug|Win32.Build.0 = Debug|Win32 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Debug|x64.ActiveCfg = Debug|x64 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Debug|x64.Build.0 = Debug|x64 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.DLL-Import Release|x64.Build.0 = Release|x64 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Release|Win32.ActiveCfg = Release|Win32 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Release|Win32.Build.0 = Release|Win32 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Release|x64.ActiveCfg = Release|x64 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.Release|x64.Build.0 = Release|x64 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.Debug|Win32.ActiveCfg = Debug|Win32 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.Debug|Win32.Build.0 = Debug|Win32 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.Debug|x64.ActiveCfg = Debug|x64 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.Debug|x64.Build.0 = Debug|x64 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.DLL-Import Release|x64.Build.0 = Release|x64 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.Release|Win32.ActiveCfg = Release|Win32 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.Release|Win32.Build.0 = Release|Win32 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.Release|x64.ActiveCfg = Release|x64 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.Release|x64.Build.0 = Release|x64 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {BEE01B53-244A-44E6-8947-ED9342D9247E}.ReleaseOpenSource|x64.Build.0 = Release|x64 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|Win32.ActiveCfg = Debug|Win32 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|Win32.Build.0 = Debug|Win32 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|x64.ActiveCfg = Debug|x64 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Debug|x64.Build.0 = Debug|x64 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Debug|x64.Build.0 = Debug|x64 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Release|Win32.Build.0 = Release|Win32 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Release|x64.ActiveCfg = Release|x64 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.DLL-Import Release|x64.Build.0 = Release|x64 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|Win32.ActiveCfg = Release|Win32 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|Win32.Build.0 = Release|Win32 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|x64.ActiveCfg = Release|x64 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.Release|x64.Build.0 = Release|x64 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.ReleaseOpenSource|Win32.Build.0 = Release|Win32 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.ReleaseOpenSource|x64.ActiveCfg = Release|x64 - {41BED424-4EAF-4053-8A5F-1E2A387D53D1}.ReleaseOpenSource|x64.Build.0 = Release|x64 {7B27E40E-F70A-4A74-A77C-0944D7931D15}.Debug|Win32.ActiveCfg = Debug|Win32 {7B27E40E-F70A-4A74-A77C-0944D7931D15}.Debug|Win32.Build.0 = Debug|Win32 {7B27E40E-F70A-4A74-A77C-0944D7931D15}.Debug|x64.ActiveCfg = Debug|x64