[Libreoffice-commits] .: vcl/inc vcl/source

[Thomas Arnhold]

 vcl/inc/glyphcache.hxx           |    3 ---
 vcl/inc/vcl/svapp.hxx            |    2 --
 vcl/source/app/svapp.cxx         |   11 -----------
 vcl/source/glyphs/glyphcache.cxx |   32 --------------------------------
 4 files changed, 48 deletions(-)

New commits:
commit c516b452295462e0667f3064765f9306d5c14ce0
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Fri Jul 22 11:25:56 2011 +0200

    callcatcher: clean up GlyphCache and one connected method

diff --git a/vcl/inc/glyphcache.hxx b/vcl/inc/glyphcache.hxx
index b8dff48..053476d 100644
--- a/vcl/inc/glyphcache.hxx
+++ b/vcl/inc/glyphcache.hxx
@@ -71,9 +71,7 @@ public:
     /*virtual*/                 ~GlyphCache();
 
     static GlyphCache&		GetInstance();
-    void                        LoadFonts();
 
-    void                        ClearFontPath();
     void                        AddFontPath( const String& rFontPath );
     void                        AddFontFile( const rtl::OString& rNormalizedName,
                                     int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes&,
@@ -96,7 +94,6 @@ private:
     void                        GrowNotify();
 
 private:
-    sal_uLong                       CalcByteCount() const;
     void                        GarbageCollect();
 
     // the GlyphCache's FontList matches a font request to a serverfont instance
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index c7ef0e7..a31806e 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -382,8 +382,6 @@ public:
 
     static void                 SetDialogScaleX( short nScale );
 
-    static const String&        GetFontPath();
-
     static UniqueItemId         CreateUniqueId();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDisplayConnection > GetDisplayConnection();
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 44f5d5b..5fb3a3c 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1589,17 +1589,6 @@ sal_uInt16 Application::GetSystemWindowMode()
 
 // -----------------------------------------------------------------------
 
-const String& Application::GetFontPath()
-{
-    ImplSVData* pSVData = ImplGetSVData();
-
-    if( pSVData->maAppData.mpFontPath )
-        return *(pSVData->maAppData.mpFontPath);
-    return ImplGetSVEmptyStr();
-}
-
-// -----------------------------------------------------------------------
-
 UniqueItemId Application::CreateUniqueId()
 {
     ImplSVData* pSVData = ImplGetSVData();
diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx
index 3a5ff24..9a33cff 100644
--- a/vcl/source/glyphs/glyphcache.cxx
+++ b/vcl/source/glyphs/glyphcache.cxx
@@ -175,23 +175,6 @@ GlyphCache& GlyphCache::GetInstance()
 
 // -----------------------------------------------------------------------
 
-void GlyphCache::LoadFonts()
-{
-    const String& rFontPath = Application::GetFontPath();
-    if( rFontPath.Len() > 0 )
-        AddFontPath( rFontPath );
-}
-
-// -----------------------------------------------------------------------
-
-void GlyphCache::ClearFontPath()
-{
-    if( mpFtManager )
-        mpFtManager->ClearFontList();
-}
-
-// -----------------------------------------------------------------------
-
 void GlyphCache::AddFontPath( const String& rFontPath )
 {
     if( !mpFtManager )
@@ -299,21 +282,6 @@ void GlyphCache::UncacheFont( ServerFont& rServerFont )
 
 // -----------------------------------------------------------------------
 
-sal_uLong GlyphCache::CalcByteCount() const
-{
-    sal_uLong nCacheSize = sizeof(*this);
-    for( FontList::const_iterator it = maFontList.begin(); it != maFontList.end(); ++it )
-    {
-        const ServerFont* pSF = it->second;
-        if( pSF )
-            nCacheSize += pSF->GetByteCount();
-    }
-    // TODO: also account something for hashtable management
-    return nCacheSize;
-}
-
-// -----------------------------------------------------------------------
-
 void GlyphCache::GarbageCollect()
 {
     // when current GC font has been destroyed get another one