From 49d7bb00a5c6efea51722b4b82c591c7e3532827 Mon Sep 17 00:00:00 2001 From: "Oleg.Korshul" Date: Thu, 5 Dec 2013 14:04:30 +0000 Subject: [PATCH] (1.0.0.75) raw_interface_only git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52879 954022d7-b5bf-4e40-9824-e11837661b57 --- ASCOfficePDFReader/RendererOutputDev.cpp | 6 +++--- ASCOfficePDFReader/SBitmap.cpp | 9 +++++++-- ASCOfficePDFReader/stdafx.h | 8 ++++---- ASCOfficePDFReader/version.h | 6 +++--- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ASCOfficePDFReader/RendererOutputDev.cpp b/ASCOfficePDFReader/RendererOutputDev.cpp index a297518658..5f2beaa955 100644 --- a/ASCOfficePDFReader/RendererOutputDev.cpp +++ b/ASCOfficePDFReader/RendererOutputDev.cpp @@ -7,7 +7,7 @@ #include "File.h" #include "CMap.h" -#include "../ASCOfficeHtmlFile_SaxHtmlParser/AVSOfficeHtmlFile/prj/Base64.h" +#include "../ASCOfficeHtmlFile/ASCOfficeHtmlFile/prj/Base64.h" #include "../Common/XmlUtils.h" #include "FontFileTrueType.h" @@ -875,7 +875,7 @@ void RendererOutputDev::UpdateFont(GrState *pGState) } ::SysFreeString( bsFilePath ); BSTR bsFontType = NULL; - m_pFontManager->raw_GetFontType( &bsFontType ); + m_pFontManager->GetFontType( &bsFontType ); CString sFontType = bsFontType; ::SysFreeString( bsFontType ); @@ -1411,7 +1411,7 @@ void RendererOutputDev::UpdateFont(GrState *pGState) if ( ( sName = ppEncoding[nIndex] ) ) { unsigned short ushGID = 0; - m_pFontManager->raw_GetNameIndex( A2W(sName), &ushGID ); + m_pFontManager->GetNameIndex( A2W(sName), &ushGID ); pCodeToGID[nIndex] = ushGID; } } diff --git a/ASCOfficePDFReader/SBitmap.cpp b/ASCOfficePDFReader/SBitmap.cpp index 1a59b20b32..8f2e0aa636 100644 --- a/ASCOfficePDFReader/SBitmap.cpp +++ b/ASCOfficePDFReader/SBitmap.cpp @@ -427,14 +427,19 @@ int SBitmap::WriteJPGFile(wchar_t *wsFileName, wchar_t *wsTempFolder) sXml += wsFileName; sXml += "\" format=\"888\" quality=\"90\">"; BSTR bsXML = sXml.AllocSysString(); - if ( !pTransform->SetXml( bsXML ) ) + + VARIANT_BOOL vbRes = VARIANT_FALSE; + pTransform->SetXml(bsXML, &vbRes); + if ( vbRes == VARIANT_FALSE ) { ::SysFreeString( bsXML ); RELEASEINTERFACE( pTransform ); _wunlink( wsTempFileName.GetBuffer() ); return SErrorAVSImageStudio; } - if ( !pTransform->Transform() ) + vbRes = VARIANT_FALSE; + pTransform->Transform(&vbRes); + if ( vbRes == VARIANT_FALSE ) { ::SysFreeString( bsXML ); RELEASEINTERFACE( pTransform ); diff --git a/ASCOfficePDFReader/stdafx.h b/ASCOfficePDFReader/stdafx.h index 2805302456..8640710023 100644 --- a/ASCOfficePDFReader/stdafx.h +++ b/ASCOfficePDFReader/stdafx.h @@ -50,7 +50,7 @@ using namespace ATL; #include "../Common/ASCUtils.h" -#import "../Redist/ASCMediaCore3.dll" named_guids rename_namespace("MediaCore"), exclude("tagRECT") -#import "../Redist/ASCImageStudio3.dll" named_guids rename_namespace("AVSImageStudio") -#import "../Redist/ASCImageJpeg2000.dll" named_guids rename_namespace("AVSImageJpeg2000") -#import "../Redist/ASCGraphics.dll" named_guids rename_namespace("AVSGraphics") +#import "../Redist/ASCMediaCore3.dll" named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT") +#import "../Redist/ASCImageStudio3.dll" named_guids raw_interfaces_only rename_namespace("AVSImageStudio") +#import "../Redist/ASCImageJpeg2000.dll" named_guids raw_interfaces_only rename_namespace("AVSImageJpeg2000") +#import "../Redist/ASCGraphics.dll" named_guids raw_interfaces_only rename_namespace("AVSGraphics") diff --git a/ASCOfficePDFReader/version.h b/ASCOfficePDFReader/version.h index b5f83e8d00..76c89a17c7 100644 --- a/ASCOfficePDFReader/version.h +++ b/ASCOfficePDFReader/version.h @@ -2,6 +2,6 @@ //1 //0 //0 -//74 -#define INTVER 1,0,0,74 -#define STRVER "1,0,0,74\0" +//75 +#define INTVER 1,0,0,75 +#define STRVER "1,0,0,75\0"