From 1468e41c01b44eaa174c9e2e5e8ed47de8ac9493 Mon Sep 17 00:00:00 2001 From: "Ivan.Shulga" Date: Thu, 21 Nov 2013 11:14:07 +0000 Subject: [PATCH] deleted dependency from AVSMediaCore git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52321 954022d7-b5bf-4e40-9824-e11837661b57 --- ASCOfficeRtfFile/OOXPictureGraphicReader.h | 4 ++-- ASCOfficeRtfFile/stdafx.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ASCOfficeRtfFile/OOXPictureGraphicReader.h b/ASCOfficeRtfFile/OOXPictureGraphicReader.h index a79d71864c..715fd902e0 100644 --- a/ASCOfficeRtfFile/OOXPictureGraphicReader.h +++ b/ASCOfficeRtfFile/OOXPictureGraphicReader.h @@ -80,8 +80,8 @@ public: static bool WriteDataToPicture( CString sPath, RtfPicture& oOutput, CStr if( NULL == vImage.punkVal ) return false; //выставляем свойства из медиадаты - MediaCore::IAVSUncompressedVideoFrame* piFrame = NULL; - hRes = vImage.punkVal->QueryInterface( __uuidof(MediaCore::IAVSUncompressedVideoFrame), (void**)&piFrame ); + OfficeCore::IUncompressedFrame* piFrame = NULL; + hRes = vImage.punkVal->QueryInterface( __uuidof(OfficeCore::IUncompressedFrame), (void**)&piFrame ); RELEASEINTERFACE( vImage.punkVal ); if( FAILED( hRes ) || NULL == piFrame ) return false; diff --git a/ASCOfficeRtfFile/stdafx.h b/ASCOfficeRtfFile/stdafx.h index 89b18946dd..c98325b8cf 100644 --- a/ASCOfficeRtfFile/stdafx.h +++ b/ASCOfficeRtfFile/stdafx.h @@ -45,4 +45,4 @@ using namespace ATL; #import "..\Redist\ASCOfficeUtils.dll" named_guids rename_namespace("AVSOfficeUtils") #import "..\..\..\..\AVS\Redist\AVSImageStudio3.dll" named_guids rename_namespace("ImageStudio") -#import "..\..\..\..\AVS\Redist\AVSMediaCore3.dll" named_guids rename_namespace("MediaCore"), exclude("tagRECT") +#import "..\Redist\OfficeCore.dll" named_guids rename_namespace("OfficeCore"), exclude("tagRECT")