AVS->ASC

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

.gitattributes

@@ -227,6 +227,7 @@ OfficeCore/Test/TestConsole/bin/Release/TestConsole.exe svn_mime_002dtype=applic
 OfficeCore/Test/TestConsole/bin/Release/TestConsole.pdb svn_mime_002dtype=application%2Foctet-stream
 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/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

ASCOfficeUtils/ASCOfficeUtils/ASCOfficeUtils.rc

@@ -4,7 +4,7 @@
 #include "version.h"
 
 #define COMPONENT_NAME "OfficeUtils"
-#include "../../../../../Common/FileInfo.h"
+#include "../../Common/FileInfo.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////

ASCOfficeUtils/ASCOfficeUtils/ASCOfficeUtils2005.vcproj

@@ -124,7 +124,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
+				CommandLine="..\..\..\..\..\..\Redist\VersionControl.exe $(ProjectDir)version.h"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -210,7 +210,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
-				CommandLine="copy $(TargetPath) ..\..\..\..\ASC\Redist\ASCOfficeUtils.dll"
+				CommandLine="copy $(TargetPath) ..\..\Redist\ASCOfficeUtils.dll"
 			/>
 		</Configuration>
 		<Configuration

ASCOfficeUtils/ASCOfficeUtils/CSLocker.h

 #pragma once
 
-#include "AVSOfficeCriticalSection.h"
+#include "ASCOfficeCriticalSection.h"
 
 // This class helps to lock/unlock critical section and defend any using code from deadlocks due to unhandled exceptions
 class CSLocker

ASCOfficeUtils/ASCOfficeUtils/OfficeOCR.cpp

 #include "stdafx.h"
-#include "../../../AVSVideoStudio3/Common/AVSUtils.h"
-#include "../../../AVSVideoStudio3/Common/MediaFormatDefine.h"
+#include "../../Common/ASCUtils.h"
+#include "../../Common/MediaFormatDefine.h"
 #include "OfficeOCR.h"
 #include "ImageToPNM.h"
 #include "gocr.h"

ASCOfficeUtils/ASCOfficeUtils/OfficeOCR.h

 #pragma once
 #include "resource.h"
 #include "IOfficeOCR.h"
-#include "../../../AVSVideoStudio3/Common/AVSATLError.h"
+#include "../../Common/ASCATLError.h"
 
 #define OUTPUT_FORMAT_TYPE_XML	0
 #define OUTPUT_FORMAT_TYPE_TEXT	1

ASCOfficeUtils/ASCOfficeUtils/Resource.h

@@ -4,7 +4,7 @@
 //
 
 #define IDS_PROJNAME                    100
-#define IDR_AVSOFFICEUTILS	101
+#define IDR_ASCOFFICEUTILS	101
 
 // Next default values for new objects
 // 

ASCOfficeUtils/ASCOfficeUtils/stdafx.h

@@ -45,7 +45,7 @@
 
 using namespace ATL;
 
-#import "..\..\..\..\Redist\AVSMediaCore3.dll"					named_guids rename_namespace ( "MediaCore" ), raw_interfaces_only
+#import "..\..\..\..\..\..\Redist\AVSMediaCore3.dll"					named_guids rename_namespace ( "MediaCore" ), raw_interfaces_only
 
 #ifdef _DEBUG
 	#pragma comment(lib, "..\\GOCR\\Debug\\GOCR.lib")

ASCOfficeUtils/ASCOfficeUtils/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//15
-#define INTVER 1,0,0,15
-#define STRVER "1,0,0,15\0"
+//17
+#define INTVER 1,0,0,17
+#define STRVER "1,0,0,17\0"