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

[Caolan McNamara]

commit 68660dd78da290e7c09c049a7b0988837aa290ea
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 5 14:28:16 2011 +0100

    Related: rhbz#718976 crash in SwTxtSizeInfo::GetMultiCreator

 ...z-718976-crash-in-SwTxtSizeInfo-GetMultiC.patch |   37 ++++++++++++++++++++
 libreoffice.spec                                   |    5 ++-
 2 files changed, 41 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 23ce9ee..7614512 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -150,6 +150,7 @@ Patch61: 0001-Resolves-rhbz-713154-pdf-export-dialog-too-tall-to-f.patch
 Patch62: 0001-Related-rhbz-702833-addEventListener-without-removeE.patch
 Patch63: 0001-Related-rhbz-711087-band-aid.patch
 Patch64: 0001-rhbz-667082-do-not-crash-importing-section-containin.patch
+Patch65: 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}
@@ -815,6 +816,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch62 -p1 -b .rhbz702833-addEventListener-without-removeE.patch
 %patch63 -p1 -b .rhbz711087-band-aid.patch
 %patch64 -p1 -b .rhbz667082-do-not-crash-importing-section-containin.patch
+%patch65 -p1 -b .rhbz718976-crash-in-SwTxtSizeInfo-GetMultiC.patch
 
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
@@ -2159,12 +2161,13 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
-* Tue Jun 21 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-2-UNBUILT
+* Tue Jul 05 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-2
 - Resolves: rhbz#713154 pdf export dialog too tall to fit
 - Related: rhbz#702833 addEventListener without removeEventListener
 - Related: rhbz#711087 band aid for crash in undo
 - Resolves: rhbz#667082 do not crash importing section containing just
   an empty paragraph (dtardon)
+- Related: rhbz#718976 crash in SwTxtSizeInfo::GetMultiCreator
 
 * Tue Jun 14 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.3.1-1
 - bugfixing 3.3.3.1 point release