summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-12-13 21:01:28 +0000
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-01-17 17:32:17 +0100
commit3129d7d23d06ac9609957d141cedbc04ac42c48a (patch)
tree411de9f973fd701502b5d533d9532da8c9470424
parent6a98980289ecc5b21a9c1044ca22e8de4f8f9c93 (diff)
Resolves: rhbz#761009 IFSD_Equal is asymmetricaldistro/ubuntu/oneiric-3.4
-rw-r--r--vcl/source/glyphs/glyphcache.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx
index ab56853dcf65..ea696f3bf7f9 100644
--- a/vcl/source/glyphs/glyphcache.cxx
+++ b/vcl/source/glyphs/glyphcache.cxx
@@ -150,9 +150,11 @@ bool GlyphCache::IFSD_Equal::operator()( const ImplFontSelectData& rA, const Imp
// NOTE: ignoring meFamily deliberately
// compare with the requested width, allow default width
- if( (rA.mnWidth != rB.mnWidth)
- && ((rA.mnHeight != rB.mnWidth) || (rA.mnWidth != 0)) )
+ int nAWidth = rA.mnWidth != 0 ? rA.mnWidth : rA.mnHeight;
+ int nBWidth = rB.mnWidth != 0 ? rB.mnWidth : rB.mnHeight;
+ if( nAWidth != nBWidth )
return false;
+
#ifdef ENABLE_GRAPHITE
if (rA.meLanguage != rB.meLanguage)
return false;