mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS vcl25 (1.36.26); FILE MERGED

Browse Source 
2004/08/02 13:02:51 pl 1.36.26.2: RESYNC: (1.36-1.37); FILE MERGED
2004/07/22 11:24:40 hdu 1.36.26.1: #i31603# improve X11 font cache hit rate
This commit is contained in:
Jens-Heiner Rechtien
2004-09-08 14:38:35 +00:00
parent 4962699f0b
commit 5158cdd1f0
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vcl/unx/source/gdi/xfont.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: xfont.cxx,v $
*
* $Revision: 1.38 $
* $Revision: 1.39 $
*
* last change: $Author: rt $ $Date: 2004-09-08 15:13:48 $
* last change: $Author: hr $ $Date: 2004-09-08 15:38:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -315,7 +315,19 @@ ExtendedFontStruct::Match( const ExtendedXlfd *pXlfd,
if( mpXlfd != pXlfd )
return false;
return (maPixelSize == rPixelSize) && (mbVertical == bVertical);
if( bVertical != mbVertical )
return FALSE;
if( rPixelSize.Height() != maPixelSize.Height() )
return FALSE;
long nReqWidth = rPixelSize.Width();
if( !nReqWidth )
nReqWidth = rPixelSize.Height();
if( nReqWidth != maPixelSize.Width() )
return FALSE;
return true;
}
// Get an appropriate x-font that contains a glyph for the given unicode