git-svn-id:...

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

ASCOfficeDocxFile2/ASCOfficeDocxFile2.cpp

@@ -6,6 +6,6 @@
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{A1EEE61A-FAA7-47af-B078-4E955623B9CA}", 
-		 name = "AVSOfficeDocxFile2", 
-		 helpstring = "AVSOfficeDocxFile2 1.0 Type Library",
-		 resource_name = "IDR_AVSOFFICEDOCXFILE2") ];
+		 name = "ASCOfficeDocxFile2", 
+		 helpstring = "ASCOfficeDocxFile2 1.0 Type Library",
+		 resource_name = "IDR_ASCOFFICEDOCXFILE2") ];
\ No newline at end of file

ASCOfficeDocxFile2/ASCOfficeDocxFile2.rc

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

ASCOfficeDocxFile2/BinReader/FileDownloader.h

 #pragma once
 
-#include "BaseThread.h"
+#include "../../Common/BaseThread.h"
 
 #include <wininet.h>
 #pragma comment(lib, "Wininet")

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -3,7 +3,7 @@
 #include "FileWriter.h"
 #include "../BinWriter/BinReaderWriterDefines.h"
 #include "ReaderClasses.h"
-#include "../../TeamlabOffice/trunk/XlsxSerializerCom/Writer/BinaryReader.h"
+#include "../../XlsxSerializerCom/Writer/BinaryReader.h"
 
 
 using namespace BinDocxRW;

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -4,7 +4,7 @@
 #include "../DocWrapper/FontProcessor.h"
 #include "../../Common/Base64.h"
 #include "../../ASCOfficePPTXFile/Editor/FontCutter.h"
-#include "../../../XlsxSerializerCom/Reader/BinaryWriter.h"
+#include "../../XlsxSerializerCom/Reader/BinaryWriter.h"
 
 namespace BinDocxRW
 {

ASCOfficeDocxFile2/Resource.h

@@ -3,7 +3,7 @@
 // Used by AVSOfficeDocxFile2.rc
 //
 #define IDS_PROJNAME                    100
-#define IDR_AVSOFFICEDOCXFILE2          101
+#define IDR_ASCOFFICEDOCXFILE2          101
 
 #define IDB_DEFAULT_DOC_RELS			201
 #define IDB_DEFAULT_DOC_APP				202

XlsxSerializerCom/Common/Common.h

 #pragma once
-#include "../../../../AVSOfficeStudio/AVSOfficeDocxFile2/BinReader/FileDownloader.h"
+#include "../../ASCOfficeDocxFile2/BinReader/FileDownloader.h"
 
 namespace SerializeCommon
 {

XlsxSerializerCom/Reader/BinaryWriter.h

 #pragma once
-#include "../../../../AVSOfficeStudio/AVSOfficePPTXFile/Editor/BinReaderWriterDefines.h"
+#include "../../ASCOfficePPTXFile/Editor/BinReaderWriterDefines.h"
 
-#include "../../../../AVSOfficeStudio/Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
-#include "../../../../AVSOfficeStudio/Common/DocxFormat/Source/DocxFormat/Drawing/DrawingColors.h"
-#include "../../../../AVSOfficeStudio/Common/OfficeFileFormats.h"
-#include "../../../../../../Common/Base64.h"
+#include "../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h"
+#include "../../Common/DocxFormat/Source/DocxFormat/Drawing/DrawingColors.h"
+#include "../../Common/OfficeFileFormats.h"
+#include "../../Common/Base64.h"
 
 #include "FontProcessor.h"
-#include "../../../AVSOfficeStudio/Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
+#include "../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
 #include "../Common/BinReaderWriterDefines.h"
 #include "../Common/Common.h"
-#include "../../AVSOfficeStudio/AVSOfficePPTXFile/Editor/FontCutter.h"
-#include "../../AVSOfficeStudio/AVSOfficeDocxFile2/BinWriter/StreamUtils.h"
+#include "../../ASCOfficePPTXFile/Editor/FontCutter.h"
+#include "../../ASCOfficeDocxFile2/BinWriter/StreamUtils.h"
 #include "../Writer/BinaryReader.h"
 
 //#define DEFAULT_TABLE_STYLES

XlsxSerializerCom/Reader/FontProcessor.h

 #pragma once
 #include "../stdafx.h"
-#include "../../../AVSOfficeStudio/Common/DocxFormat/Source/XlsxFormat/Styles/Fonts.h"
+#include "../../Common/DocxFormat/Source/XlsxFormat/Styles/Fonts.h"
 
 namespace BinXlsxRW {
 	static TCHAR* gc_sNoNameFont = _T("NoNameFont");

XlsxSerializerCom/Writer/BinaryReader.h

 #pragma once
-#include "../../../../../Common/FileWriter.h"
-#include "../../../../../Common/MappingFile.h"
-#include "../../../../../Common/Base64.h"
-#include "../../../../../Common/ATLDefine.h"
+#include "../../Common/FileWriter.h"
+#include "../../Common/MappingFile.h"
+#include "../../Common/Base64.h"
+#include "../../Common/ATLDefine.h"
 
-#include "../../../AVSOfficeStudio/Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
+#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
 
-#include "../../AVSOfficeStudio/AVSOfficeDocxFile2/BinWriter/StreamUtils.h"
+#include "../../ASCOfficeDocxFile2/BinWriter/StreamUtils.h"
 #include "../Common/BinReaderWriterDefines.h"
 #include "../Common/Common.h"
 

XlsxSerializerCom/stdafx.h

@@ -48,14 +48,14 @@
 #define __USE_XML_COMMON__
 
 using namespace ATL;
-#include "../../../AVSVideoStudio3/Common/AvsUtils.h"
-
-#import "../../../Redist/AVSMediaCore3.dll"						named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT")
-#import "../../../Redist/AVSImageStudio3.dll"					named_guids raw_interfaces_only rename_namespace("AVSImageStudio")
-#import "../../../Redist/AVSGraphics.dll"						named_guids raw_interfaces_only rename_namespace("AVSGraphics")
-#import "../../../Redist/AVSOfficeStudio/AVSOfficeFile.dll"		raw_interfaces_only rename_namespace("AVSOfficeFile")
-#import "../../../Redist/AVSOfficeStudio/AVSFontConverter.dll"	named_guids raw_interfaces_only rename_namespace("Fonts")
-#import "../../../Redist/AVSOfficeStudio/AVSOfficePPTXFile.dll"	raw_interfaces_only rename_namespace("PPTXFile")
+#include "../Common/ASCUtils.h"
+
+#import "../../../../../Redist/AVSMediaCore3.dll"						named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT")
+#import "../../../../../Redist/AVSImageStudio3.dll"					named_guids raw_interfaces_only rename_namespace("AVSImageStudio")
+#import "../../../../../Redist/AVSGraphics.dll"						named_guids raw_interfaces_only rename_namespace("AVSGraphics")
+#import "../../../../../Redist/AVSOfficeStudio/AVSOfficeFile.dll"		raw_interfaces_only rename_namespace("AVSOfficeFile")
+#import "../../../../../Redist/AVSOfficeStudio/AVSFontConverter.dll"	named_guids raw_interfaces_only rename_namespace("Fonts")
+#import "../../../../../Redist/AVSOfficeStudio/AVSOfficePPTXFile.dll"	raw_interfaces_only rename_namespace("PPTXFile")
 
 #include <Gdiplus.h>
 #pragma comment(lib, "gdiplus.lib")