[libreoffice/f16] Resolves: fdo#35513 avoid crash while processing incorrect print range

[Caolan McNamara]

commit 99ba05b3b2dc3032dbf174b366e9db85a0d5f0f6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 20 11:09:31 2011 +0100

    Resolves: fdo#35513 avoid crash while processing incorrect print range

 ...-35513-avoid-crash-while-processing-incor.patch |   27 ++++++++++++++++++++
 fdo40856.bn.discard.patch                          |   13 +++++++++
 libreoffice.spec                                   |   10 ++++++-
 3 files changed, 49 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch b/0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch
new file mode 100644
index 0000000..5b86791
--- /dev/null
+++ b/0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch
@@ -0,0 +1,27 @@
+From b7d874f49b102eabe2974c4dee1272d2cf6053a3 Mon Sep 17 00:00:00 2001
+From: Ivan Timofeev <timofeev.i.s at gmail.com>
+Date: Tue, 20 Sep 2011 10:55:50 +0100
+Subject: [PATCH] Fix for fdo#35513: avoid crash while processing incorrect
+ range of pages
+
+---
+ sw/source/core/doc/doc.cxx |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
+index 34d7a96..d83ab53 100644
+--- a/sw/source/core/doc/doc.cxx
++++ b/sw/source/core/doc/doc.cxx
+@@ -1638,6 +1638,9 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
+     StringRangeEnumerator::getRangesFromString(
+             aPageRange, aPagesToPrint, 1, nDocPageCount, 0 );
+ 
++    if (!aPagesToPrint.size())
++        return;
++
+     // now fill the vector for calculating the page pairs with the start frames
+     // from the above obtained vector
+     std::vector< const SwPageFrm * > aVec;
+-- 
+1.7.6
+
diff --git a/fdo40856.bn.discard.patch b/fdo40856.bn.discard.patch
new file mode 100644
index 0000000..cdd69b7
--- /dev/null
+++ b/fdo40856.bn.discard.patch
@@ -0,0 +1,13 @@
+diff --git a/translations/source/bn/sfx2/source/doc.po b/translations/source/bn/sfx2/source/doc.po
+index 888f346..293ccdd 100644
+--- a/translations/source/bn/sfx2/source/doc.po
++++ b/translations/source/bn/sfx2/source/doc.po
+@@ -308,7 +308,7 @@ msgstr "বার্তা"
+ 
+ #: doc.src#STR_NOSAVEANDCLOSE.string.text
+ msgid "~Discard"
+-msgstr "বাতিল (~D)"
++msgstr "বর্জন (~D)"
+ 
+ #: doc.src#STR_PACKNGO_NOACCESS.string.text
+ msgid "Access to the current data medium not possible."
diff --git a/libreoffice.spec b/libreoffice.spec
index 11efebe..3a06cc7 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -27,7 +27,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        3.4.3.2
-Release:        8%{?dist}
+Release:        9%{?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
@@ -123,6 +123,8 @@ Patch28: gdb-pretty-printers.patch
 Patch29: 0001-Related-fdo-37195-migrationoo3-not-registered.patch
 Patch30: 0001-Resolves-rhbz-735182-libreoffice-doesn-t-build-with-.patch
 Patch31: 0001-Resolves-rhbz-738255-avoid-crash-on-NULL-pointer.patch
+Patch32: fdo40856.bn.discard.patch
+Patch33: 0001-Fix-for-fdo-35513-avoid-crash-while-processing-incor.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -796,6 +798,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch29 -p1 -b .fdo37195-migrationoo3-not-registered.patch
 %patch30 -p1 -b .rhbz735182-libreoffice-doesn-t-build-with-.patch
 %patch31 -p1 -b .rhbz738255-avoid-crash-on-NULL-pointer.patch
+%patch32 -p1 -b .fdo40856.bn.discard.patch
+%patch33 -p1 -b .fdo35513-avoid-crash-while-processing-incor.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2095,6 +2099,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
+* Tue Sep 20 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.3.2-9-UNBUILT
+- Resolves: rhbz#738133 fix bn discard string
+- Resolves: fdo#35513 avoid crash while processing incorrect print range
+
 * Thu Sep 15 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.3.2-8
 - Resolves: rhbz#738255 avoid crash on sc inputhdl