[openoffice.org/f14/master] Resolves: rhbz#114703 betterlocalize font name

[Caolan McNamara]

commit 3ab4432525b45aeb7919336db7237b27a2aae4f5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 23 17:05:36 2010 +0100

    Resolves: rhbz#114703 betterlocalize font name

 ...g-3.3.0.ooo114703.vcl.betterlocalize.font.patch |   30 ++++++++++++++++++++
 openoffice.org.spec                                |    8 ++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch b/openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch
new file mode 100644
index 0000000..e6d7a4b
--- /dev/null
+++ b/openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch
@@ -0,0 +1,30 @@
+diff -r 1ddfe565e084 vcl/unx/source/fontmanager/fontconfig.cxx
+--- a/vcl/unx/source/fontmanager/fontconfig.cxx	Thu Sep 23 09:39:43 2010 +0100
++++ b/vcl/unx/source/fontmanager/fontconfig.cxx	Thu Sep 23 14:13:17 2010 +0100
+@@ -512,19 +512,24 @@
+         for (std::vector<lang_and_family>::const_iterator aIter = families.begin(); aIter != aEnd; ++aIter)
+         {
+             const char *pLang = (const char*)aIter->first;
+-            //perfect
+             if( rtl_str_compare(pLang,sFullMatch.getStr() ) == 0)
+             {
++                //perfect match
+                 candidate = aIter->second;
+                 break;
+             }
+             else if( (rtl_str_compare(pLang,sLangMatch.getStr()) == 0) && (!alreadyclosematch))
+             {
++                //fairly close
+                 candidate = aIter->second;
+                 alreadyclosematch = true;
+             }
++            else if( (rtl_str_compare(pLang,"en") == 0) && (!alreadyclosematch) )
++            {
++                //english name
++                candidate = aIter->second;
++            }
+         }
+-
+         return candidate;
+     }
+ }
diff --git a/openoffice.org.spec b/openoffice.org.spec
index fd4bb70..d6d75f4 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 8
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -117,6 +117,7 @@ Patch38: openoffice.org-3.3.0.ooo113856.vcl.mutter.patch
 Patch39: workspace.cmcfixes78.patch
 Patch40: openoffice.org-3.3.0.ooo114012.sd.bada11ychain.patch
 Patch41: workspace.cmcfixes79.patch
+Patch42: openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1646,6 +1647,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch39 -p1 -b .workspace.cmcfixes78.patch
 %patch40 -p0 -b .ooo114012.sd.bada11ychain.patch
 %patch41 -p1 -b .workspace.cmcfixes79.patch
+%patch42 -p1 -b .ooo114703.vcl.betterlocalize.font.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3844,6 +3846,10 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Thu Sep 23 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-8.3
+- Resolves: rhbz#114703 betterlocalize font name, fixes sluggish
+  pause in nl_NL autotext load
+
 * Sat Sep 18 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-8.2
 - Resolves: rhbz#635030 fix double-slash in sd menubar.xml