[libreoffice/f16] Resolves: rhbz#761009 IFSD_Equal is asymmetrical

[Caolán McNamara]

commit d3dbd33a160cfeb3b07ca95d46362efbfec9c480
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 13 21:20:49 2011 +0000

    Resolves: rhbz#761009 IFSD_Equal is asymmetrical

 ...es-rhbz-761009-IFSD_Equal-is-asymmetrical.patch |   30 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch b/0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch
new file mode 100644
index 0000000..1714e53
--- /dev/null
+++ b/0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch
@@ -0,0 +1,30 @@
+From 39cbce553da1834f78b77f48b2f1be9578d6cc05 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Tue, 13 Dec 2011 21:01:28 +0000
+Subject: [PATCH] Resolves: rhbz#761009 IFSD_Equal is asymmetrical
+
+---
+ vcl/generic/glyphs/glyphcache.cxx |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+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;
+-- 
+1.7.6.4
+
diff --git a/libreoffice.spec b/libreoffice.spec
index d32352e..4fd5c72 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -28,7 +28,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -129,6 +129,7 @@ Patch30: 0001-Resolves-rhbz-751290-KDE-black-on-dark-tooltips.patch
 Patch31: 0001-gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
 Patch32: 0001-Resolves-rhbz-759647-dispose-clears-mpPresTimer-befo.patch
 Patch33: 0001-fdo-43308-Set-the-logic-straight-for-center-across-s.patch
+Patch34: 0001-Resolves-rhbz-761009-IFSD_Equal-is-asymmetrical.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -806,6 +807,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch31 -p1 -b .gtk3-fix-cairo-canvas-crash-for-non-X-or-svp-backend.patch
 %patch32 -p1 -b .rhbz759647-dispose-clears-mpPresTimer-befo.patch
 %patch33 -p1 -b .fdo43308-Set-the-logic-straight-for-center-across-s.patch
+%patch34 -p1 -b .rhbz761009-IFSD_Equal-is-asymmetrical.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2117,6 +2119,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Dec 13 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.4.2-6-UNBUILT
+- Resolves: rhbz#761009 IFSD_Equal is asymmetrical
+
 * Fri Dec 09 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.4.2-5
 - Resolves: rhbz#759647 dispose clears mpPresTimer
 - Resolves: rhbz#761558 center-across-selection fix