the only thing calling GetPixmap is itself

3 files changed, 0 insertions, 148 deletions

diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx
index 318d34d61ec0..8592ff95bd6f 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -183,44 +183,6 @@ void X11GlyphPeer::SetRawBitmap( GlyphData& rGD, const RawBitmap* pRawBitmap ) c
 
 // ---------------------------------------------------------------------------
 
-Pixmap X11GlyphPeer::GetPixmap( const GlyphData& rGD, int nScreen ) const
-{
-    Pixmap aPixmap = NO_PIXMAP;
-    const ExtGlyphData& rEGD = rGD.ExtDataRef();
-    if( (rEGD.meInfo == INFO_PIXMAP) && (nScreen == mnDefaultScreen) )
-        aPixmap = (Pixmap)rEGD.mpData;
-    else if( rEGD.meInfo == INFO_MULTISCREEN )
-        aPixmap = (Pixmap)(reinterpret_cast<MultiScreenGlyph*>(rEGD.mpData)->maPixmaps[nScreen]);
-    return aPixmap;
-}
-
-// ---------------------------------------------------------------------------
-
-void X11GlyphPeer::SetPixmap( GlyphData& rGD, Pixmap aPixmap, int nScreen ) const
-{
-    if( aPixmap == NO_PIXMAP )
-        aPixmap = None;
-
-    ExtGlyphData& rEGD = rGD.ExtDataRef();
-    if( (rEGD.meInfo == INFO_EMPTY) && (nScreen == mnDefaultScreen) )
-    {
-        rEGD.meInfo = INFO_PIXMAP;
-        rEGD.mpData = (void*)aPixmap;
-    }
-    else
-    {
-        MultiScreenGlyph* pMSGlyph;
-        if( rEGD.meInfo == INFO_MULTISCREEN )
-            pMSGlyph = reinterpret_cast<MultiScreenGlyph*>(rEGD.mpData);
-        else
-            pMSGlyph = PrepareForMultiscreen( rEGD );
-
-        pMSGlyph->maPixmaps[ nScreen ] = aPixmap;
-    }
-}
-
-// ---------------------------------------------------------------------------
-
 void X11GlyphPeer::RemovingFont( ServerFont& rServerFont )
 {
     void* pFontExt = rServerFont.GetExtPointer();
@@ -317,111 +279,6 @@ void X11GlyphPeer::RemovingGlyph( ServerFont& /*rServerFont*/, GlyphData& rGlyph
 
 // ---------------------------------------------------------------------------
 
-Pixmap X11GlyphPeer::GetPixmap( ServerFont& rServerFont, int nGlyphIndex, int nReqScreen )
-{
-    if( rServerFont.IsGlyphInvisible( nGlyphIndex ) )
-        return None;
-
-    GlyphData& rGlyphData = rServerFont.GetGlyphData( nGlyphIndex );
-    Pixmap aPixmap = GetPixmap( rGlyphData, nReqScreen );
-    if( aPixmap == NO_PIXMAP )
-    {
-        aPixmap = None;
-        if( rServerFont.GetGlyphBitmap1( nGlyphIndex, maRawBitmap ) )
-        {
-            // #94666# circumvent bug in some X11 systems, e.g. XF410.LynxEM.v163
-            sal_uLong nPixmapWidth = 8 * maRawBitmap.mnScanlineSize - 1;
-            nPixmapWidth = Max( nPixmapWidth, maRawBitmap.mnWidth );
-
-            rGlyphData.SetSize( Size( nPixmapWidth, maRawBitmap.mnHeight ) );
-            rGlyphData.SetOffset( +maRawBitmap.mnXOffset, +maRawBitmap.mnYOffset );
-
-            const sal_uLong nBytes = maRawBitmap.mnHeight * maRawBitmap.mnScanlineSize;
-            if( nBytes > 0 )
-            {
-                // conversion table LSB<->MSB (for XCreatePixmapFromData)
-                static const unsigned char lsb2msb[256] =
-                {
-                    0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
-                    0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
-                    0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
-                    0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
-                    0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4,
-                    0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
-                    0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC,
-                    0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
-                    0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2,
-                    0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
-                    0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA,
-                    0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
-                    0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6,
-                    0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
-                    0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE,
-                    0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
-                    0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1,
-                    0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
-                    0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9,
-                    0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
-                    0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5,
-                    0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
-                    0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED,
-                    0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
-                    0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3,
-                    0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
-                    0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB,
-                    0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
-                    0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7,
-                    0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
-                    0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
-                    0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
-                };
-
-                unsigned char* pTemp = maRawBitmap.mpBits;
-                for( int i = nBytes; --i >= 0; ++pTemp )
-                    *pTemp = lsb2msb[ *pTemp ];
-
-                // often a glyph pixmap is only needed on the default screen
-                // => optimize for this common case
-                int nMinScreen = 0;
-                int nEndScreen = mnMaxScreens;
-                if( nReqScreen == mnDefaultScreen ) {
-                    nMinScreen = mnDefaultScreen;
-                    nEndScreen = mnDefaultScreen + 1;
-                }
-                // prepare glyph pixmaps for the different screens
-                for( int i = nMinScreen; i < nEndScreen; ++i )
-                {
-                    // don't bother if the pixmap is already there
-                    if( GetPixmap( rGlyphData, i ) != NO_PIXMAP )
-                        continue;
-                    // create the glyph pixmap
-                    Pixmap aScreenPixmap = XCreatePixmapFromBitmapData( mpDisplay,
-                        RootWindow( mpDisplay, i ), (char*)maRawBitmap.mpBits,
-                        nPixmapWidth, maRawBitmap.mnHeight, 1, 0, 1 );
-                    // and cache it as glyph specific data
-                    SetPixmap( rGlyphData, aScreenPixmap, i );
-                    mnBytesUsed += nBytes;
-                    if( i == nReqScreen )
-                        aPixmap = aScreenPixmap;
-                }
-            }
-        }
-        else
-        {
-            // fall back to .notdef glyph
-            if( nGlyphIndex != 0 )  // recurse only once
-                aPixmap = GetPixmap( rServerFont, 0, nReqScreen );
-
-            if( aPixmap == NO_PIXMAP )
-                aPixmap = None;
-        }
-    }
-
-    return aPixmap;
-}
-
-// ---------------------------------------------------------------------------
-
 const RawBitmap* X11GlyphPeer::GetRawBitmap( ServerFont& rServerFont,
     int nGlyphIndex )
 {
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx
index 8618e83e75fc..1da8a9036dfb 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx
@@ -45,7 +45,6 @@ public:
                         X11GlyphPeer();
     virtual            ~X11GlyphPeer();
 
-    Pixmap              GetPixmap( ServerFont&, int nGlyphIndex, int nScreen );
     const RawBitmap*    GetRawBitmap( ServerFont&, int nGlyphIndex );
 
 protected:
@@ -54,9 +53,7 @@ protected:
 
     MultiScreenGlyph*   PrepareForMultiscreen( ExtGlyphData& ) const;
     void                SetRawBitmap( GlyphData&, const RawBitmap* ) const;
-    void                SetPixmap( GlyphData&, Pixmap, int nScreen ) const;
     const RawBitmap*    GetRawBitmap( const GlyphData& ) const;
-    Pixmap              GetPixmap( const GlyphData&, int nScreen ) const;
 
 private:
     Display*            mpDisplay;
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx
index b0e721ae5e85..729a0b7da458 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -38,8 +38,6 @@
 #include <unx/saldata.hxx>
 #include <unx/saldisp.hxx>
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
 #include <xrender_peer.hxx>
 
 using namespace rtl;