[libreoffice/f19] Resolves: rhbz#988104 crash in certain pptx

[Caolán McNamara]

commit ca4a16c1e0d06c4da1a49b6155d31ce022023ef4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 17 13:09:28 2013 +0100

    Resolves: rhbz#988104 crash in certain pptx

 0001-fdo-68319-sw-fix-Chinese-Conversion.patch |   36 ++++++++++++++++++++++++
 libreoffice.spec                               |   14 ++++++--
 2 files changed, 46 insertions(+), 4 deletions(-)
---
diff --git a/0001-fdo-68319-sw-fix-Chinese-Conversion.patch b/0001-fdo-68319-sw-fix-Chinese-Conversion.patch
new file mode 100644
index 0000000..5e3bf8e
--- /dev/null
+++ b/0001-fdo-68319-sw-fix-Chinese-Conversion.patch
@@ -0,0 +1,36 @@
+From e680d71b75f18be9b99b13a3a2f63e5f54e42d3f Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mstahl at redhat.com>
+Date: Sat, 24 Aug 2013 01:19:21 +0200
+Subject: [PATCH] fdo#68319: sw: fix Chinese Conversion
+
+... and perhaps other things too: the SwScriptIterator constructor gets
+passed a temporary String created by implicit conversion from OUString
+and retains a reference to that; don't convert it to OUString like on
+master but just cast to String.
+
+(regression from 0295c8a34e39326414c1b98cf4da905802f061b0)
+
+Change-Id: I30c7309c14ec8f9e41ee5fe89eed513ddad154fe
+Reviewed-on: https://gerrit.libreoffice.org/5600
+Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
+Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
+---
+ sw/source/core/txtnode/txatritr.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx
+index 00e007a..b9a15b6 100644
+--- a/sw/source/core/txtnode/txatritr.cxx
++++ b/sw/source/core/txtnode/txatritr.cxx
+@@ -94,7 +94,7 @@ bool SwScriptIterator::Next()
+ SwTxtAttrIterator::SwTxtAttrIterator( const SwTxtNode& rTNd, sal_uInt16 nWhchId,
+                                         xub_StrLen nStt,
+                                         bool bUseGetWhichOfScript )
+-    : aSIter( rTNd.GetTxt(), nStt ), rTxtNd( rTNd ),
++    : aSIter( reinterpret_cast<const String&>(rTNd.GetTxt()), nStt ), rTxtNd( rTNd ),
+     pParaItem( 0 ), nChgPos( nStt ), nAttrPos( 0 ), nWhichId( nWhchId ),
+     bIsUseGetWhichOfScript( bUseGetWhichOfScript )
+ {
+-- 
+1.8.3.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 776a2ca..2f6582e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -42,7 +42,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        4%{?libo_prerelease}%{?dist}
+Release:        5%{?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.libreoffice.org/default/
@@ -260,6 +260,8 @@ Patch20: 0001-Make-charmap.cxx-compile-with-icu-4.4.patch
 Patch21: 0001-rhbz-1000150-Do-not-call-exit-upon-XIOError.patch
 Patch22: 0001-Resolves-rhbz-993963-NULL-m_pWindow-on-firefox-delet.patch
 Patch23: 0001-Resolves-rhbz-1006850-crash-in-SwCommentRuler-GetCom.patch
+Patch24: 0001-Avoid-crash-when-a-comment-contains-data-but-no-text.patch
+Patch25: 0001-fdo-68319-sw-fix-Chinese-Conversion.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1015,6 +1017,8 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch21 -p1 -b .rhbz-1000150-Do-not-call-exit-upon-XIOError.patch
 %patch22 -p1 -b .rhbz-993963-NULL-m_pWindow-on-firefox-delet.patch
 %patch23 -p1 -b .rhbz-1006850-crash-in-SwCommentRuler-GetCom.patch
+%patch24 -p1 -b .Avoid-crash-when-a-comment-contains-data-but-no-text.patch
+%patch25 -p1 -b .fdo-68319-sw-fix-Chinese-Conversion.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2109,12 +2113,14 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
-# TODO: add this to 4.1.2.1+
-# - Resolves: rhbz#1008248 Writer Chinese Conversion crash
+* Tue Sep 17 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.1.2-5
+- Resolves: rhbz#988104 crash in certain pptx
+- Resolves: rhbz#1008248 Writer Chinese Conversion crash
+
 * Thu Sep 12 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.1.2-4
 - Resolves: rhbz#1006850 crash in SwCommentRuler
 
- Tue Sep 03 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.1.2-3
+* Tue Sep 03 2013 Caolán McNamara <caolanm at redhat.com> - 1:4.1.1.2-3
 - Resolves: rhbz#993963 NULL m_pWindow on firefox close plugin window
 
 * Fri Aug 23 2013 Stephan Bergmann <sbergman at redhat.com> - 1:4.1.1.2-2