/[packages]/cauldron/libreoffice/branches/3.5/current/SOURCES/0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch
ViewVC logotype

Annotation of /cauldron/libreoffice/branches/3.5/current/SOURCES/0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 184057 - (hide annotations) (download)
Sun Dec 18 22:38:15 2011 UTC (8 years, 9 months ago) by dmorgan
File size: 1124 byte(s)
SILENT: Resolves: rhbz#761009 IFSD_Equal is asymmetrical

1 dmorgan 184057 From 39cbce553da1834f78b77f48b2f1be9578d6cc05 Mon Sep 17 00:00:00 2001
2     From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
3     Date: Tue, 13 Dec 2011 21:01:28 +0000
4     Subject: [PATCH] Resolves: rhbz#761009 IFSD_Equal is asymmetrical
5    
6     ---
7     vcl/generic/glyphs/glyphcache.cxx | 6 ++++--
8     1 files changed, 4 insertions(+), 2 deletions(-)
9    
10     diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx
11     index 89696d1..c524c08 100644
12     --- a/vcl/generic/glyphs/glyphcache.cxx
13     +++ b/vcl/generic/glyphs/glyphcache.cxx
14     @@ -148,9 +148,11 @@ bool GlyphCache::IFSD_Equal::operator()( const FontSelectPattern& rA, const Font
15     // NOTE: ignoring meFamily deliberately
16    
17     // compare with the requested width, allow default width
18     - if( (rA.mnWidth != rB.mnWidth)
19     - && ((rA.mnHeight != rB.mnWidth) || (rA.mnWidth != 0)) )
20     + int nAWidth = rA.mnWidth != 0 ? rA.mnWidth : rA.mnHeight;
21     + int nBWidth = rB.mnWidth != 0 ? rB.mnWidth : rB.mnHeight;
22     + if( nAWidth != nBWidth )
23     return false;
24     +
25     #ifdef ENABLE_GRAPHITE
26     if (rA.meLanguage != rB.meLanguage)
27     return false;
28     --
29     1.7.6.4
30    

  ViewVC Help
Powered by ViewVC 1.1.28