diff options
| author | Kurt Zenker <kz@openoffice.org> | 2003-08-25 12:57:11 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2003-08-25 12:57:11 +0000 |
| commit | 684a098adca5a1931adc6d8ed398c67aefa95945 (patch) | |
| tree | e161d50024f9d88b7d3497adc058de6443900d4e /vcl | |
| parent | f64fa109d56b21a23ba8c9426b0af3957f382195 (diff) | |
INTEGRATION: CWS vcl15 (1.31.4); FILE MERGED
2003/08/07 15:35:57 pl 1.31.4.2: RESYNC: (1.31-1.32); FILE MERGED
2003/07/10 13:44:59 hdu 1.31.4.1: #i15237# manual resync to CWS pp1r1
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/source/gdi/gcach_xpeer.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/vcl/unx/source/gdi/gcach_xpeer.cxx b/vcl/unx/source/gdi/gcach_xpeer.cxx index 167aa6862acd..77def23f68c4 100644 --- a/vcl/unx/source/gdi/gcach_xpeer.cxx +++ b/vcl/unx/source/gdi/gcach_xpeer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gcach_xpeer.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.33 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:46:49 $ + * last change: $Author: kz $ $Date: 2003-08-25 13:57:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -258,8 +258,13 @@ void X11GlyphPeer::RemovingFont( ServerFont& rServerFont ) // --------------------------------------------------------------------------- +// notification to clean up GlyphPeer resources for this glyph void X11GlyphPeer::RemovingGlyph( ServerFont& rServerFont, GlyphData& rGlyphData, int nGlyphIndex ) { + // nothing to do if the GlyphPeer hasn't allocated resources for the glyph + if( rGlyphData.GetExtInfo() == EMPTY_KIND ) + return; + const GlyphMetric& rGM = rGlyphData.GetMetric(); const int nWidth = rGM.GetSize().Width(); const int nHeight = rGM.GetSize().Height(); @@ -291,8 +296,7 @@ void X11GlyphPeer::RemovingGlyph( ServerFont& rServerFont, GlyphData& rGlyphData case XRENDER_KIND: { - GlyphSet aGlyphSet = GetGlyphSet( rServerFont ); - Glyph nGlyphId = GetGlyphId( rServerFont, nGlyphIndex ); + Glyph nGlyphId = (Glyph)rGlyphData.GetExtPointer(); // XRenderFreeGlyphs not implemented yet for version<=0.2 // #108209# disabled because of crash potential, // the glyph leak is not too bad because they will |