рефакторинг для linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@61982 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeOdfFile/ASCOfficeOdfFile/ASCOfficeOdfFile.vcproj

@@ -21,7 +21,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)output/$(ConfigurationName)/$(ProjectName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -54,7 +54,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)include"
+				AdditionalIncludeDirectories="../include"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=1;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -79,11 +79,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalDependencies="XmlLite.lib Msimg32.lib"
 				OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(SolutionDir)bin&quot;;..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
-				IgnoreDefaultLibraryNames="libcmt.lib"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
 				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -119,7 +118,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfATL="1"
@@ -153,7 +152,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)include"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=1"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -178,11 +177,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalDependencies="XmlLite.lib Msimg32.lib"
 				OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(SolutionDir)bin&quot;;..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
-				IgnoreDefaultLibraryNames="libcmt.lib"
+				IgnoreDefaultLibraryNames=""
 				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -219,7 +217,7 @@
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/$(ProjectName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -256,7 +254,7 @@
 				Name="VCCLCompilerTool"
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="$(SolutionDir)include"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=0"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -280,11 +278,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalDependencies="XmlLite.lib Msimg32.lib"
 				OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(SolutionDir)bin"
-				IgnoreDefaultLibraryNames="libcmt.lib"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
 				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -322,7 +319,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfATL="1"
@@ -360,7 +357,7 @@
 				Name="VCCLCompilerTool"
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories="$(SolutionDir)include"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=0"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -384,11 +381,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalDependencies="XmlLite.lib Msimg32.lib"
 				OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(SolutionDir)bin"
-				IgnoreDefaultLibraryNames="libcmt.lib"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
 				MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"

ASCOfficeOdfFile/ASCOfficeOdfFile/ConvertOO2OOX.cpp

@@ -2,17 +2,17 @@
 
 #include "ConvertOO2OOX.h"
 
-#include "..\..\Common\OfficeFileErrorDescription.h"
+#include "../../Common/OfficeFileErrorDescription.h"
 
-#include <cpdoccore/../../src/docx/docx_package.h>
-#include <cpdoccore/../../src/docx/xlsx_package.h>
-#include <cpdoccore/../../src/docx/pptx_package.h>
+#include "../src/docx/docx_package.h"
+#include "../src/docx/xlsx_package.h"
+#include "../src/docx/pptx_package.h"
 
-#include <cpdoccore/../../src/docx/docx_conversion_context.h>
-#include <cpdoccore/../../src/docx/pptx_conversion_context.h>
-#include <cpdoccore/../../src/docx/xlsxconversioncontext.h>
+#include "../src/docx/docx_conversion_context.h"
+#include "../src/docx/pptx_conversion_context.h"
+#include "../src/docx/xlsxconversioncontext.h"
 
-#include <cpdoccore/odf/odf_document.h>
+#include "../include/cpdoccore/odf/odf_document.h"
 
 
 HRESULT ConvertOds2Xlsx(cpdoccore::odf::odf_document & inputOdf, const std::wstring & dstPath)

ASCOfficeOdfFile/ASCOfficeOdfFile/OfficeOdfFile.cpp

@@ -20,15 +20,9 @@
 
 #include "ConvertOO2OOX.h"
 
-#include "..\..\Common\XmlUtils.h"
+#include "../../Common/XmlUtils.h"
 
-#include "..\..\Common\ASCATLError.h"
-
-#ifdef _DEBUG
-	#pragma comment(lib, "../../ASCImageStudio3/ASCGraphics/OfficeSvmFile/Debug/OfficeSvmFile.lib")
-#else
-	#pragma comment(lib, "../../ASCImageStudio3/ASCGraphics/OfficeSvmFile/Release/OfficeSvmFile.lib")
-#endif
+#include "../../Common/ASCATLError.h"
 
 // :     1   ,      xlsx  docx
 //               0   ,          package

ASCOfficeOdfFile/Test/ASCOfficeOdfFileTest/ASCOfficeOdfFileTest.vcproj

@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)bin/Debug"
-			IntermediateDirectory="$(SolutionDir)output/$(ConfigurationName)/$(ProjectName)"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
 			>
@@ -95,12 +95,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)bin/Release"
-			IntermediateDirectory="$(SolutionDir)output/$(ConfigurationName)/$(ProjectName)"
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -116,11 +115,15 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -138,12 +141,10 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="kernel32.lib $(NoInherit)"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -171,11 +172,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -191,15 +193,11 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -217,10 +215,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="kernel32.lib $(NoInherit)"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				TargetMachine="17"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -249,7 +249,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="1"
@@ -349,7 +349,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -357,7 +357,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"

ASCOfficeOdfFile/formulasconvert/include/cpdoccore/formulasconvert.h

 #pragma once
 
 #include <string>
-#include <cpdoccore/CPScopedPtr.h>
+#include "../../../include/cpdoccore/CPScopedPtr.h"
 
 namespace cpdoccore {
 namespace formulasconvert {

ASCOfficeOdfFile/formulasconvert/src/formulasconvert_oox.cpp

@@ -4,6 +4,7 @@
 #include <boost/regex.hpp>
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
+
 namespace cpdoccore {
 namespace formulasconvert {
 

ASCOfficeOdfFile/include/cpdoccore/CPHash.h

 #ifndef _CPDOCCORE_HASH_H_
 #define _CPDOCCORE_HASH_H_
 
-#include <cpdoccore/CPOptional.h>
+#include "../../include/cpdoccore/CPOptional.h"
 
 namespace boost 
 {

ASCOfficeOdfFile/include/cpdoccore/common/readdocelement.h

@@ -2,7 +2,8 @@
 #define _CPDOCCORE_READDOCELEMENT_H_
 
 #include <string>
-#include <cpdoccore/CPSharedPtr.h>
+
+#include "../CPSharedPtr.h"
 
 namespace cpdoccore { 
 

ASCOfficeOdfFile/include/cpdoccore/odf/odf_document.h

 #pragma once
 
 #include <string>
-#include <cpdoccore/CPSharedPtr.h>
-#include <cpdoccore/CPScopedPtr.h>
+#include "../CPSharedPtr.h"
+#include "../CPScopedPtr.h"
 
 
 struct ProgressCallback;

ASCOfficeOdfFile/include/cpdoccore/xml/attributes.h

-#ifndef _CPDOCCORE_XMLATTRIBUTES_H_
-#define _CPDOCCORE_XMLATTRIBUTES_H_
+#pragma once
 
 #include <string>
 #include <vector>
-#include <cpdoccore/CPSharedPtr.h>
-#include <cpdoccore/CPOptional.h>
 
-#include <logging.h>
+#include "../../cpdoccore/CPSharedPtr.h"
+#include "../../cpdoccore/CPOptional.h"
+#include "../../cpdoccore/xml/xmlchar.h"
 
-#include <boost_string.h>
-#include <cpdoccore/xml/xmlchar.h>
+#include "../../logging.h"
+#include "../../boost_string.h"
 
 #include <boost/variant.hpp>
 #include <boost/foreach.hpp>
@@ -225,5 +224,3 @@ namespace cpdoccore
 
 	}
 }
-
-#endif // #ifndef _CPDOCCORE_XMLATTRIBUTES_H_

ASCOfficeOdfFile/include/cpdoccore/xml/sax.h

@@ -6,8 +6,9 @@
 #include <string>
 #include <exception>
 #include <iosfwd>
-#include <cpdoccore/CPSharedPtr.h>
-#include <cpdoccore/xml/nodetype.h>
+
+#include "../CPSharedPtr.h"
+#include "nodetype.h"
 
 namespace cpdoccore {
 namespace xml {

ASCOfficeOdfFile/include/cpdoccore/xml/serialize.h

@@ -2,7 +2,7 @@
 #define _CPDOCCORE_XML_SERIALIZE_H_
 
 #include <ostream>
-#include <cpdoccore/xml/xmlchar.h>
+#include "xmlchar.h"
 
 namespace cpdoccore {
 namespace xml {

ASCOfficeOdfFile/include/cpdoccore/xml/xmlelement.h

@@ -4,7 +4,8 @@
 #include <string>
 #include <iosfwd>
 #include <sstream>
-#include <cpdoccore/xml/nodetype.h>
+
+#include "nodetype.h"
 
 namespace cpdoccore {
 namespace xml {

ASCOfficeOdfFile/src/common/CPString.cpp

@@ -2,7 +2,7 @@
 
 #include <boost/program_options/detail/convert.hpp>
 
-#include <cpdoccore/CPString.h>
+#include "../../include/cpdoccore/CPString.h"
 #include <cstdlib>
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/common/precompiled_cpcommon.h

@@ -3,6 +3,6 @@
 #include <map>
 
 #include <boost/optional.hpp>
-#include <lexical_cast.h>
+#include "../../include/lexical_cast.h"
 
 static float getDefaultDpi(){return 96;}

ASCOfficeOdfFile/src/common/readdocelement.cpp

 #include "precompiled_cpcommon.h"
 
-#include <cpdoccore/common/readdocelement.h>
-#include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/sax.h>
+#include "../../include/cpdoccore/common/readdocelement.h"
+#include "../../include/cpdoccore/xml/attributes.h"
+#include "../../include/cpdoccore/xml/sax.h"
+
 #include <iostream>
 
 namespace cpdoccore { 

ASCOfficeOdfFile/src/conversionelement.cpp

-#include "precompiled_cpodf.h"
+#include "odf/precompiled_cpodf.h"
 #include "conversionelement.h"
 #include "logging.h"
 

ASCOfficeOdfFile/src/docx/docx_content_type.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "docx_content_type.h"
-#include <cpdoccore/xml/serialize.h>
+#include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/attributes.h>
 #include <boost/foreach.hpp>
 #include "namespaces.h"

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "docx_conversion_context.h"
 #include <boost/foreach.hpp>
 #include <iostream>

ASCOfficeOdfFile/src/docx/docx_conversion_context.h

@@ -2,6 +2,7 @@
 
 #include "../odf/datatypes/stylefamily.h"
 #include "../odf/datatypes/length.h"
+
 #include <boost/unordered_map.hpp>
 #include <boost/shared_ptr.hpp>
 #include <list>

ASCOfficeOdfFile/src/docx/docx_drawing.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "docx_drawing.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include "custom_shape_types_convert.h"
+#include "../odf/datatypes/custom_shape_types_convert.h"
 
 namespace cpdoccore {
 

ASCOfficeOdfFile/src/docx/docx_package.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "docx_package.h"
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>

ASCOfficeOdfFile/src/docx/docx_package.h

@@ -2,8 +2,10 @@
 
 #include <string>
 #include <vector>
-#include <cpdoccore/CPSharedPtr.h>
 #include <boost/foreach.hpp>
+
+#include <cpdoccore/CPSharedPtr.h>
+
 #include "docx_rels.h"
 #include "docx_content_type.h"
 #include "oox_package.h"

ASCOfficeOdfFile/src/docx/docx_rels.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "docx_rels.h"
-#include <cpdoccore/xml/serialize.h>
 #include <cpdoccore/xml/attributes.h>
 #include <boost/foreach.hpp>
 #include "namespaces.h"

ASCOfficeOdfFile/src/docx/docx_table_context.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "docx_conversion_context.h"
 #include "logging.h"
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/headers_footers.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "headers_footers.h"
 #include <boost/foreach.hpp>
 

ASCOfficeOdfFile/src/docx/hyperlinks.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "hyperlinks.h"
 #include "docx_rels.h"
 

ASCOfficeOdfFile/src/docx/measuredigits.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501

ASCOfficeOdfFile/src/docx/mediaitems.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "mediaitems.h"
 
 #include <regex.h>

ASCOfficeOdfFile/src/docx/mediaitems_utils.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "mediaitems_utils.h"
 
 #include <boost/filesystem.hpp>

ASCOfficeOdfFile/src/docx/namespaces.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "namespaces.h"
 
 namespace cpdoccore { 

ASCOfficeOdfFile/src/docx/oox_chart_axis.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 
 
 #include "oox_chart_axis.h"

ASCOfficeOdfFile/src/docx/oox_chart_context.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 
 #include <boost/foreach.hpp>
 #include <vector>

ASCOfficeOdfFile/src/docx/oox_chart_context.h

 #pragma once
 #include "oox_package.h"
+
 #include <cpdoccore/CPNoncopyable.h>
 
 #include <cpdoccore/CPScopedPtr.h>

ASCOfficeOdfFile/src/docx/oox_chart_legend.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 
 #include <boost/foreach.hpp>
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include "..\odf\style_text_properties.h"
+#include "../odf/style_text_properties.h"
 
 #include "oox_chart_series.h"
-#include <cpdoccore/formulasconvert.h>
+#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
 
 #include "oox_chart_shape.h"
 

ASCOfficeOdfFile/src/docx/oox_chart_series.h

@@ -2,7 +2,7 @@
 
 #include <iosfwd>
 #include <cpdoccore/CPOptional.h>
-#include "..\odf\chart_objects.h"
+#include "../odf/chart_objects.h"
 
 #include "oox_chart_values.h"
                  

ASCOfficeOdfFile/src/docx/oox_chart_shape.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>

ASCOfficeOdfFile/src/docx/oox_conversion_context.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "oox_conversion_context.h"
 
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/oox_data_labels.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/oox_drawing.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "oox_drawing.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "../odf/svg_parser.h"

ASCOfficeOdfFile/src/docx/oox_drawing_fills.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "oox_drawing_fills.h"
 
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/oox_layout.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "oox_layout.h"
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>

ASCOfficeOdfFile/src/docx/oox_package.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "oox_package.h"
 
 #include <boost/foreach.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
-#include <utf8cpp/utf8.h>
+#include <cpdoccore/utf8cpp/utf8.h>
 #include <cpdoccore/common/boost_filesystem_version.h>
 
 #include "mediaitems.h"

ASCOfficeOdfFile/src/docx/oox_plot_area.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "oox_plot_area.h"
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include "..\odf\style_text_properties.h"
+#include "../odf/style_text_properties.h"
 
 #include "oox_chart_shape.h"
 

ASCOfficeOdfFile/src/docx/oox_title.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "oox_title.h"
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include "..\odf\style_text_properties.h"
+#include "../odf/style_text_properties.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/oox_types_chart.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "oox_types_chart.h"
 
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/oox_types_chart.h

@@ -2,6 +2,7 @@
 
 #include <iosfwd>
 #include <boost/noncopyable.hpp>
+
 #include <cpdoccore/CPScopedPtr.h>
 #include <cpdoccore/CPSharedPtr.h>
 

ASCOfficeOdfFile/src/docx/pptx_comments.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "pptx_comments.h"
 #include <boost/foreach.hpp>
 #include <vector>

ASCOfficeOdfFile/src/docx/pptx_comments_context.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "pptx_comments_context.h"
 #include <boost/foreach.hpp>
 #include <iostream>

ASCOfficeOdfFile/src/docx/pptx_conversion_context.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "pptx_conversion_context.h"
 
 #include "pptx_package.h"

ASCOfficeOdfFile/src/docx/pptx_drawing.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "pptx_drawing.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include "../odf/datatypes/custom_shape_types_convert.h"

ASCOfficeOdfFile/src/docx/pptx_drawings.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 
 #include <boost/foreach.hpp>
 #include <vector>

ASCOfficeOdfFile/src/docx/pptx_output_xml.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 
 #include "pptx_output_xml.h"
 #include <boost/make_shared.hpp>

ASCOfficeOdfFile/src/docx/pptx_package.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "pptx_package.h"
 #include "pptx_output_xml.h"
 
-#include <utf8cpp/utf8.h>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
+
 #include <cpdoccore/common/boost_filesystem_version.h>
+#include <cpdoccore/utf8cpp/utf8.h>
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/pptx_table_context.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 

ASCOfficeOdfFile/src/docx/pptx_text_context.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 
 #include "pptx_conversion_context.h"
 #include "pptx_text_context.h"

ASCOfficeOdfFile/src/docx/xlsx_alignment.cpp

 #pragma once
-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_alignment.h"
 #include <ostream>
 #include <boost/functional.hpp>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
-#include "..\odf\style_paragraph_properties.h"
-#include "..\odf\style_text_properties.h"
-#include "..\odf\style_table_properties.h"
+#include "../odf/style_paragraph_properties.h"
+#include "../odf/style_text_properties.h"
+#include "../odf/style_table_properties.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_border.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_border.h"
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <cpdoccore/CPHash.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include "..\odf\style_text_properties.h"
+#include "../odf/style_text_properties.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_borders.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_borders.h"
 
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/xlsx_cell_format.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_cell_format.h"
 
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/xlsx_cell_style.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_cell_style.h"
 
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/xlsx_cell_styles.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_cell_styles.h"
 #include "xlsx_cell_style.h"
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/xlsx_color.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_font.h"
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>

ASCOfficeOdfFile/src/docx/xlsx_comments.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_comments.h"
 #include <boost/foreach.hpp>
 #include <vector>

ASCOfficeOdfFile/src/docx/xlsx_comments_context.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_comments_context.h"
 #include "xlsx_table_metrics.h"
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/xlsx_complex_number_format.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_complex_number_format.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/xlsx_defined_names.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_defined_names.h"
 
 #include <vector>
@@ -6,7 +6,8 @@
 #include <boost/functional.hpp>
 #include <boost/unordered_set.hpp>
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include <cpdoccore/formulasconvert.h>
+
+#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_drawing.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_drawing.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include <cpdoccore/xml/utils.h>

ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 #include <cpdoccore/common/boost_filesystem_version.h>
-#include <cpdoccore/formulasconvert.h>
+#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
 
 #include "mediaitems_utils.h"
 

ASCOfficeOdfFile/src/docx/xlsx_drawings.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_drawings.h"
 #include "xlsx_drawing.h"
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/xlsx_fill.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_fill.h"
 
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/xlsx_fills.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 
 #include "xlsx_fill.h"
 #include "xlsx_fills.h"

ASCOfficeOdfFile/src/docx/xlsx_font.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_font.h"
 #include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include "..\odf\style_text_properties.h"
+#include "../odf/style_text_properties.h"
 
 namespace cpdoccore {
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_fonts.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_font.h"
 #include "xlsx_fonts.h"
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/xlsx_hyperlinks.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_hyperlinks.h"
 #include <cpdoccore/xml/simple_xml_writer.h>
-#include <cpdoccore/formulasconvert.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 #include "docx_rels.h"
 
+#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
+
 namespace cpdoccore {
 namespace oox {
 

ASCOfficeOdfFile/src/docx/xlsx_merge_cells.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_merge_cells.h"
 #include "xlsx_utils.h"
 #include <ostream>

ASCOfficeOdfFile/src/docx/xlsx_numFmts.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_numFmts.h"
 
 namespace cpdoccore {

ASCOfficeOdfFile/src/docx/xlsx_num_format_context.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_num_format_context.h"
 #include "xlsx_complex_number_format.h"
 #include <sstream>

ASCOfficeOdfFile/src/docx/xlsx_output_xml.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_output_xml.h"
 #include <boost/make_shared.hpp>
 #include <cpdoccore/xml/simple_xml_writer.h>

ASCOfficeOdfFile/src/docx/xlsx_package.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_package.h"
-#include <utf8cpp/utf8.h>
+
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
+
 #include <cpdoccore/common/boost_filesystem_version.h>
+#include <cpdoccore/utf8cpp/utf8.h>
 
 namespace cpdoccore { 
 namespace oox {

ASCOfficeOdfFile/src/docx/xlsx_package.h

 #pragma once
 
 #include "oox_package.h"
+
 #include <cpdoccore/CPNoncopyable.h>
+
 #include "xlsx_drawings.h"
 #include "xlsx_comments.h"
 

ASCOfficeOdfFile/src/docx/xlsx_protection.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_protection.h"
 #include <ostream>
 #include <boost/functional.hpp>

ASCOfficeOdfFile/src/docx/xlsx_sharedstrings.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_sharedstrings.h"
 #include <boost/foreach.hpp>
 #include <cpdoccore/xml/utils.h>

ASCOfficeOdfFile/src/docx/xlsx_styles.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include <boost/foreach.hpp>
 #include "..\odf\style_text_properties.h"
 #include "..\odf\style_paragraph_properties.h"

ASCOfficeOdfFile/src/docx/xlsx_table_metrics.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_table_metrics.h"
 #include <vector>
 #include <boost/foreach.hpp>

ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_table_state.h"
 #include "logging.h"
 #include "xlsxconversioncontext.h"

ASCOfficeOdfFile/src/docx/xlsx_tablecontext.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_tablecontext.h"
 #include "xlsx_textcontext.h"
 #include "xlsxconversioncontext.h"

ASCOfficeOdfFile/src/docx/xlsx_textcontext.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_textcontext.h"
 #include "xlsxconversioncontext.h"
 #include <iostream>

ASCOfficeOdfFile/src/docx/xlsx_utils.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_utils.h"
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>

ASCOfficeOdfFile/src/docx/xlsx_xf.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 #include "xlsx_xf.h"
 #include <ostream>
 #include <boost/functional.hpp>

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp

-#include "precompiled_cpodf.h"
+#include "../odf/precompiled_cpodf.h"
 
 #include "xlsxconversioncontext.h"
 

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.h

@@ -3,6 +3,7 @@
 
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
+
 #include "oox_conversion_context.h"
 
 #include "xlsx_textcontext.h"

ASCOfficeOdfFile/src/odf/anim_elements.h

@@ -7,8 +7,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 {

ASCOfficeOdfFile/src/odf/chart_build_oox.cpp

@@ -4,14 +4,13 @@
 
 #include "serialize_elements.h"
 #include <cpdoccore/odf/odf_document.h>
-#include <cpdoccore/formulasconvert.h>
+
+#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
 
 #include "style_graphic_properties.h"
 #include "style_chart_properties.h"
 #include "style_text_properties.h"
 
-#include "length.h"
-#include "borderstyle.h"
 #include "odfcontext.h"
 
 #include "draw_common.h"
@@ -19,6 +18,9 @@
 #include "calcs_styles.h"
 #include "chart_build_oox.h"
 
+#include "datatypes/length.h"
+#include "datatypes/borderstyle.h"
+
 namespace cpdoccore { 
 namespace odf {
 

ASCOfficeOdfFile/src/odf/chart_objects.h

 #pragma once
 #include <cpdoccore/xml/attributes.h>
-#include "..\docx\oox_drawing_fills.h"
+#include "../docx/oox_drawing_fills.h"
 //    (  )    xlsx & odf - 
 
 namespace cpdoccore { 

ASCOfficeOdfFile/src/odf/createandread.cpp

@@ -3,7 +3,7 @@
 #include "office_elements_create.h"
 #include <cpdoccore/xml/sax.h>
 #include <sstream>
-#include "logging.h"
+#include <logging.h>
 
 namespace cpdoccore { 
 namespace odf {

ASCOfficeOdfFile/src/odf/datatypes/anchortype.cpp

-#include "precompiled_cpodf.h"
+#include "../precompiled_cpodf.h"
 #include "anchortype.h"
 
 #include <ostream>

ASCOfficeOdfFile/src/odf/datatypes/backgroundcolor.cpp

-#include "precompiled_cpodf.h"
+#include "../precompiled_cpodf.h"
 #include "backgroundcolor.h"
 
 #include <ostream>