[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/generic

[Caolán McNamara]

 vcl/generic/glyphs/glyphcache.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit dd6f246a925e92cb0ef024ce4b495aa3990edbc5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 13 21:01:28 2011 +0000

    Resolves: rhbz#761009 IFSD_Equal is asymmetrical
    (cherry picked from commit 39cbce553da1834f78b77f48b2f1be9578d6cc05)
    
    Signed-off-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
index 89696d1..c524c08 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/generic/glyphs/glyphcache.cxx
@@ -148,9 +148,11 @@ bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const Font
     // 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;