summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Duerr [hdu] <herbert.duerr@oracle.com>2010-09-15 14:51:27 +0200
committerHerbert Duerr [hdu] <herbert.duerr@oracle.com>2010-09-15 14:51:27 +0200
commitd4dbc31173487a97e4b022f0bb9dae25440856a8 (patch)
treebddbb8b175520fe5c4a3db874b7cb07bcdedb761
parent34c6b390e191e8aca888ccc52351fc469f59b663 (diff)
#i113861# for platforms where ImplFontCharMap objects are cached in lower layers the cache in OutputDevice is no longer beneficial
-rw-r--r--vcl/source/gdi/outdev3.cxx5
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index e629c0c0e0d8..4fd008ffa3d1 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -7987,7 +7987,7 @@ BOOL OutputDevice::GetFontCharMap( FontCharMap& rFontCharMap ) const
if( !mpFontEntry )
return FALSE;
- // a little font charmap cache helps considerably
+#ifdef ENABLE_IFC_CACHE // a little font charmap cache helps considerably
static const int NMAXITEMS = 16;
static int nUsedItems = 0, nCurItem = 0;
@@ -8005,10 +8005,12 @@ BOOL OutputDevice::GetFontCharMap( FontCharMap& rFontCharMap ) const
rFontCharMap.Reset( aCache[i].maCharMap.mpImpl );
}
else // need to cache
+#endif // ENABLE_IFC_CACHE
{
const ImplFontCharMap* pNewMap = mpGraphics->GetImplFontCharMap();
rFontCharMap.Reset( pNewMap );
+#ifdef ENABLE_IFC_CACHE
// manage cache round-robin and insert data
CharMapCacheItem& rItem = aCache[ nCurItem ];
rItem.mpFontData = pFontData;
@@ -8019,6 +8021,7 @@ BOOL OutputDevice::GetFontCharMap( FontCharMap& rFontCharMap ) const
if( ++nUsedItems >= NMAXITEMS )
nUsedItems = NMAXITEMS;
+#endif // ENABLE_IFC_CACHE
}
if( rFontCharMap.IsDefaultMap() )