From 74730d4ace1cf603575b052698e6de36b50e189b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 13 Nov 2011 20:29:02 +0000
Subject: callcatcher: remove freshly unused methods

---
 vcl/generic/glyphs/glyphcache.cxx   | 17 ----------------
 vcl/inc/generic/glyphcache.hxx      |  1 -
 vcl/unx/generic/gdi/gcach_xpeer.cxx | 39 -------------------------------------
 vcl/unx/generic/gdi/gcach_xpeer.hxx |  3 ---
 4 files changed, 60 deletions(-)

(limited to 'vcl')

diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 42dddf9912ea..39adb9610dad 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -413,23 +413,6 @@ void ServerFont::GarbageCollect( long nMinLruIndex )
     }
 }
 
-bool ServerFont::IsGlyphInvisible( int nGlyphIndex )
-{
-    if (!mbCollectedZW)
-    {
-        mnZWJ = GetGlyphIndex( 0x200D );
-        mnZWNJ = GetGlyphIndex( 0x200C );
-        mbCollectedZW = true;
-    }
-
-    if( !nGlyphIndex ) // don't hide the NotDef glyph
-        return false;
-    if( (nGlyphIndex == mnZWNJ) || (nGlyphIndex == mnZWJ) )
-        return true;
-
-    return false;
-}
-
 // =======================================================================
 
 ImplServerFontEntry::ImplServerFontEntry( FontSelectPattern& rFSD )
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx
index 6ed1cb81b92e..7d46ff74ec12 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/generic/glyphcache.hxx
@@ -224,7 +224,6 @@ public:
     int                 FixupGlyphIndex( int nGlyphIndex, sal_UCS4 ) const;
     bool                GetGlyphOutline( int nGlyphIndex, ::basegfx::B2DPolyPolygon& ) const;
     bool                GetAntialiasAdvice( void ) const;
-    bool                        IsGlyphInvisible( int nGlyphIndex );
     bool                GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const;
     bool                GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const;
 
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx
index 460ea725a7ab..6f9bd69ba7e5 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -58,7 +58,6 @@ X11GlyphPeer::X11GlyphPeer()
 :   mpDisplay( GetGenericData()->GetSalDisplay()->GetDisplay() )
 ,   mnMaxScreens(0)
 ,   mnDefaultScreen(0)
-,   mnExtByteCount(0)
 {
     if( !mpDisplay )
         return;
@@ -68,10 +67,6 @@ X11GlyphPeer::X11GlyphPeer()
     mnMaxScreens = rSalDisplay.GetScreenCount();
     if( mnMaxScreens > MAX_GCACH_SCREENS )
         mnMaxScreens = MAX_GCACH_SCREENS;
-    // if specific glyph data has to be kept for many screens
-    // then prepare the allocation of MultiScreenGlyph objects
-    if( mnMaxScreens > 1 )
-        mnExtByteCount = sizeof(MultiScreenGlyph) + sizeof(Pixmap) * (mnMaxScreens - 1);
     mnDefaultScreen = rSalDisplay.GetDefaultScreenNumber();
 }
 
@@ -108,40 +103,6 @@ static const Pixmap NO_PIXMAP = ~0;
 
 // ---------------------------------------------------------------------------
 
-MultiScreenGlyph* X11GlyphPeer::PrepareForMultiscreen( ExtGlyphData& rEGD ) const
-{
-    // prepare to store screen specific pixmaps
-    MultiScreenGlyph* pMSGlyph = (MultiScreenGlyph*)new char[ mnExtByteCount ];
-
-    // init the glyph formats
-    pMSGlyph->mpRawBitmap = NO_RAWBMP;
-    pMSGlyph->maXRGlyphId = NO_GLYPHID;
-    for( int i = 0; i < mnMaxScreens; ++i )
-        pMSGlyph->maPixmaps[i] = NO_PIXMAP;
-    // reuse already available glyph formats
-    if( rEGD.meInfo == INFO_XRENDER )
-        pMSGlyph->maXRGlyphId = reinterpret_cast<Glyph>(rEGD.mpData);
-    else if( rEGD.meInfo == INFO_RAWBMP )
-        pMSGlyph->mpRawBitmap = reinterpret_cast<RawBitmap*>(rEGD.mpData);
-    else if( rEGD.meInfo == INFO_PIXMAP )
-    {
-        Pixmap aPixmap = reinterpret_cast<Pixmap>(rEGD.mpData);
-        if( aPixmap != None )
-            // pixmap for the default screen is available
-            pMSGlyph->maPixmaps[ mnDefaultScreen ] = aPixmap;
-        else // empty pixmap for all screens is available
-            for( int i = 0; i < mnMaxScreens; ++i )
-                pMSGlyph->maPixmaps[ i ] = None;
-    }
-    // enable use of multiscreen glyph
-    rEGD.mpData = (void*)pMSGlyph;
-    rEGD.meInfo = INFO_MULTISCREEN;
-
-    return pMSGlyph;
- }
-
-// ---------------------------------------------------------------------------
-
 void X11GlyphPeer::RemovingFont( ServerFont& rServerFont )
 {
     void* pFontExt = rServerFont.GetExtPointer();
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx
index 6a00a4aa199b..2418356a8aad 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx
@@ -49,8 +49,6 @@ protected:
     virtual void        RemovingFont( ServerFont& );
     virtual void        RemovingGlyph( ServerFont&, GlyphData&, int nGlyphIndex );
 
-    MultiScreenGlyph*   PrepareForMultiscreen( ExtGlyphData& ) const;
-
 private:
     Display*            mpDisplay;
 
@@ -58,7 +56,6 @@ private:
     static const int MAX_GCACH_SCREENS = 32;
     int                 mnMaxScreens;
     int                 mnDefaultScreen;
-    int                 mnExtByteCount;
 };
 
 class X11GlyphCache : public GlyphCache
-- 
cgit