git-svn-id:...

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

.gitattributes

@@ -346,6 +346,7 @@ Redist/ASCOfficeFB2File.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeHtmlFile.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeOdfFile.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeOdpFile.dll svn_mime_002dtype=application%2Foctet-stream
+Redist/ASCOfficeOdtFile.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficePDFFile.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficePDFReader.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficePDFWriter.dll svn_mime_002dtype=application%2Foctet-stream

ASCOfficeOdtFile/ASCOfficeOdtFile.rc

@@ -2,7 +2,7 @@
 //
 #include "resource.h"
 #define COMPONENT_NAME "OfficeOdtFile"
-#include "../../../../Common/FileInfo.h"
+#include "../../Common/FileInfo.h"
 #include "version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS

ASCOfficeOdtFile/ASCOfficeOdtFile2005.vcproj

@@ -125,7 +125,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\Redist\VersionControl.exe $(ProjectDir)\version.h"
+				CommandLine="..\Redist\VersionControl.exe $(ProjectDir)\version.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -152,7 +152,7 @@
 				Name="VCCLCompilerTool"
 				EnableIntrinsicFunctions="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".\..\Common\ASCDocxFormat\Source\Utility;.\..\Common\ASCDocxFormat\Source\XML;.\..\Common\ASCDocxFormat\Source\Common;.\..\Common\ASCDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
+				AdditionalIncludeDirectories=".\..\Common;.\..\Common\ASCDocxFormat\Source\Utility;.\..\Common\ASCDocxFormat\Source\XML;.\..\Common\ASCDocxFormat\Source\Common;.\..\Common\ASCDocxFormat\Source\DocxFormat;Source;Source\OdtFormat"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=0"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -213,7 +213,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
+				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;../Redist&quot;"
 			/>
 		</Configuration>
 		<Configuration

ASCOfficeOdtFile/OdtFile.cpp

@@ -67,10 +67,10 @@ HRESULT COdtFile::FinalConstruct()
 {
 	m_pOfficeUtils = NULL;
     HRESULT hr = odfFile_.CoCreateInstance(__uuidof(AVSOfficeOdfFile::COfficeOdfFile));
-	hr = CoCreateInstance(__uuidof(AVSOfficeUtils::COfficeUtils),
+	hr = CoCreateInstance(__uuidof(ASCOfficeUtils::COfficeUtils),
 													NULL, 
 													CLSCTX_INPROC_SERVER, 
-													__uuidof(AVSOfficeUtils::IOfficeUtils), 
+													__uuidof(ASCOfficeUtils::IOfficeUtils), 
 													(void **)&(m_pOfficeUtils));
     return hr;
 }

ASCOfficeOdtFile/OdtFile.h

 #pragma once
 #include "resource.h"       // main symbols
 #include <string>
-#include <./../ASCOfficeODFFile/include/cpdoccore/common/boost_filesystem_version.h>
+#include <boost_filesystem_version.h>
 #include "./../Common/OfficeFileTemplate.h"
 #include "./../Common/OfficeFileErrorDescription.h"
 #include "OdtEvent.h"
@@ -14,11 +14,12 @@
 
 
 #ifdef _DEBUG
-	#import "..\Redist\ASCOfficeUtils.dll" raw_interfaces_only
+	#import "..\Redist\ASCOfficeUtils.dll" rename_namespace("ASCOfficeUtils") raw_interfaces_only
 #else
-	#import "..\Redist\ASCOfficeUtils.dll" raw_interfaces_only
+	#import "..\Redist\ASCOfficeUtils.dll" rename_namespace("ASCOfficeUtils") raw_interfaces_only
 #endif
 
+
 /*
 Compression levels:
 
@@ -86,6 +87,6 @@ private:
 											 const std::wstring & dstFileName);
 
 private:
-	AVSOfficeUtils::IOfficeUtils*		m_pOfficeUtils;
+	ASCOfficeUtils::IOfficeUtils*		m_pOfficeUtils;
     ATL::CComPtr<IAVSOfficeFileTemplate> odfFile_;
 };
\ No newline at end of file

ASCOfficeOdtFile/Projects/Docx2Odt2005.vcproj

@@ -40,7 +40,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-Zm2000"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\..\Common\AvsDocxFormat\Source\Utility;.\..\..\Common\AvsDocxFormat\Source\XML;.\..\..\Common\AvsDocxFormat\Source\Common;.\..\..\Common\AvsDocxFormat\Source\DocxFormat;.\..\Source\OdtFormat;.\..\..\Common\AvsDocxFormat\Source\;.\..\Source\"
+				AdditionalIncludeDirectories=".\..\..\Common;.\..\..\Common\ASCDocxFormat\Source\Utility;.\..\..\Common\ASCDocxFormat\Source\XML;.\..\..\Common\ASCDocxFormat\Source\Common;.\..\..\Common\ASCDocxFormat\Source\DocxFormat;.\..\Source\OdtFormat;.\..\..\Common\ASCDocxFormat\Source\;.\..\Source\"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -105,7 +105,7 @@
 				AdditionalOptions="-Zm512"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=".\..\..\Common\AvsDocxFormat\Source\Utility;.\..\..\Common\AvsDocxFormat\Source\XML;.\..\..\Common\AvsDocxFormat\Source\Common;.\..\..\Common\AvsDocxFormat\Source\DocxFormat;.\..\Source\OdtFormat;.\..\..\Common\AvsDocxFormat\Source\;.\..\Source\"
+				AdditionalIncludeDirectories=".\..\..\Common;.\..\..\Common\ASCDocxFormat\Source\Utility;.\..\..\Common\ASCDocxFormat\Source\XML;.\..\..\Common\ASCDocxFormat\Source\Common;.\..\..\Common\ASCDocxFormat\Source\DocxFormat;.\..\Source\OdtFormat;.\..\..\Common\ASCDocxFormat\Source\;.\..\Source\"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"

ASCOfficeOdtFile/Projects/OdtFormat2005.vcproj

@@ -39,7 +39,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\..\..\Common\AvsDocxFormat\Source\Utility;.\..\..\Common\AvsDocxFormat\Source\XML;.\..\..\Common\AvsDocxFormat\Source\Common"
+				AdditionalIncludeDirectories=".\..\..\Common\ASCDocxFormat\Source\Utility;.\..\..\Common\ASCDocxFormat\Source\XML;.\..\..\Common\ASCDocxFormat\Source\Common;./../../ASCOfficeODFFile/include/cpdoccore/common"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -104,7 +104,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=".\..\..\Common\AvsDocxFormat\Source\Utility;.\..\..\Common\AvsDocxFormat\Source\XML;.\..\..\Common\AvsDocxFormat\Source\Common"
+				AdditionalIncludeDirectories=".\..\..\Common;.\..\..\Common\ASCDocxFormat\Source\Utility;.\..\..\Common\ASCDocxFormat\Source\XML;.\..\..\Common\ASCDocxFormat\Source\Common"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"

ASCOfficeOdtFile/Source/Docx2Odt/Converter.h

@@ -2,7 +2,7 @@
 #ifndef DOCX_2_ODT_CONVERTER_INCLUDE_H_
 #define DOCX_2_ODT_CONVERTER_INCLUDE_H_
 
-#include <boost_filesystem_version.h>
+#include "./../../../ASCOfficeODFFile/include/cpdoccore/common/boost_filesystem_version.h"
 
 
 namespace Odt {

ASCOfficeOdtFile/Source/Docx2Odt/Private/Frame.cpp

@@ -5,7 +5,7 @@
 
 #include "Frame.h"
 #include "NamedStyle.h"
-#include <./../AVSOfficeODFFile/include/cpdoccore/common/boost_filesystem_version.h>
+#include <boost_filesystem_version.h>
 
 
 namespace Docx2Odt

ASCOfficeOdtFile/Source/Docx2Odt/precompiled_docx2odt.h

@@ -5,7 +5,7 @@
 #include <vector>
 
 #include <boost/foreach.hpp>
-#include <boost_filesystem_version.h>
+#include "./../../../ASCOfficeODFFile/include/cpdoccore/common/boost_filesystem_version.h"
 
 #include "Odt.h"
 #include "Docx.h"

ASCOfficeOdtFile/Source/OdtFormat/Folder.h

@@ -3,7 +3,7 @@
 #define ODT_FOLDER_INCLUDE_H_
 
 #include <string>
-#include "property.h"
+#include "../../../Common/ASCDocxFormat/Source/Utility/property.h"
 #include "Manifest/File.h"
 #include "Settings/File.h"
 #include "Meta/File.h"

ASCOfficeOdtFile/Source/OdtFormat/Manifest/OleObjectItem.h

@@ -6,6 +6,7 @@
 #include <boost_filesystem_version.h>
 
 
+
 namespace Odt
 {
 	namespace Manifest

ASCOfficeOdtFile/Source/OdtFormat/precompiled_odtformat.h

@@ -12,6 +12,7 @@
 
 #include <boost/utility.hpp>
 
+//#include "property.h"
 #include "property.h"
 #include "IEnumerable.h"
 #include "IItemable.h"

ASCOfficeOdtFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//101
-#define INTVER 1,0,1,101
-#define STRVER "1,0,1,101\0"
+//103
+#define INTVER 1,0,1,103
+#define STRVER "1,0,1,103\0"

Common/ASCDocxFormat/Projects/DocxFormat2005.vcproj

@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=".\..\Source\Utility;.\..\Source\XML;.\..\Source\Common;..\..\..\..\..\Redist;..\..\..\..\AVSImageStudio3\AVSGraphics\OfficeSvmFile\"
+				AdditionalIncludeDirectories="..\..\Common;.\..\Source\Utility;.\..\Source\XML;.\..\Source\Common;..\..\Redist;..\..\ASCImageStudio3\ASCGraphics\OfficeSvmFile\"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"