[libreoffice/f17] Resolves: rhbz#865058 increase number of user-defined format codes

[Eike Rathke]

commit 99f6f3c06d28f98d83b000abb1cf572484480100
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Oct 31 17:30:16 2012 +0100

    Resolves: rhbz#865058 increase number of user-defined format codes

 ...bz865058-retard-overflow-of-internal-tabl.patch |   55 ++++++++++++++++++++
 libreoffice.spec                                   |    3 +
 2 files changed, 58 insertions(+), 0 deletions(-)
---
diff --git a/0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch b/0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch
new file mode 100644
index 0000000..b43740e
--- /dev/null
+++ b/0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch
@@ -0,0 +1,55 @@
+From 0f8380fc4786f0eb13d8e46f5d7ae85f9326cd17 Mon Sep 17 00:00:00 2001
+Message-Id: <0f8380fc4786f0eb13d8e46f5d7ae85f9326cd17.1351700269.git.erack at redhat.com>
+From: Eike Rathke <erack at redhat.com>
+Date: Fri, 26 Oct 2012 18:09:20 +0200
+Subject: [PATCH] resolved rhbz865058 retard overflow of internal table of
+ number formats
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="------------erAck-patch-parts"
+
+This is a multi-part message in MIME format.
+--------------erAck-patch-parts
+Content-Type: text/plain; charset=UTF-8; format=fixed
+Content-Transfer-Encoding: 8bit
+
+
+Due to an insane amount of ridiculous "user-defined" number formats the
+internal table may overflow during import, stave off and increase the
+number of available slots to another arbitrary limit.
+(cherry picked from commit 075e9ca0b96f37b3561824c23af60872d6a9d80a)
+
+Conflicts:
+
+	svl/inc/svl/zforlist.hxx
+
+Change-Id: I3772e0dfea25357a9f8ca52c41e85798ff26798c
+Reviewed-on: https://gerrit.libreoffice.org/952
+Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
+Tested-by: Miklos Vajna <vmiklos at suse.cz>
+---
+ svl/inc/svl/zforlist.hxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+
+--------------erAck-patch-parts
+Content-Type: text/x-patch; name="0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch"
+Content-Transfer-Encoding: 8bit
+Content-Disposition: attachment; filename="0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch"
+
+diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
+index 627284a..67a84e5 100644
+--- a/svl/inc/svl/zforlist.hxx
++++ b/svl/inc/svl/zforlist.hxx
+@@ -64,7 +64,7 @@ namespace rtl {
+     class OUString;
+ }
+ 
+-#define SV_COUNTRY_LANGUAGE_OFFSET  5000    // Max count of formats per country/language
++#define SV_COUNTRY_LANGUAGE_OFFSET 10000    // Max count of formats per country/language
+ #define SV_MAX_ANZ_STANDARD_FORMATE  100    // Max count of builtin default formats per CL
+ 
+ // Format types
+
+--------------erAck-patch-parts--
+
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 9713656..4d3e670 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -165,6 +165,7 @@ Patch47: 0001-fdo-49819-fdo-54609-Do-not-consider-timestamp-differ.patch
 Patch48: 0001-Resolves-rhbz-868479-fdo-56281-doubled-in-German-ok-.patch
 Patch49: 0001-rhbz-868953-fdo-45084-When-the-caller-specifies-filt.patch
 Patch50: 0001-fdo-49517-Revert-fdo-46102-Load-Java-scripts-with-cl.patch
+Patch51: 0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1045,6 +1046,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch48 -p1 -b .rhbz-868479-fdo-56281-doubled-in-German-ok-.patch
 %patch49 -p1 -b .rhbz-868953-fdo-45084-When-the-caller-specifies-filt.patch
 %patch50 -p1 -b .fdo-49517-Revert-fdo-46102-Load-Java-scripts-with-cl.patch
+%patch51 -p1 -b .rhbz865058-retard-overflow-of-internal-tabl.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2333,6 +2335,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %changelog
 * Mon Oct 29 2012 Stephan Bergmann <sbergman at redhat.com> - 1:3.5.7.2-5-UNBUILT
 - Resolves: fdo#49517 Java macro embedded in document will not run
+- Resolves: rhbz#865058 increase number of user-defined format codes
 
 * Wed Oct 24 2012 Eike Rathke <erack at redhat.com> - 1:3.5.7.2-4
 - Resolves: rhbz#868953 Calc: open HTML documents from file dialog