(1.0.0.75) raw_interface_only

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52879 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Oleg.Korshul
2013-12-05 14:04:30 +00:00
committed by Alexander Trofimov
parent 1e9b134c9e
commit 49d7bb00a5
4 changed files with 17 additions and 12 deletions

View File

@ -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;
}
}