(1.0.0.43): ASCOfficeRtfFile

пересобран с DOMDocument50 и без SelectionLanguage:XPath из за проблем с конвертаций docx->rtf

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

ASCOfficeRtfFile/OOXPictureGraphicReader.h

@@ -80,8 +80,8 @@ public: static bool WriteDataToPicture( CString sPath, RtfPicture& oOutput, CStr
 			if( NULL == vImage.punkVal )
 				return false;
 			//   
-			OfficeCore::IUncompressedFrame* piFrame = NULL;
-			hRes = vImage.punkVal->QueryInterface( __uuidof(OfficeCore::IUncompressedFrame), (void**)&piFrame );
+			MediaCore::IAVSUncompressedVideoFrame* piFrame = NULL;
+			hRes = vImage.punkVal->QueryInterface( __uuidof(MediaCore::IAVSUncompressedVideoFrame), (void**)&piFrame );
 			RELEASEINTERFACE( vImage.punkVal );
 			if( FAILED( hRes ) || NULL == piFrame )
 				return false;

ASCOfficeRtfFile/stdafx.h

@@ -45,4 +45,4 @@ using namespace ATL;
 
 #import "..\Redist\ASCOfficeUtils.dll"		named_guids rename_namespace("ASCOfficeUtils")
 #import "..\Redist\ASCImageStudio3.dll"				named_guids rename_namespace("ImageStudio")
-#import "..\Redist\OfficeCore.dll"					named_guids rename_namespace("OfficeCore"), exclude("tagRECT")
+#import "..\Redist\ASCMediaCore3.dll"					named_guids rename_namespace("MediaCore"), exclude("tagRECT")

ASCOfficeRtfFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //0
-//42
-#define INTVER 1,0,0,42
-#define STRVER "1,0,0,42\0"
+//43
+#define INTVER 1,0,0,43
+#define STRVER "1,0,0,43\0"