summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-13 20:29:02 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-14 07:36:01 +0000
commit74730d4ace1cf603575b052698e6de36b50e189b (patch)
treee16e5e4bebeb4c69fb69a1bbb257ed717539314b /vcl/unx
parent734fd917e38a087071ef1b31527846079ab29981 (diff)
callcatcher: remove freshly unused methods
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.cxx39
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.hxx3
2 files changed, 0 insertions, 42 deletions
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