[Libreoffice-commits] .: vcl/source

[Caolán McNamara]

 vcl/source/glyphs/graphite_adaptors.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e1f941b72dd93b217321c93122e4e536c4d5bdf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 22 16:34:44 2010 +0100

    move global sSilfMap to be a local sSilfMap to defer ctor until first use

diff --git a/vcl/source/glyphs/graphite_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx
index d73af50..6e3591b 100644
--- a/vcl/source/glyphs/graphite_adaptors.cxx
+++ b/vcl/source/glyphs/graphite_adaptors.cxx
@@ -67,7 +67,6 @@ namespace
         return static_cast<float>(x + 32) / 64.0;
     }
     typedef std::hash_map<long,bool> SilfMap;
-    SilfMap sSilfMap;
 }
 extern FT_Error (*pFTEmbolden)(FT_GlyphSlot);
 extern FT_Error (*pFTOblique)(FT_GlyphSlot);
@@ -184,6 +183,7 @@ void GraphiteFontAdaptor::UniqueCacheInfo(ext_std::wstring & face_name_out, bool
 
 bool GraphiteFontAdaptor::IsGraphiteEnabledFont(ServerFont & font) throw()
 {
+    static SilfMap sSilfMap;
     // NOTE: this assumes that the same FTFace pointer won't be reused,
     // so FtFontInfo::ReleaseFaceFT must only be called at shutdown.
     FreetypeServerFont & aFtFont = dynamic_cast<FreetypeServerFont &>(font);