git-svn-id:...

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

.gitattributes

@@ -396,6 +396,7 @@ Redist/ASCImagePaint3.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCImageStudio3.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCMediaCore3.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCMediaFormatSettings3.dll svn_mime_002dtype=application%2Foctet-stream
+Redist/ASCOfficeDjVuFile.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeDocxFile2.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficeFB2File.dll svn_mime_002dtype=application%2Foctet-stream
 Redist/ASCOfficePDFWriter.dll svn_mime_002dtype=application%2Foctet-stream

ASCOfficeDjVuFile/ASCOfficeDjVuFile.rc

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

ASCOfficeDjVuFile/ASCOfficeDjVuFile.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"
@@ -212,7 +212,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\..\Redist&quot;&#x0D;&#x0A;"
+				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;&#x0D;&#x0A;copy &quot;$(TargetPath)&quot; &quot;$(ProjectDir)..\Redist&quot;&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration

ASCOfficeDjVuFile/OfficeDjVuFile.h

@@ -70,7 +70,7 @@ class ATL_NO_VTABLE CDjVuFile : public IDjVuFile, public IAVSOfficePages
 {
 private:
 	CString m_strTempDirectory;
-	AVSGraphics::IAVSDocumentRenderer* m_pDocumentRenderer;
+	AVSGraphics::IASCDocumentRenderer* m_pDocumentRenderer;
 	//OfficeEditor::IAVSCommandsRenderer* m_pDocumentRenderer;
 	NSImage::CImage m_oImage;
 

ASCOfficeDjVuFile/stdafx.h

@@ -57,11 +57,11 @@
 #pragma comment(lib, "Release\\libdjvu.lib")
 #endif
 
-#import "..\..\Redist\ASCMediaCore3.dll"									named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT")
-#import "..\..\Redist\ASCMediaFormatSettings3.dll"						named_guids raw_interfaces_only rename_namespace("MediaFormat"), exclude("tagRECT")
-#import "..\..\Redist\ASCImageStudio3.dll"								named_guids raw_interfaces_only rename_namespace("ImageStudio")
-//#import "..\..\Redist\ASCOfficeEditor.dll"				named_guids raw_interfaces_only rename_namespace("OfficeEditor")
-#import "..\..\Redist\ASCGraphics.dll"									named_guids raw_interfaces_only rename_namespace("AVSGraphics")
+#import "..\Redist\ASCMediaCore3.dll"									named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT")
+#import "..\Redist\ASCMediaFormatSettings3.dll"						named_guids raw_interfaces_only rename_namespace("MediaFormat"), exclude("tagRECT")
+#import "..\Redist\ASCImageStudio3.dll"								named_guids raw_interfaces_only rename_namespace("ImageStudio")
+//#import "..\Redist\ASCOfficeEditor.dll"				named_guids raw_interfaces_only rename_namespace("OfficeEditor")
+#import "..\Redist\ASCGraphics.dll"									named_guids raw_interfaces_only rename_namespace("AVSGraphics")
 
 
 using namespace ATL;
\ No newline at end of file

ASCOfficeDjVuFile/version.h

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