[libreoffice] Related: rhbz#718976 crash in SwTxtSizeInfo::GetMultiCreator

[Caolan McNamara]

commit d6875cceb60713d960a3a38c9716a6302ffacd7a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 5 12:44:43 2011 +0100

    Related: rhbz#718976 crash in SwTxtSizeInfo::GetMultiCreator

 ...z-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch |   37 ++++++++++++++++++++
 libreoffice.spec                                   |    7 +++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch b/0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
new file mode 100644
index 0000000..86591c3
--- /dev/null
+++ b/0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
@@ -0,0 +1,37 @@
+From 04a5edc0b8a6399e0e692b4164dc72851fffcab9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Tue, 5 Jul 2011 12:41:43 +0100
+Subject: [PATCH] Related: rhbz#718976 crash in SwTxtSizeInfo::GetMultiCreator
+
+---
+ sw/source/core/text/pormulti.cxx |    7 +++++--
+ 1 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
+index 1a31cf4..336a57d 100644
+--- a/sw/source/core/text/pormulti.cxx
++++ b/sw/source/core/text/pormulti.cxx
+@@ -947,15 +947,18 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos,
+     else
+         pRotItem = NULL;
+     const SvxTwoLinesItem* p2Lines = NULL;
++    const SwTxtNode *pLclTxtNode = pFrm->GetTxtNode();
++    if( !pLclTxtNode )
++        return NULL;
+     const SfxPoolItem* pItem;
+-    if( SFX_ITEM_SET == pFrm->GetTxtNode()->GetSwAttrSet().
++    if( SFX_ITEM_SET == pLclTxtNode->GetSwAttrSet().
+         GetItemState( RES_CHRATR_TWO_LINES, sal_True, &pItem ) &&
+         ((SvxTwoLinesItem*)pItem)->GetValue() )
+         p2Lines = (SvxTwoLinesItem*)pItem;
+     else
+         pItem = NULL;
+ 
+-    const SwpHints *pHints = pFrm->GetTxtNode()->GetpSwpHints();
++    const SwpHints *pHints = pLclTxtNode->GetpSwpHints();
+     if( !pHints && !p2Lines && !pRotate )
+         return NULL;
+     const SwTxtAttr *pRuby = NULL;
+-- 
+1.7.5.4
+
diff --git a/libreoffice.spec b/libreoffice.spec
index adb60a1..08b1f41 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -27,7 +27,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        3.4.1.3
-Release:        1%{?dist}
+Release:        2%{?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
@@ -114,6 +114,7 @@ Patch19: 0001-Related-rhbz-702833-addEventListener-without-removeE.patch
 Patch20: 0001-Related-rhbz-711087-band-aid.patch
 Patch21: 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
 Patch22: 0001-bad-merge-fix-to-enable-extensions-to-build-again.patch
+Patch23: 0001-Related-rhbz-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -738,6 +739,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch20 -p1 -b .rhbz711087-band-aid.patch
 %patch21 -p1 -b .rhbz667082-do-not-crash-importing-section-containin.patch
 %patch22 -p1 -b .bad-merge-fix-to-enable-extensions-to-build-again.patch
+%patch23 -p1 -b .rhbz718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2022,6 +2024,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
+* Tue Jul 05 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.1.3-2
+- Related: rhbz#718976 crash in SwTxtSizeInfo::GetMultiCreator
+
 * Fri Jul 01 2011 David Tardon <dtardon at redhat.com> - 3.4.1.3-1
 - 3.4.1 rc3