From 02dda27998a2e631fbe66185da5567bfe22ad082 Mon Sep 17 00:00:00 2001 From: RĂ¼diger Timm Date: Wed, 27 Aug 2008 11:11:06 +0000 Subject: INTEGRATION: CWS vcl93 (1.242.20); FILE MERGED 2008/08/15 08:54:25 hdu 1.242.20.1: #i88376# ignore most uses of obsolete member meFamily in OutputDevice layer already --- vcl/source/gdi/outdev3.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 4e9e34e9ca8f..063a886e4fa5 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: outdev3.cxx,v $ - * $Revision: 1.244 $ + * $Revision: 1.245 $ * * This file is part of OpenOffice.org. * @@ -2784,7 +2784,7 @@ bool ImplFontCache::IFSD_Equal::operator()(const ImplFontSelectData& rA, const I // check font face attributes if( (rA.meWeight != rB.meWeight) || (rA.meItalic != rB.meItalic) - || (rA.meFamily != rB.meFamily) +// || (rA.meFamily != rB.meFamily) // TODO: remove this mostly obsolete member || (rA.mePitch != rB.mePitch) ) return false; -- cgit v1.2.3