(1.0.0.18) ASC version (full & opensource)

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

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"

ASCOfficeUtils/ASCOfficeUtils/OfficeOCR.cpp

@@ -26,6 +26,7 @@ void COfficeOCR::FinalRelease()
 //  ,  
 STDMETHODIMP COfficeOCR::Recognize ( IUnknown *Image, BSTR* Text )
 {
+#ifdef BUILD_CONFIG_FULL_VERSION
 	if ( NULL == Text )
 		return CAVSATLError::Error ( MEMORY );
 
@@ -92,7 +93,7 @@ STDMETHODIMP COfficeOCR::Recognize ( IUnknown *Image, BSTR* Text )
 		sResult += _T ("</Text>");
 
 	*Text = sResult.AllocSysString();
-
+#endif
 	return S_OK;
 }
 //     (   XML )

ASCOfficeUtils/ASCOfficeUtils/stdafx.h

@@ -45,7 +45,13 @@
 
 using namespace ATL;
 
-#import "..\..\..\..\..\..\Redist\AVSMediaCore3.dll"					named_guids rename_namespace ( "MediaCore" ), raw_interfaces_only
+#include "../../Common/Config.h"
+
+#ifdef BUILD_CONFIG_FULL_VERSION
+#import "../../Redist/ASCMediaCore3.dll"					named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT")
+#else
+#import "../../Redist/OfficeCore.dll"						named_guids raw_interfaces_only rename_namespace("OfficeCore")
+#endif
 
 #ifdef _DEBUG
 	#pragma comment(lib, "..\\GOCR\\Debug\\GOCR.lib")

ASCOfficeUtils/ASCOfficeUtils/version.h

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