AVS->ASC

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

ASCOfficeXPSFile/ASCOfficeXPSFile.rc

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

ASCOfficeXPSFile/ASCOfficeXPSFile.vcproj

@@ -126,7 +126,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
+				CommandLine="..\..\..\..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"

ASCOfficeXPSFile/File.h

 #pragma once
-#include "../../AVSVideoStudio3/Common/AVSUtils.h"
+#include "../Common/ASCUtils.h"
 #include "windows.h"
 
 class CFile 

ASCOfficeXPSFile/OfficeEventsTemplate.h

 #pragma once
-#include "TemporaryCS.h"
+#include "../Common/TemporaryCS.h"
 
 template <class T, class Reciever>
 class COfficeEventTemplate : public T

ASCOfficeXPSFile/OfficeXPSFile.cpp

@@ -22,7 +22,7 @@ HRESULT CXPSFile::FinalConstruct()
 	m_pFolder = NULL;
 	m_pOfficeUtils = NULL;
 
-	if(S_OK != CoCreateInstance( __uuidof(AVSOfficeUtils::COfficeUtils), NULL, CLSCTX_INPROC_SERVER, __uuidof(AVSOfficeUtils::IOfficeUtils),
+	if(S_OK != CoCreateInstance( __uuidof(ASCOfficeUtils::COfficeUtils), NULL, CLSCTX_INPROC_SERVER, __uuidof(ASCOfficeUtils::IOfficeUtils),
 		(void **)&(this->m_pOfficeUtils) ))
 		return S_FALSE;
 
@@ -110,7 +110,7 @@ STDMETHODIMP CXPSFile::LoadFromFile(BSTR sSrcFileName, BSTR sDstPath, BSTR sXMLO
 
 	_bstr_t bs = sDstPath;//m_strTempDirectory;
 
-	OfficeUtilsEvents< AVSOfficeUtils::_IAVSOfficeUtilsEvents, CXPSFile >* oEventUtils = new OfficeUtilsEvents< AVSOfficeUtils::_IAVSOfficeUtilsEvents, CXPSFile >(this);
+	OfficeUtilsEvents< ASCOfficeUtils::_IAVSOfficeUtilsEvents, CXPSFile >* oEventUtils = new OfficeUtilsEvents< ASCOfficeUtils::_IAVSOfficeUtilsEvents, CXPSFile >(this);
 	oEventUtils->AddRef();
 	oEventUtils->Advise( m_pOfficeUtils );
 	

ASCOfficeXPSFile/OfficeXPSFile.h

@@ -5,15 +5,15 @@
 #include ".\..\Common\OfficeFileErrorDescription.h"
 #include ".\..\Common\OfficeDefines.h"
 //#include "XmlUtils.h"
-#include "..\..\AVSImageStudio3\AVSGraphics\Interfaces\XmlUtils.h"
-#include "AVSUtils.h"
+#include "..\..\..\..\AVSImageStudio3\AVSGraphics\Interfaces\XmlUtils.h"
+#include "..\Common\ASCUtils.h"
 #include "XPS.h"
 #include "OfficeUtilsEvents.h"
 #include "File.h"
 
 #include "TemporaryCS.h"
 
-#import "..\..\..\Redist\AVSOfficeStudio\AVSOfficeUtils.dll" raw_interfaces_only
+#import "..\Redist\ASCOfficeUtils.dll" raw_interfaces_only rename_namespace("ASCOfficeUtils")
 //using namespace AVSOfficeUtils;
 //#pragma comment( lib, "XPSLib.lib")
 
@@ -68,7 +68,7 @@ private:
 
 	CRITICAL_SECTION m_oCS;
 
-	AVSOfficeUtils::IOfficeUtils*	m_pOfficeUtils;
+	ASCOfficeUtils::IOfficeUtils*	m_pOfficeUtils;
 	XPS::Folder*					m_pFolder;
 
 public:

ASCOfficeXPSFile/Resource.h

@@ -3,7 +3,7 @@
 // Used by AVSOfficeXPSFile.rc
 //
 #define IDS_PROJNAME                    100
-#define IDR_AVSXPSFILE                  101
+#define IDR_ASCXPSFILE                  101
 
 // Next default values for new objects
 // 

ASCOfficeXPSFile/XPSLib/Source/DrawPageProperties.h

@@ -2,8 +2,8 @@
 #ifndef XPS_DRAWPAGEPROPERTIES_INCLUDE_H_
 #define XPS_DRAWPAGEPROPERTIES_INCLUDE_H_
 
-#import "..\..\..\Redist\AVSGraphics.dll"									named_guids raw_interfaces_only rename_namespace("AVSGraphics")
-#include "..\..\AVSImageStudio3\AVSGraphics\agg\AVSWrapper\Matrix.h"
+#import "..\..\..\..\..\..\..\Redist\AVSGraphics.dll"									named_guids raw_interfaces_only rename_namespace("AVSGraphics")
+#include "..\..\..\..\..\..\AVSImageStudio3\AVSGraphics\agg\AVSWrapper\Matrix.h"
 #include <list>
 
 namespace XPS

ASCOfficeXPSFile/XPSLib/Source/Page.h

@@ -2,7 +2,7 @@
 #ifndef XPS_PAGE_INCLUDE_H_
 #define XPS_PAGE_INCLUDE_H_
 
-#include "..\..\AVSImageStudio3\AVSGraphics\Interfaces\XmlUtils.h"
+#include "..\..\..\..\..\..\AVSImageStudio3\AVSGraphics\Interfaces\XmlUtils.h"
 #include <set>
 #include <boost/shared_ptr.hpp>
 #include "Utils.h"

ASCOfficeXPSFile/XPSLib/XPSLib.vcproj

@@ -61,7 +61,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="..\..\..\AVSImageStudio3\AVSGraphics\Debug\agg2d.lib"
+				AdditionalDependencies="..\..\..\..\..\AVSImageStudio3\AVSGraphics\Debug\agg2d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -123,7 +123,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalDependencies="..\..\..\AVSImageStudio3\AVSGraphics\Release\agg2d.lib"
+				AdditionalDependencies="..\..\..\..\..\AVSImageStudio3\AVSGraphics\Release\agg2d.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"

ASCOfficeXPSFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//22
-#define INTVER 1,0,0,22
-#define STRVER "1,0,0,22\0"
+//23
+#define INTVER 1,0,0,23
+#define STRVER "1,0,0,23\0"

Common/OfficeDrawing/File.h

@@ -2,9 +2,9 @@
 #ifndef _AVS_GRAPHICS_
 #include "../../../../../Common/XmlUtils.h"
 #else
-#include "../../../AVSImageStudio3/AVSGraphics/Interfaces/XmlUtils.h"
+#include "../../../../../AVSImageStudio3/AVSGraphics/Interfaces/XmlUtils.h"
 #endif
-#include "../../../AVSVideoStudio3/Common/AVSUtils.h"
+#include "../ASCUtils.h"
 #include "windows.h"
 
 #ifndef		pow2_16