From 502c1d8ca465e8c424e3d720c1e9435b1e177e27 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 27 Aug 2008 11:12:02 +0000 Subject: INTEGRATION: CWS vcl93 (1.43.118); FILE MERGED 2008/08/15 08:54:25 hdu 1.43.118.2: #i88376# ignore most uses of obsolete member meFamily in OutputDevice layer already 2008/08/13 12:04:49 hdu 1.43.118.1: #i88376# a quick fix for meFamily aliasing, TODO: remove all meFamily uses --- vcl/source/glyphs/glyphcache.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx index b14215062633..acfc8e3ac38d 100644 --- a/vcl/source/glyphs/glyphcache.cxx +++ b/vcl/source/glyphs/glyphcache.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: glyphcache.cxx,v $ - * $Revision: 1.43 $ + * $Revision: 1.44 $ * * This file is part of OpenOffice.org. * @@ -113,7 +113,9 @@ bool GlyphCache::IFSD_Equal::operator()( const ImplFontSelectData& rA, const Imp if( (rA.meItalic != rB.meItalic) || (rA.meWeight != rB.meWeight) ) - return false; + return false; + + // NOTE: ignoring meFamily deliberately // compare with the requested width, allow default width if( (rA.mnWidth != rB.mnWidth) -- cgit v1.2.3