diff options
| author | Christian Lippka <cl@openoffice.org> | 2010-12-01 10:58:22 +0100 |
|---|---|---|
| committer | Christian Lippka <cl@openoffice.org> | 2010-12-01 10:58:22 +0100 |
| commit | 9439eba6db26f27bb713168440d27fe51fbfadb8 (patch) | |
| tree | e12be13a5610dada674d75b36822fe50047c1f95 /vcl/unx/headless/svppspgraphics.cxx | |
| parent | fa4b286294a272b085c2f74e12581edc2343fc18 (diff) | |
| parent | 69777a477e6084a9cd49c92b25fa4dc35b41e49d (diff) | |
impressdefaults1: merge
Diffstat (limited to 'vcl/unx/headless/svppspgraphics.cxx')
| -rw-r--r-- | vcl/unx/headless/svppspgraphics.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx index 86f356031f52..c7b1f4f41fca 100644 --- a/vcl/unx/headless/svppspgraphics.cxx +++ b/vcl/unx/headless/svppspgraphics.cxx @@ -683,16 +683,13 @@ void PspGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout ) DrawPrinterLayout( rLayout, *m_pPrinterGfx, true ); } -ImplFontCharMap* PspGraphics::GetImplFontCharMap() const +const 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 ); + const ImplFontCharMap* pIFCMap = m_pServerFont[0]->GetImplFontCharMap(); + return pIFCMap; } USHORT PspGraphics::SetFont( ImplFontSelectData *pEntry, int nFallbackLevel ) |