AVS->ASC

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

.gitattributes

@@ -228,6 +228,7 @@ OfficeCore/Test/TestConsole/bin/Release/TestConsole.pdb svn_mime_002dtype=applic
 Redist/ASCOfficeDocxFile2.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeRtfFile.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeUtils.dll svn_mime_002dtype=application%2Foctet-stream
+Redist/ASCOfficeXlsFile.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/OfficeCore.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/XlsxSerializerCom.dll svn_mime_002dtype=application%2Foctet-stream
 Test/Applications/AVSOfficeDocFileTest/AVSOfficeDocFileTest/AVSDocFileTest.aps svn_mime_002dtype=application%2Foctet-stream

ASCOfficeXlsFile/ASCWorksheetConverter/source/Auxiliary/nullable/nullable.h

@@ -3,7 +3,7 @@
 #include <boost/optional.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/call_traits.hpp>
-#include <Exception/WrongAPIUsage.h>
+#include "../../Exception/WrongAPIUsage.h"
 
 template<typename T>
 class nullable

ASCOfficeXlsFile/ASCWorksheetConverter/source/main/EWSCore_2005.vcproj

@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=""$(SolutionDir)AVSWorksheetConverter\source""
+				AdditionalIncludeDirectories=""$(SolutionDir)ASCWorksheetConverter\source""
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -123,7 +123,7 @@
 				AdditionalOptions="/MP"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=""$(SolutionDir)AVSWorksheetConverter\source""
+				AdditionalIncludeDirectories=""$(SolutionDir)ASCWorksheetConverter\source""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -5051,6 +5051,38 @@
 					RelativePath="..\XLS_logic\Biff_structures\AddinUdf.h"
 					>
 				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\AF12Criteria.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\AF12Criteria.h"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\AFDOper.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\AFDOper.h"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\AFDOperRk.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\AFDOperRk.h"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\AFDOperStr.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\AFDOperStr.h"
+					>
+				</File>
 				<File
 					RelativePath="..\XLS_logic\Biff_structures\AntiMoniker.cpp"
 					>
@@ -5363,6 +5395,14 @@
 					RelativePath="..\XLS_logic\Biff_structures\DXFN12.h"
 					>
 				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\DXFN12List.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\DXFN12List.h"
+					>
+				</File>
 				<File
 					RelativePath="..\XLS_logic\Biff_structures\DXFNum.cpp"
 					>
@@ -5531,6 +5571,22 @@
 					RelativePath="..\XLS_logic\Biff_structures\FactoidType.h"
 					>
 				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\Feat11FdaAutoFilter.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\Feat11FdaAutoFilter.h"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\Feat11FieldDataItem.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\Feat11FieldDataItem.h"
+					>
+				</File>
 				<File
 					RelativePath="..\XLS_logic\Biff_structures\FeatFormulaErr2.cpp"
 					>
@@ -5827,6 +5883,30 @@
 					RelativePath="..\XLS_logic\Biff_structures\LbsDropData.h"
 					>
 				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\List12BlockLevel.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\List12BlockLevel.h"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\List12DisplayName.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\List12DisplayName.h"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\List12TableStyleClientInfo.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\List12TableStyleClientInfo.h"
+					>
+				</File>
 				<File
 					RelativePath="..\XLS_logic\Biff_structures\LongRGB.cpp"
 					>
@@ -6227,6 +6307,14 @@
 					RelativePath="..\XLS_logic\Biff_structures\SyntaxPtg.h"
 					>
 				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\TableFeatureType.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\XLS_logic\Biff_structures\TableFeatureType.h"
+					>
+				</File>
 				<File
 					RelativePath="..\XLS_logic\Biff_structures\URICreateFlags.cpp"
 					>

ASCOfficeXlsFile/ASCWorksheetConverter/source/main/stdafx.h

@@ -62,13 +62,13 @@
 
 // The ones that can be used anywhere
 //#include <Exception/exceptions.h>
-#include <Document/msxml/msxml6.tlh>
-#include <Auxiliary/HelpFunc.h>
-#include <Logging/Log.h>
-#include <Logging/DllLog.h>
-#include <Auxiliary/nullable/nullable.h>
+#include "../Document/msxml/msxml6.tlh"
+#include "../Auxiliary/HelpFunc.h"
+#include "../Logging/Log.h"
+#include "../Logging/DllLog.h"
+#include "../Auxiliary/nullable/nullable.h"
 
-#import "..\..\..\AVSOfficeWeb\wwwroot\Bin\AVSOfficeUtils.dll" named_guids raw_interfaces_only rename_namespace("AVSOfficeUtilsLib")
+#import "..\..\..\..\Redist\ASCOfficeUtils.dll" named_guids raw_interfaces_only rename_namespace("AVSOfficeUtilsLib")
 
 //#include <XLS_logic/Biff_structures/BitMarkedStructs.h>
 

ASCOfficeXlsFile/ASCXlsFile/ASCXlsFile_2005.vcproj

@@ -181,7 +181,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="uafxcw.lib LIBCMT.lib EWSCore.res"
 				OutputFile="../../Redist/$(ProjectName).dll"
-				AdditionalLibraryDirectories=""../ASCWorksheetConverter/lib/$(ConfigurationName)""
+				AdditionalLibraryDirectories=""../ASCWorksheetConverter/lib/$(ConfigurationName)";../ASCXlsFile/libs"
 				MidlCommandFile=""
 				IgnoreEmbeddedIDL="false"
 			/>

ASCOfficeXlsFile/ASCXlsFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//43
-#define INTVER 1,0,0,43
-#define STRVER "1,0,0,43\0"
+//56
+#define INTVER 1,0,0,56
+#define STRVER "1,0,0,56\0"

ASCOfficeXlsFile/Readme.txt

+Used boost 1.43, compiled with commands:
+
+c:\Program Files (x86)\Microsoft Visual Studio 8\SDK\boost_1_43_0>bootstrap
+c:\Program Files (x86)\Microsoft Visual Studio 8\SDK\boost_1_43_0>bjam toolset=msvc-8.0 --build-type=complete link=static runtime-link=static
\ No newline at end of file