From 8671ce5236791a3b5537447f536f657e412be1ad Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Oct 31 2012 16:38:17 +0000
Subject: Resolves: rhbz#865058 increase number of user-defined format codes


---

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..9d9fa49
--- /dev/null
+++ b/0001-resolved-rhbz865058-retard-overflow-of-internal-tabl.patch
@@ -0,0 +1,55 @@
+From fef1b6e42dc22d764140ea0f8e690225c697bb96 Mon Sep 17 00:00:00 2001
+Message-Id: <fef1b6e42dc22d764140ea0f8e690225c697bb96.1351699658.git.erack@redhat.com>
+From: Eike Rathke <erack@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: I2fb85c83a65d6c5b3183aeb3a3bda88828473a3c
+Reviewed-on: https://gerrit.libreoffice.org/951
+Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
+Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
+---
+ 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 2dfa273..0a70557 100644
+--- a/svl/inc/svl/zforlist.hxx
++++ b/svl/inc/svl/zforlist.hxx
+@@ -63,7 +63,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 90e6e64..3495d8a 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -40,7 +40,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        2%{?libo_prerelease}%{?dist}
+Release:        3%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -187,6 +187,7 @@ Patch22: 0001-convert-java-XSL-transformer-into-extension.patch
 Patch23: 0002-rework-selection-of-transformer-for-an-XSLT-filter.patch
 Patch24: 0003-drop-saxon-based-XSLT-transformer.patch
 Patch25: 0004-remove-all-traces-of-saxon.patch
+Patch26: 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}
@@ -808,6 +809,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch23 -p1 -b .rework-selection-of-transformer-for-an-XSLT-filter.patch
 %patch24 -p1 -b .drop-saxon-based-XSLT-transformer.patch
 %patch25 -p1 -b .remove-all-traces-of-saxon.patch
+%patch26 -p1 -b .rhbz865058-retard-overflow-of-internal-tabl.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2036,6 +2038,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Wed Oct 31 2012 Eike Rathke <erack@redhat.com> - 1:3.6.3.2-3
+- Resolves: rhbz#865058 increase number of user-defined format codes
+
 * Fri Oct 26 2012 David Tardon <dtardon@redhat.com> - 1:3.6.3.2-2
 - Resolves: rhbz#824035 do not bundle saxon