rpms/openoffice.org/F-8 openoffice.org-2.3.0.ooo81314.i18npool.crash.patch, NONE, 1.1 openoffice.org.spec, 1.1338, 1.1339

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9333

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo81314.i18npool.crash.patch 
Log Message:
openoffice.org-2.3.0.ooo81314.i18npool.crash.patch

openoffice.org-2.3.0.ooo81314.i18npool.crash.patch:

--- NEW FILE openoffice.org-2.3.0.ooo81314.i18npool.crash.patch ---
Index: source/localedata/localedata.cxx
===================================================================
RCS file: /cvs/l10n/i18npool/source/localedata/localedata.cxx,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- openoffice.org.orig/i18npool/source/localedata/localedata.cxx	15 Oct 2007 12:54:36 -0000	1.52
+++ openoffice.org/i18npool/source/localedata/localedata.cxx	23 Oct 2007 09:09:12 -0000	1.53
@@ -1161,8 +1161,10 @@
         Locale aFbLocale = MsLangId::getFallbackLocale( aLocale);
         if (aFbLocale == aLocale)
             bFallback = false;  // may be a "language-only-locale" like Interlingua (ia)
-        else if (aFbLocale.Country.getLength())
-            aFallback = aFbLocale.Language + under + aFbLocale.Country;
+        else if (aFbLocale.Country.getLength()) {
+            OUStringBuffer aBuf(5);
+            aFallback = aBuf.append(aFbLocale.Language).append( under).append(aFbLocale.Country).makeStringAndClear();
+        }
         else
             aFallback = aFbLocale.Language;
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-8/openoffice.org.spec,v
retrieving revision 1.1338
retrieving revision 1.1339
diff -u -r1.1338 -r1.1339
--- openoffice.org.spec	20 Dec 2007 10:55:04 -0000	1.1338
+++ openoffice.org.spec	2 Jan 2008 11:04:02 -0000	1.1339
@@ -1,6 +1,6 @@
 %define oootag OOG680
 %define ooomilestone 6
-%define rh_rpm_release 9
+%define rh_rpm_release 10
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -159,6 +159,7 @@
 Patch77: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
 Patch78: openoffice.org-2.3.1.ooo84676.ucb.davprotocol.patch
 Patch79: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
+Patch80: openoffice.org-2.3.0.ooo81314.i18npool.crash.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1113,6 +1114,7 @@
 %patch77 -p1 -b .ooo84621.sw.insertexcel.patch
 %patch78 -p1 -b .ooo84676.ucb.davprotocol.patch
 %patch79 -p1 -b .ooo84770.svx.eventsmismatch.patch
+%patch80 -p1 -b .ooo81314.i18npool.crash.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2813,6 +2815,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Jan 02 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.10
+- Resolves: rhbz#427071 openoffice.org-2.3.0.ooo81314.i18npool.crash.patch
+
 * Thu Dec 20 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.9
 - add openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch