Skip to content

O
onlyoffice_core
Commit 1d39d681 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

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

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@61982 954022d7-b5bf-4e40-9824-e11837661b57
parent db5df096
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 616 additions and 555 deletions
ASCOfficeOdfFile/ASCOfficeOdfFile/ASCOfficeOdfFile.vcproj
View file @ 1d39d681
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)output/$(ConfigurationName)/$(ProjectName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
UseOfATL="1" UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" 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" PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=1;USE_LITE_READER;_USE_XMLLITE_READER_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -79,11 +79,10 @@ ...@@ -79,11 +79,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
AdditionalDependencies="XmlLite.lib Msimg32.lib"
OutputFile="$(OutDir)/ASCOfficeOdfFile.dll" OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(SolutionDir)bin&quot;;..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libcmt.lib" IgnoreDefaultLibraryNames=""
MergedIDLBaseFileName="_ASCOfficeOdfFile.idl" MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
...@@ -119,7 +118,7 @@ ...@@ -119,7 +118,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
OutputDirectory="$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
UseOfATL="1" UseOfATL="1"
...@@ -153,7 +152,7 @@ ...@@ -153,7 +152,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="$(SolutionDir)include" AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=1" PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=1"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
...@@ -178,11 +177,10 @@ ...@@ -178,11 +177,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
AdditionalDependencies="XmlLite.lib Msimg32.lib"
OutputFile="$(OutDir)/ASCOfficeOdfFile.dll" OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(SolutionDir)bin&quot;;..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32" AdditionalLibraryDirectories="&quot;$(SolutionDir)bin&quot;;..\..\ASCOfficeUtils\ZLIB\zlib123dll\static32"
IgnoreDefaultLibraryNames="libcmt.lib" IgnoreDefaultLibraryNames=""
MergedIDLBaseFileName="_ASCOfficeOdfFile.idl" MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
...@@ -219,7 +217,7 @@ ...@@ -219,7 +217,7 @@
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/$(ProjectName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
UseOfATL="1" UseOfATL="1"
ATLMinimizesCRunTimeLibraryUsage="false" ATLMinimizesCRunTimeLibraryUsage="false"
...@@ -256,7 +254,7 @@ ...@@ -256,7 +254,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(SolutionDir)include" AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=0" PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=0"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
...@@ -280,11 +278,10 @@ ...@@ -280,11 +278,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
AdditionalDependencies="XmlLite.lib Msimg32.lib"
OutputFile="$(OutDir)/ASCOfficeOdfFile.dll" OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="$(SolutionDir)bin" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libcmt.lib" IgnoreDefaultLibraryNames=""
MergedIDLBaseFileName="_ASCOfficeOdfFile.idl" MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
...@@ -322,7 +319,7 @@ ...@@ -322,7 +319,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2" ConfigurationType="2"
UseOfATL="1" UseOfATL="1"
...@@ -360,7 +357,7 @@ ...@@ -360,7 +357,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
WholeProgramOptimization="true" WholeProgramOptimization="true"
AdditionalIncludeDirectories="$(SolutionDir)include" AdditionalIncludeDirectories=""
PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=0" PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=0"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
...@@ -384,11 +381,10 @@ ...@@ -384,11 +381,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
AdditionalDependencies="XmlLite.lib Msimg32.lib"
OutputFile="$(OutDir)/ASCOfficeOdfFile.dll" OutputFile="$(OutDir)/ASCOfficeOdfFile.dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="$(SolutionDir)bin" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libcmt.lib" IgnoreDefaultLibraryNames=""
MergedIDLBaseFileName="_ASCOfficeOdfFile.idl" MergedIDLBaseFileName="_ASCOfficeOdfFile.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
......
ASCOfficeOdfFile/ASCOfficeOdfFile/ConvertOO2OOX.cpp
View file @ 1d39d681
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
#include "ConvertOO2OOX.h" #include "ConvertOO2OOX.h"
#include "..\..\Common\OfficeFileErrorDescription.h" #include "../../Common/OfficeFileErrorDescription.h"
#include <cpdoccore/../../src/docx/docx_package.h> #include "../src/docx/docx_package.h"
#include <cpdoccore/../../src/docx/xlsx_package.h> #include "../src/docx/xlsx_package.h"
#include <cpdoccore/../../src/docx/pptx_package.h> #include "../src/docx/pptx_package.h"
#include <cpdoccore/../../src/docx/docx_conversion_context.h> #include "../src/docx/docx_conversion_context.h"
#include <cpdoccore/../../src/docx/pptx_conversion_context.h> #include "../src/docx/pptx_conversion_context.h"
#include <cpdoccore/../../src/docx/xlsxconversioncontext.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) HRESULT ConvertOds2Xlsx(cpdoccore::odf::odf_document & inputOdf, const std::wstring & dstPath)
......
ASCOfficeOdfFile/ASCOfficeOdfFile/OfficeOdfFile.cpp
View file @ 1d39d681
...@@ -20,15 +20,9 @@ ...@@ -20,15 +20,9 @@
#include "ConvertOO2OOX.h" #include "ConvertOO2OOX.h"
#include "..\..\Common\XmlUtils.h" #include "../../Common/XmlUtils.h"
#include "..\..\Common\ASCATLError.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
// : 1 , xlsx docx // : 1 , xlsx docx
// 0 , package // 0 , package
......
ASCOfficeOdfFile/Test/ASCOfficeOdfFileTest/ASCOfficeOdfFileTest.vcproj
View file @ 1d39d681
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory="$(SolutionDir)bin/Debug" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)output/$(ConfigurationName)/$(ProjectName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
> >
...@@ -95,12 +95,11 @@ ...@@ -95,12 +95,11 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Debug|x64"
OutputDirectory="$(SolutionDir)bin/Release" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)output/$(ConfigurationName)/$(ProjectName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
...@@ -116,11 +115,15 @@ ...@@ -116,11 +115,15 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE" Optimization="0"
RuntimeLibrary="2" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
...@@ -138,12 +141,10 @@ ...@@ -138,12 +141,10 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="kernel32.lib $(NoInherit)" AdditionalDependencies="kernel32.lib $(NoInherit)"
LinkIncremental="1" LinkIncremental="2"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
OptimizeReferences="2" TargetMachine="17"
EnableCOMDATFolding="2"
TargetMachine="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -171,11 +172,12 @@ ...@@ -171,11 +172,12 @@
/> />
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
WholeProgramOptimization="1"
> >
<Tool <Tool
Name="VCPreBuildEventTool" Name="VCPreBuildEventTool"
...@@ -191,15 +193,11 @@ ...@@ -191,15 +193,11 @@
/> />
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TargetEnvironment="3"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE" RuntimeLibrary="2"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
WarningLevel="3" WarningLevel="3"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="true"
...@@ -217,10 +215,12 @@ ...@@ -217,10 +215,12 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="kernel32.lib $(NoInherit)" AdditionalDependencies="kernel32.lib $(NoInherit)"
LinkIncremental="2" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="1" SubSystem="1"
TargetMachine="17" OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
CharacterSet="1" CharacterSet="1"
...@@ -349,7 +349,7 @@ ...@@ -349,7 +349,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Release|Win32" Name="Debug|x64"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -357,7 +357,7 @@ ...@@ -357,7 +357,7 @@
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
Name="Debug|x64" Name="Release|Win32"
> >
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
......
ASCOfficeOdfFile/formulasconvert/include/cpdoccore/formulasconvert.h
View file @ 1d39d681
#pragma once #pragma once
#include <string> #include <string>
#include <cpdoccore/CPScopedPtr.h> #include "../../../include/cpdoccore/CPScopedPtr.h"
namespace cpdoccore { namespace cpdoccore {
namespace formulasconvert { namespace formulasconvert {
......
ASCOfficeOdfFile/formulasconvert/src/formulasconvert_oox.cpp
View file @ 1d39d681
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
namespace cpdoccore { namespace cpdoccore {
namespace formulasconvert { namespace formulasconvert {
......
ASCOfficeOdfFile/include/cpdoccore/CPHash.h
View file @ 1d39d681
#ifndef _CPDOCCORE_HASH_H_ #ifndef _CPDOCCORE_HASH_H_
#define _CPDOCCORE_HASH_H_ #define _CPDOCCORE_HASH_H_
#include <cpdoccore/CPOptional.h> #include "../../include/cpdoccore/CPOptional.h"
namespace boost namespace boost
{ {
......
ASCOfficeOdfFile/include/cpdoccore/common/readdocelement.h
View file @ 1d39d681
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
#define _CPDOCCORE_READDOCELEMENT_H_ #define _CPDOCCORE_READDOCELEMENT_H_
#include <string> #include <string>
#include <cpdoccore/CPSharedPtr.h>
#include "../CPSharedPtr.h"
namespace cpdoccore { namespace cpdoccore {
......
ASCOfficeOdfFile/include/cpdoccore/odf/odf_document.h
View file @ 1d39d681
#pragma once #pragma once
#include <string> #include <string>
#include <cpdoccore/CPSharedPtr.h> #include "../CPSharedPtr.h"
#include <cpdoccore/CPScopedPtr.h> #include "../CPScopedPtr.h"
struct ProgressCallback; struct ProgressCallback;
......
ASCOfficeOdfFile/include/cpdoccore/xml/attributes.h
View file @ 1d39d681
#ifndef _CPDOCCORE_XMLATTRIBUTES_H_ #pragma once
#define _CPDOCCORE_XMLATTRIBUTES_H_
#include <string> #include <string>
#include <vector> #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 "../../logging.h"
#include <cpdoccore/xml/xmlchar.h> #include "../../boost_string.h"
#include <boost/variant.hpp> #include <boost/variant.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
...@@ -225,5 +224,3 @@ namespace cpdoccore ...@@ -225,5 +224,3 @@ namespace cpdoccore
} }
} }
#endif // #ifndef _CPDOCCORE_XMLATTRIBUTES_H_
ASCOfficeOdfFile/include/cpdoccore/xml/sax.h
View file @ 1d39d681
...@@ -6,8 +6,9 @@ ...@@ -6,8 +6,9 @@
#include <string> #include <string>
#include <exception> #include <exception>
#include <iosfwd> #include <iosfwd>
#include <cpdoccore/CPSharedPtr.h>
#include <cpdoccore/xml/nodetype.h> #include "../CPSharedPtr.h"
#include "nodetype.h"
namespace cpdoccore { namespace cpdoccore {
namespace xml { namespace xml {
......
ASCOfficeOdfFile/include/cpdoccore/xml/serialize.h
View file @ 1d39d681
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define _CPDOCCORE_XML_SERIALIZE_H_ #define _CPDOCCORE_XML_SERIALIZE_H_
#include <ostream> #include <ostream>
#include <cpdoccore/xml/xmlchar.h> #include "xmlchar.h"
namespace cpdoccore { namespace cpdoccore {
namespace xml { namespace xml {
......
ASCOfficeOdfFile/include/cpdoccore/xml/xmlelement.h
View file @ 1d39d681
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
#include <string> #include <string>
#include <iosfwd> #include <iosfwd>
#include <sstream> #include <sstream>
#include <cpdoccore/xml/nodetype.h>
#include "nodetype.h"
namespace cpdoccore { namespace cpdoccore {
namespace xml { namespace xml {
......
ASCOfficeOdfFile/src/common/CPString.cpp
View file @ 1d39d681
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <boost/program_options/detail/convert.hpp> #include <boost/program_options/detail/convert.hpp>
#include <cpdoccore/CPString.h> #include "../../include/cpdoccore/CPString.h"
#include <cstdlib> #include <cstdlib>
namespace cpdoccore { namespace cpdoccore {
......
ASCOfficeOdfFile/src/common/precompiled_cpcommon.h
View file @ 1d39d681
...@@ -3,6 +3,6 @@ ...@@ -3,6 +3,6 @@
#include <map> #include <map>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <lexical_cast.h> #include "../../include/lexical_cast.h"
static float getDefaultDpi(){return 96;} static float getDefaultDpi(){return 96;}
ASCOfficeOdfFile/src/common/readdocelement.cpp
View file @ 1d39d681
#include "precompiled_cpcommon.h" #include "precompiled_cpcommon.h"
#include <cpdoccore/common/readdocelement.h> #include "../../include/cpdoccore/common/readdocelement.h"
#include <cpdoccore/xml/attributes.h> #include "../../include/cpdoccore/xml/attributes.h"
#include <cpdoccore/xml/sax.h> #include "../../include/cpdoccore/xml/sax.h"
#include <iostream> #include <iostream>
namespace cpdoccore { namespace cpdoccore {
......
ASCOfficeOdfFile/src/conversionelement.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "odf/precompiled_cpodf.h"
#include "conversionelement.h" #include "conversionelement.h"
#include "logging.h" #include "logging.h"
......
ASCOfficeOdfFile/src/docx/docx_content_type.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "docx_content_type.h" #include "docx_content_type.h"
#include <cpdoccore/xml/serialize.h> #include <cpdoccore/xml/attributes.h>
#include <cpdoccore/xml/attributes.h> #include <cpdoccore/xml/attributes.h>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include "namespaces.h" #include "namespaces.h"
......
ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "docx_conversion_context.h" #include "docx_conversion_context.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <iostream> #include <iostream>
......
ASCOfficeOdfFile/src/docx/docx_conversion_context.h
View file @ 1d39d681
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include "../odf/datatypes/stylefamily.h" #include "../odf/datatypes/stylefamily.h"
#include "../odf/datatypes/length.h" #include "../odf/datatypes/length.h"
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <list> #include <list>
......
ASCOfficeOdfFile/src/docx/docx_drawing.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "docx_drawing.h" #include "docx_drawing.h"
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
#include "custom_shape_types_convert.h" #include "../odf/datatypes/custom_shape_types_convert.h"
namespace cpdoccore { namespace cpdoccore {
......
ASCOfficeOdfFile/src/docx/docx_package.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "docx_package.h" #include "docx_package.h"
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp> #include <boost/filesystem/fstream.hpp>
......
ASCOfficeOdfFile/src/docx/docx_package.h
View file @ 1d39d681
...@@ -2,8 +2,10 @@ ...@@ -2,8 +2,10 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <cpdoccore/CPSharedPtr.h>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <cpdoccore/CPSharedPtr.h>
#include "docx_rels.h" #include "docx_rels.h"
#include "docx_content_type.h" #include "docx_content_type.h"
#include "oox_package.h" #include "oox_package.h"
......
ASCOfficeOdfFile/src/docx/docx_rels.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "docx_rels.h" #include "docx_rels.h"
#include <cpdoccore/xml/serialize.h>
#include <cpdoccore/xml/attributes.h> #include <cpdoccore/xml/attributes.h>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include "namespaces.h" #include "namespaces.h"
......
ASCOfficeOdfFile/src/docx/docx_table_context.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "docx_conversion_context.h" #include "docx_conversion_context.h"
#include "logging.h" #include "logging.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
......
ASCOfficeOdfFile/src/docx/headers_footers.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "headers_footers.h" #include "headers_footers.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
......
ASCOfficeOdfFile/src/docx/hyperlinks.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "hyperlinks.h" #include "hyperlinks.h"
#include "docx_rels.h" #include "docx_rels.h"
......
ASCOfficeOdfFile/src/docx/measuredigits.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0501 #define _WIN32_WINNT 0x0501
......
ASCOfficeOdfFile/src/docx/mediaitems.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "mediaitems.h" #include "mediaitems.h"
#include <regex.h> #include <regex.h>
......
ASCOfficeOdfFile/src/docx/mediaitems_utils.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "mediaitems_utils.h" #include "mediaitems_utils.h"
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
......
ASCOfficeOdfFile/src/docx/namespaces.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "namespaces.h" #include "namespaces.h"
namespace cpdoccore { namespace cpdoccore {
......
ASCOfficeOdfFile/src/docx/oox_chart_axis.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "oox_chart_axis.h" #include "oox_chart_axis.h"
......
ASCOfficeOdfFile/src/docx/oox_chart_context.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <vector> #include <vector>
......
ASCOfficeOdfFile/src/docx/oox_chart_context.h
View file @ 1d39d681
#pragma once #pragma once
#include "oox_package.h" #include "oox_package.h"
#include <cpdoccore/CPNoncopyable.h> #include <cpdoccore/CPNoncopyable.h>
#include <cpdoccore/CPScopedPtr.h> #include <cpdoccore/CPScopedPtr.h>
......
ASCOfficeOdfFile/src/docx/oox_chart_legend.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/functional.hpp> #include <boost/functional.hpp>
......
ASCOfficeOdfFile/src/docx/oox_chart_series.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <cpdoccore/xml/simple_xml_writer.h> #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 "oox_chart_series.h"
#include <cpdoccore/formulasconvert.h> #include "../formulasconvert/include/cpdoccore/formulasconvert.h"
#include "oox_chart_shape.h" #include "oox_chart_shape.h"
......
ASCOfficeOdfFile/src/docx/oox_chart_series.h
View file @ 1d39d681
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include <iosfwd> #include <iosfwd>
#include <cpdoccore/CPOptional.h> #include <cpdoccore/CPOptional.h>
#include "..\odf\chart_objects.h" #include "../odf/chart_objects.h"
#include "oox_chart_values.h" #include "oox_chart_values.h"
......
ASCOfficeOdfFile/src/docx/oox_chart_shape.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/functional.hpp> #include <boost/functional.hpp>
......
ASCOfficeOdfFile/src/docx/oox_conversion_context.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "oox_conversion_context.h" #include "oox_conversion_context.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
......
ASCOfficeOdfFile/src/docx/oox_data_labels.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include <cpdoccore/CPHash.h> #include <cpdoccore/CPHash.h>
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
......
ASCOfficeOdfFile/src/docx/oox_drawing.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "oox_drawing.h" #include "oox_drawing.h"
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
#include "../odf/svg_parser.h" #include "../odf/svg_parser.h"
......
ASCOfficeOdfFile/src/docx/oox_drawing_fills.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "oox_drawing_fills.h" #include "oox_drawing_fills.h"
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
......
ASCOfficeOdfFile/src/docx/oox_layout.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "oox_layout.h" #include "oox_layout.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/functional.hpp> #include <boost/functional.hpp>
......
ASCOfficeOdfFile/src/docx/oox_package.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "oox_package.h" #include "oox_package.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp> #include <boost/filesystem/fstream.hpp>
#include <utf8cpp/utf8.h> #include <cpdoccore/utf8cpp/utf8.h>
#include <cpdoccore/common/boost_filesystem_version.h> #include <cpdoccore/common/boost_filesystem_version.h>
#include "mediaitems.h" #include "mediaitems.h"
......
ASCOfficeOdfFile/src/docx/oox_plot_area.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "oox_plot_area.h" #include "oox_plot_area.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/functional.hpp> #include <boost/functional.hpp>
#include <cpdoccore/CPHash.h> #include <cpdoccore/CPHash.h>
#include <cpdoccore/xml/simple_xml_writer.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" #include "oox_chart_shape.h"
......
ASCOfficeOdfFile/src/docx/oox_title.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "oox_title.h" #include "oox_title.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/functional.hpp> #include <boost/functional.hpp>
#include <cpdoccore/CPHash.h> #include <cpdoccore/CPHash.h>
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
#include "..\odf\style_text_properties.h" #include "../odf/style_text_properties.h"
namespace cpdoccore { namespace cpdoccore {
namespace oox { namespace oox {
......
ASCOfficeOdfFile/src/docx/oox_types_chart.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "oox_types_chart.h" #include "oox_types_chart.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
......
ASCOfficeOdfFile/src/docx/oox_types_chart.h
View file @ 1d39d681
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <iosfwd> #include <iosfwd>
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <cpdoccore/CPScopedPtr.h> #include <cpdoccore/CPScopedPtr.h>
#include <cpdoccore/CPSharedPtr.h> #include <cpdoccore/CPSharedPtr.h>
......
ASCOfficeOdfFile/src/docx/pptx_comments.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "pptx_comments.h" #include "pptx_comments.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <vector> #include <vector>
......
ASCOfficeOdfFile/src/docx/pptx_comments_context.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "pptx_comments_context.h" #include "pptx_comments_context.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <iostream> #include <iostream>
......
ASCOfficeOdfFile/src/docx/pptx_conversion_context.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "pptx_conversion_context.h" #include "pptx_conversion_context.h"
#include "pptx_package.h" #include "pptx_package.h"
......
ASCOfficeOdfFile/src/docx/pptx_drawing.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "pptx_drawing.h" #include "pptx_drawing.h"
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
#include "../odf/datatypes/custom_shape_types_convert.h" #include "../odf/datatypes/custom_shape_types_convert.h"
......
ASCOfficeOdfFile/src/docx/pptx_drawings.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <vector> #include <vector>
......
ASCOfficeOdfFile/src/docx/pptx_output_xml.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "pptx_output_xml.h" #include "pptx_output_xml.h"
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
......
ASCOfficeOdfFile/src/docx/pptx_package.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "pptx_package.h" #include "pptx_package.h"
#include "pptx_output_xml.h" #include "pptx_output_xml.h"
#include <utf8cpp/utf8.h>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp> #include <boost/filesystem/fstream.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <cpdoccore/common/boost_filesystem_version.h> #include <cpdoccore/common/boost_filesystem_version.h>
#include <cpdoccore/utf8cpp/utf8.h>
namespace cpdoccore { namespace cpdoccore {
namespace oox { namespace oox {
......
ASCOfficeOdfFile/src/docx/pptx_slide_context.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <iostream> #include <iostream>
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
......
ASCOfficeOdfFile/src/docx/pptx_table_context.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <iostream> #include <iostream>
......
ASCOfficeOdfFile/src/docx/pptx_text_context.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "pptx_conversion_context.h" #include "pptx_conversion_context.h"
#include "pptx_text_context.h" #include "pptx_text_context.h"
......
ASCOfficeOdfFile/src/docx/xlsx_alignment.cpp
View file @ 1d39d681
#pragma once #pragma once
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_alignment.h" #include "xlsx_alignment.h"
#include <ostream> #include <ostream>
#include <boost/functional.hpp> #include <boost/functional.hpp>
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
#include "..\odf\style_paragraph_properties.h" #include "../odf/style_paragraph_properties.h"
#include "..\odf\style_text_properties.h" #include "../odf/style_text_properties.h"
#include "..\odf\style_table_properties.h" #include "../odf/style_table_properties.h"
namespace cpdoccore { namespace cpdoccore {
namespace oox { namespace oox {
......
ASCOfficeOdfFile/src/docx/xlsx_border.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_border.h" #include "xlsx_border.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/functional.hpp> #include <boost/functional.hpp>
#include <cpdoccore/CPHash.h> #include <cpdoccore/CPHash.h>
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
#include "..\odf\style_text_properties.h" #include "../odf/style_text_properties.h"
namespace cpdoccore { namespace cpdoccore {
namespace oox { namespace oox {
......
ASCOfficeOdfFile/src/docx/xlsx_borders.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_borders.h" #include "xlsx_borders.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
......
ASCOfficeOdfFile/src/docx/xlsx_cell_format.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_cell_format.h" #include "xlsx_cell_format.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
......
ASCOfficeOdfFile/src/docx/xlsx_cell_style.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_cell_style.h" #include "xlsx_cell_style.h"
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
......
ASCOfficeOdfFile/src/docx/xlsx_cell_styles.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_cell_styles.h" #include "xlsx_cell_styles.h"
#include "xlsx_cell_style.h" #include "xlsx_cell_style.h"
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
......
ASCOfficeOdfFile/src/docx/xlsx_color.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_font.h" #include "xlsx_font.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
......
ASCOfficeOdfFile/src/docx/xlsx_comments.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_comments.h" #include "xlsx_comments.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <vector> #include <vector>
......
ASCOfficeOdfFile/src/docx/xlsx_comments_context.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_comments_context.h" #include "xlsx_comments_context.h"
#include "xlsx_table_metrics.h" #include "xlsx_table_metrics.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
......
ASCOfficeOdfFile/src/docx/xlsx_complex_number_format.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_complex_number_format.h" #include "xlsx_complex_number_format.h"
namespace cpdoccore { namespace cpdoccore {
......
ASCOfficeOdfFile/src/docx/xlsx_defined_names.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_defined_names.h" #include "xlsx_defined_names.h"
#include <vector> #include <vector>
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
#include <boost/functional.hpp> #include <boost/functional.hpp>
#include <boost/unordered_set.hpp> #include <boost/unordered_set.hpp>
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
#include <cpdoccore/formulasconvert.h>
#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
namespace cpdoccore { namespace cpdoccore {
namespace oox { namespace oox {
......
ASCOfficeOdfFile/src/docx/xlsx_drawing.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_drawing.h" #include "xlsx_drawing.h"
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
#include <cpdoccore/xml/utils.h> #include <cpdoccore/xml/utils.h>
......
ASCOfficeOdfFile/src/docx/xlsx_drawing_context.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <iostream> #include <iostream>
#include <cpdoccore/common/boost_filesystem_version.h> #include <cpdoccore/common/boost_filesystem_version.h>
#include <cpdoccore/formulasconvert.h> #include "../formulasconvert/include/cpdoccore/formulasconvert.h"
#include "mediaitems_utils.h" #include "mediaitems_utils.h"
......
ASCOfficeOdfFile/src/docx/xlsx_drawings.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_drawings.h" #include "xlsx_drawings.h"
#include "xlsx_drawing.h" #include "xlsx_drawing.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
......
ASCOfficeOdfFile/src/docx/xlsx_fill.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_fill.h" #include "xlsx_fill.h"
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
......
ASCOfficeOdfFile/src/docx/xlsx_fills.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_fill.h" #include "xlsx_fill.h"
#include "xlsx_fills.h" #include "xlsx_fills.h"
......
ASCOfficeOdfFile/src/docx/xlsx_font.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_font.h" #include "xlsx_font.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/functional.hpp> #include <boost/functional.hpp>
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
#include "..\odf\style_text_properties.h" #include "../odf/style_text_properties.h"
namespace cpdoccore { namespace cpdoccore {
namespace oox { namespace oox {
......
ASCOfficeOdfFile/src/docx/xlsx_fonts.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_font.h" #include "xlsx_font.h"
#include "xlsx_fonts.h" #include "xlsx_fonts.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
......
ASCOfficeOdfFile/src/docx/xlsx_hyperlinks.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_hyperlinks.h" #include "xlsx_hyperlinks.h"
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
#include <cpdoccore/formulasconvert.h>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include "docx_rels.h" #include "docx_rels.h"
#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
namespace cpdoccore { namespace cpdoccore {
namespace oox { namespace oox {
......
ASCOfficeOdfFile/src/docx/xlsx_merge_cells.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_merge_cells.h" #include "xlsx_merge_cells.h"
#include "xlsx_utils.h" #include "xlsx_utils.h"
#include <ostream> #include <ostream>
......
ASCOfficeOdfFile/src/docx/xlsx_numFmts.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_numFmts.h" #include "xlsx_numFmts.h"
namespace cpdoccore { namespace cpdoccore {
......
ASCOfficeOdfFile/src/docx/xlsx_num_format_context.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_num_format_context.h" #include "xlsx_num_format_context.h"
#include "xlsx_complex_number_format.h" #include "xlsx_complex_number_format.h"
#include <sstream> #include <sstream>
......
ASCOfficeOdfFile/src/docx/xlsx_output_xml.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_output_xml.h" #include "xlsx_output_xml.h"
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
#include <cpdoccore/xml/simple_xml_writer.h> #include <cpdoccore/xml/simple_xml_writer.h>
......
ASCOfficeOdfFile/src/docx/xlsx_package.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_package.h" #include "xlsx_package.h"
#include <utf8cpp/utf8.h>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp> #include <boost/filesystem/fstream.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <cpdoccore/common/boost_filesystem_version.h> #include <cpdoccore/common/boost_filesystem_version.h>
#include <cpdoccore/utf8cpp/utf8.h>
namespace cpdoccore { namespace cpdoccore {
namespace oox { namespace oox {
......
ASCOfficeOdfFile/src/docx/xlsx_package.h
View file @ 1d39d681
#pragma once #pragma once
#include "oox_package.h" #include "oox_package.h"
#include <cpdoccore/CPNoncopyable.h> #include <cpdoccore/CPNoncopyable.h>
#include "xlsx_drawings.h" #include "xlsx_drawings.h"
#include "xlsx_comments.h" #include "xlsx_comments.h"
......
ASCOfficeOdfFile/src/docx/xlsx_protection.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_protection.h" #include "xlsx_protection.h"
#include <ostream> #include <ostream>
#include <boost/functional.hpp> #include <boost/functional.hpp>
......
ASCOfficeOdfFile/src/docx/xlsx_sharedstrings.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_sharedstrings.h" #include "xlsx_sharedstrings.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <cpdoccore/xml/utils.h> #include <cpdoccore/xml/utils.h>
......
ASCOfficeOdfFile/src/docx/xlsx_styles.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include "..\odf\style_text_properties.h" #include "..\odf\style_text_properties.h"
#include "..\odf\style_paragraph_properties.h" #include "..\odf\style_paragraph_properties.h"
......
ASCOfficeOdfFile/src/docx/xlsx_table_metrics.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_table_metrics.h" #include "xlsx_table_metrics.h"
#include <vector> #include <vector>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
......
ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_table_state.h" #include "xlsx_table_state.h"
#include "logging.h" #include "logging.h"
#include "xlsxconversioncontext.h" #include "xlsxconversioncontext.h"
......
ASCOfficeOdfFile/src/docx/xlsx_tablecontext.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_tablecontext.h" #include "xlsx_tablecontext.h"
#include "xlsx_textcontext.h" #include "xlsx_textcontext.h"
#include "xlsxconversioncontext.h" #include "xlsxconversioncontext.h"
......
ASCOfficeOdfFile/src/docx/xlsx_textcontext.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_textcontext.h" #include "xlsx_textcontext.h"
#include "xlsxconversioncontext.h" #include "xlsxconversioncontext.h"
#include <iostream> #include <iostream>
......
ASCOfficeOdfFile/src/docx/xlsx_utils.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_utils.h" #include "xlsx_utils.h"
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
......
ASCOfficeOdfFile/src/docx/xlsx_xf.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsx_xf.h" #include "xlsx_xf.h"
#include <ostream> #include <ostream>
#include <boost/functional.hpp> #include <boost/functional.hpp>
......
ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../odf/precompiled_cpodf.h"
#include "xlsxconversioncontext.h" #include "xlsxconversioncontext.h"
......
ASCOfficeOdfFile/src/docx/xlsxconversioncontext.h
View file @ 1d39d681
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include "oox_conversion_context.h" #include "oox_conversion_context.h"
#include "xlsx_textcontext.h" #include "xlsx_textcontext.h"
......
ASCOfficeOdfFile/src/odf/anim_elements.h
View file @ 1d39d681
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#include "office_elements.h" #include "office_elements.h"
#include "office_elements_create.h" #include "office_elements_create.h"
#include "common_attlists.h" #include "datatypes/common_attlists.h"
#include "smil_transitiontype.h" #include "datatypes/smil_transitiontype.h"
namespace cpdoccore { namespace cpdoccore {
namespace odf { namespace odf {
......
ASCOfficeOdfFile/src/odf/chart_build_oox.cpp
View file @ 1d39d681
...@@ -4,14 +4,13 @@ ...@@ -4,14 +4,13 @@
#include "serialize_elements.h" #include "serialize_elements.h"
#include <cpdoccore/odf/odf_document.h> #include <cpdoccore/odf/odf_document.h>
#include <cpdoccore/formulasconvert.h>
#include "../formulasconvert/include/cpdoccore/formulasconvert.h"
#include "style_graphic_properties.h" #include "style_graphic_properties.h"
#include "style_chart_properties.h" #include "style_chart_properties.h"
#include "style_text_properties.h" #include "style_text_properties.h"
#include "length.h"
#include "borderstyle.h"
#include "odfcontext.h" #include "odfcontext.h"
#include "draw_common.h" #include "draw_common.h"
...@@ -19,6 +18,9 @@ ...@@ -19,6 +18,9 @@
#include "calcs_styles.h" #include "calcs_styles.h"
#include "chart_build_oox.h" #include "chart_build_oox.h"
#include "datatypes/length.h"
#include "datatypes/borderstyle.h"
namespace cpdoccore { namespace cpdoccore {
namespace odf { namespace odf {
......
ASCOfficeOdfFile/src/odf/chart_objects.h
View file @ 1d39d681
#pragma once #pragma once
#include <cpdoccore/xml/attributes.h> #include <cpdoccore/xml/attributes.h>
#include "..\docx\oox_drawing_fills.h" #include "../docx/oox_drawing_fills.h"
// ( ) xlsx & odf - // ( ) xlsx & odf -
namespace cpdoccore { namespace cpdoccore {
......
ASCOfficeOdfFile/src/odf/createandread.cpp
View file @ 1d39d681
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include "office_elements_create.h" #include "office_elements_create.h"
#include <cpdoccore/xml/sax.h> #include <cpdoccore/xml/sax.h>
#include <sstream> #include <sstream>
#include "logging.h" #include <logging.h>
namespace cpdoccore { namespace cpdoccore {
namespace odf { namespace odf {
......
ASCOfficeOdfFile/src/odf/datatypes/anchortype.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../precompiled_cpodf.h"
#include "anchortype.h" #include "anchortype.h"
#include <ostream> #include <ostream>
......
ASCOfficeOdfFile/src/odf/datatypes/backgroundcolor.cpp
View file @ 1d39d681
#include "precompiled_cpodf.h" #include "../precompiled_cpodf.h"
#include "backgroundcolor.h" #include "backgroundcolor.h"
#include <ostream> #include <ostream>
......
ASCOfficeOdfFile/src/odf/datatypes/bool.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/datatypes/errors.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/draw_common.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/draw_common.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/draw_frame.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/draw_frame.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/draw_page.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/draw_shapes.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/draw_shapes.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/font_face.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/header_footer.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/logging.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/note.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/number_style.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/number_style.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/odfcontext.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/office_body.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/office_chart.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/office_chart.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/office_elements.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/office_scripts.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/office_text.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/ruby.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/ruby.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/style_map.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/style_map.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/style_regions.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/styles.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/styles.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/styles_list.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/styles_list.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/svg_parser.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/table.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/table.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/table_docx.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/table_pptx.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/table_xlsx.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/text_content.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/text_content.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/text_elements.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/odf/text_elements.h
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/xml/attributes.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/xml/sax.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/xml/utils.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/src/xml/xmlchar.cpp
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/win32/cpcommon.vcproj
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/win32/cpodf.vcproj
View file @ 1d39d681
This diff is collapsed.
ASCOfficeOdfFile/win32/cpxml.vcproj
View file @ 1d39d681
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7