git-svn-id:...

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

git-svn-id:...
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52362 954022d7-b5bf-4e40-9824-e11837661b57
cd431bd9 · Ivan.Shulga · Alexander Trofimov · 30103a75 · cd431bd9 · cd431bd9
Commit cd431bd9 authored Nov 22, 2013 by Ivan.Shulga Committed by Alexander Trofimov May 20, 2016
8 changed files
--- a/ASCImageStudio3/ASCGraphics/OfficeSvmFile/ASC/AvsBasic.cpp
+++ b/ASCImageStudio3/ASCGraphics/OfficeSvmFile/ASC/AvsBasic.cpp
--- a/ASCImageStudio3/ASCGraphics/OfficeSvmFile/ASC/AvsBasic.h
+++ b/ASCImageStudio3/ASCGraphics/OfficeSvmFile/ASC/AvsBasic.h
--- a/ASCImageStudio3/ASCGraphics/OfficeSvmFile/ASC/AvsOutputDevice.cpp
+++ b/ASCImageStudio3/ASCGraphics/OfficeSvmFile/ASC/AvsOutputDevice.cpp
--- a/ASCImageStudio3/ASCGraphics/OfficeSvmFile/ASC/AvsOutputDevice.h
+++ b/ASCImageStudio3/ASCGraphics/OfficeSvmFile/ASC/AvsOutputDevice.h
--- a/ASCImageStudio3/ASCGraphics/OfficeSvmFile/ASC/AvsSalGraphics.cpp
+++ b/ASCImageStudio3/ASCGraphics/OfficeSvmFile/ASC/AvsSalGraphics.cpp
--- a/ASCImageStudio3/ASCGraphics/OfficeSvmFile/ASC/AvsStreamReader.h
+++ b/ASCImageStudio3/ASCGraphics/OfficeSvmFile/ASC/AvsStreamReader.h
--- a/ASCImageStudio3/ASCGraphics/OfficeSvmFile/OfficeSvmFile.vcproj
+++ b/ASCImageStudio3/ASCGraphics/OfficeSvmFile/OfficeSvmFile.vcproj
@@ -18,7 +18,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\..\..\Common\AvsDocxFormat\Lib\Debug"
+			OutputDirectory="..\..\..\Common\ASCDocxFormat\Lib\Debug"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\..\Redist;..\..\..\Common;..\..\..\..\..\..\Common;&quot;..\..\..\AVSOfficeUtils\ZLIB\zlib-1.2.3&quot;;Source/vcl/win/inc;Source/vcl/source/gdi;Source\sal\source;Source\sal\inc;Source\i18npool\inc;Source\vcl\inc;Source\tools\inc;AVS"
+				AdditionalIncludeDirectories="..\..\..\..\..\Redist;..\..\..\Common;..\..\..\..\..\..\Common;&quot;..\..\..\ASCOfficeUtils\ZLIB\zlib-1.2.3&quot;;Source/vcl/win/inc;Source/vcl/source/gdi;Source\sal\source;Source\sal\inc;Source\i18npool\inc;Source\vcl\inc;Source\tools\inc;ASC"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WNT"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -80,7 +80,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\..\..\Common\AvsDocxFormat\Lib\Release"
+			OutputDirectory="..\..\..\Common\ASCDocxFormat\Lib\Release"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\..\Redist;..\..\..\Common;..\..\..\..\..\..\Common;&quot;..\..\..\AVSOfficeUtils\ZLIB\zlib-1.2.3&quot;;Source/vcl/win/inc;Source/vcl/source/gdi;Source\sal\source;Source\sal\inc;Source\i18npool\inc;Source\vcl\inc;Source\tools\inc;AVS"
+				AdditionalIncludeDirectories="..\..\..\..\..\Redist;..\..\..\Common;..\..\..\..\..\..\Common;&quot;..\..\..\ASCOfficeUtils\ZLIB\zlib-1.2.3&quot;;Source/vcl/win/inc;Source/vcl/source/gdi;Source\sal\source;Source\sal\inc;Source\i18npool\inc;Source\vcl\inc;Source\tools\inc;ASC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -151,7 +151,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVS\OfficeSvmFile.cpp"
+				RelativePath=".\ASC\OfficeSvmFile.cpp"
 				>
 			</File>
 			<File
@@ -708,38 +708,38 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="AVS"
+			Name="ASC"
 			>
 			<File
-				RelativePath=".\AVS\AvsBasic.cpp"
+				RelativePath=".\ASC\ASCBasic.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\AvsBasic.h"
+				RelativePath=".\ASC\ASCBasic.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\AvsOutputDevice.cpp"
+				RelativePath=".\ASC\ASCOutputDevice.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\AvsOutputDevice.h"
+				RelativePath=".\ASC\ASCOutputDevice.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\AvsStreamReader.h"
+				RelativePath=".\ASC\ASCStreamReader.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\OpenOfficeBasic.h"
+				RelativePath=".\ASC\OpenOfficeBasic.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\WinDefines.h"
+				RelativePath=".\ASC\WinDefines.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\WinStreamReader.h"
+				RelativePath=".\ASC\WinStreamReader.h"
 				>
 			</File>
 		</Filter>

--- a/ASCImageStudio3/ASCGraphics/OfficeSvmFile/OfficeSvmFile2005.vcproj
+++ b/ASCImageStudio3/ASCGraphics/OfficeSvmFile/OfficeSvmFile2005.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\Redist;..\..\..\Common;..\..\..\..\..\..\Common;&quot;..\..\..\AVSOfficeUtils\ZLIB\zlib-1.2.3&quot;;Source/vcl/win/inc;Source/vcl/source/gdi;Source\sal\source;Source\sal\inc;Source\i18npool\inc;Source\vcl\inc;Source\tools\inc;AVS"
+				AdditionalIncludeDirectories="..\..\..\..\Redist;..\..\..\Common;..\..\..\..\..\..\Common;&quot;..\..\..\ASCOfficeUtils\ZLIB\zlib-1.2.3&quot;;Source/vcl/win/inc;Source/vcl/source/gdi;Source\sal\source;Source\sal\inc;Source\i18npool\inc;Source\vcl\inc;Source\tools\inc;ASC"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -105,7 +105,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\Redist;..\..\..\Common;..\..\..\..\..\..\Common;&quot;..\..\..\AVSOfficeUtils\ZLIB\zlib-1.2.3&quot;;Source/vcl/win/inc;Source/vcl/source/gdi;Source\sal\source;Source\sal\inc;Source\i18npool\inc;Source\vcl\inc;Source\tools\inc;AVS"
+				AdditionalIncludeDirectories="..\..\..\..\Redist;..\..\..\Common;..\..\..\..\..\..\Common;&quot;..\..\..\ASCOfficeUtils\ZLIB\zlib-1.2.3&quot;;Source/vcl/win/inc;Source/vcl/source/gdi;Source\sal\source;Source\sal\inc;Source\i18npool\inc;Source\vcl\inc;Source\tools\inc;ASC"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -152,7 +152,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVS\OfficeSvmFile.cpp"
+				RelativePath=".\ASC\OfficeSvmFile.cpp"
 				>
 			</File>
 			<File
@@ -700,38 +700,38 @@
 			</Filter>
 		</Filter>
 		<Filter
-			Name="AVS"
+			Name="ASC"
 			>
 			<File
-				RelativePath=".\AVS\AvsBasic.cpp"
+				RelativePath=".\ASC\ASCBasic.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\AvsBasic.h"
+				RelativePath=".\ASC\ASCBasic.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\AvsOutputDevice.cpp"
+				RelativePath=".\ASC\ASCOutputDevice.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\AvsOutputDevice.h"
+				RelativePath=".\ASC\ASCOutputDevice.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\AvsStreamReader.h"
+				RelativePath=".\ASC\ASCStreamReader.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\OpenOfficeBasic.h"
+				RelativePath=".\ASC\OpenOfficeBasic.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\WinDefines.h"
+				RelativePath=".\ASC\WinDefines.h"
 				>
 			</File>
 			<File
-				RelativePath=".\AVS\WinStreamReader.h"
+				RelativePath=".\ASC\WinStreamReader.h"
 				>
 			</File>
 		</Filter>