diff options
| author | Herbert Duerr [hdu] <duerr@sun.com> | 2010-08-16 14:55:27 +0200 |
|---|---|---|
| committer | Herbert Duerr [hdu] <duerr@sun.com> | 2010-08-16 14:55:27 +0200 |
| commit | 588516e12af81741174b16feb22bef6d5f5fc66e (patch) | |
| tree | de38e01ef54b6171bc16ba3ca3ee7fc74b46c202 /vcl/unx/headless | |
| parent | c44ba02b8439f592a8379f770c7058b70419398f (diff) | |
#i113861# prepare caching of ImplFontCharMap objects on UNX
Diffstat (limited to 'vcl/unx/headless')
| -rw-r--r-- | vcl/unx/headless/svppspgraphics.cxx | 7 | ||||
| -rw-r--r-- | vcl/unx/headless/svptext.cxx | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index 86f356031f52..ccced8701f83 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -685,14 +685,11 @@ void PspGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout ) ImplFontCharMap* PspGraphics::GetImplFontCharMap() const { - // TODO: get ImplFontCharMap directly from fonts if( !m_pServerFont[0] ) return NULL; - CmapResult aCmapResult; - if( !m_pServerFont[0]->GetFontCodeRanges( aCmapResult ) ) - return NULL; - return new ImplFontCharMap( aCmapResult ); + ImplFontCharMap* pIFCMap = m_pServerFont[0]->GetImplFontCharMap(); + return pIFCMap; } USHORT PspGraphics::SetFont( ImplFontSelectData *pEntry, int nFallbackLevel ) diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx index 34941fc777db..df3625e82643 100644 --- a/vcl/unx/headless/svptext.cxx +++ b/vcl/unx/headless/svptext.cxx @@ -277,10 +277,8 @@ ImplFontCharMap* SvpSalGraphics::GetImplFontCharMap() const if( !m_pServerFont[0] ) return NULL; - CmapResult aCmapResult; - if( !m_pServerFont[0]->GetFontCodeRanges( aCmapResult ) ) - return NULL; - return new ImplFontCharMap( aCmapResult ); + ImplFontCharMap* pIFCMap = m_pServerFont[0]->GetImplFontCharMap(); + return pIFCMap; } // --------------------------------------------------------------------------- |