| 1 |
From 04a5edc0b8a6399e0e692b4164dc72851fffcab9 Mon Sep 17 00:00:00 2001 |
| 2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> |
| 3 |
Date: Tue, 5 Jul 2011 12:41:43 +0100 |
| 4 |
Subject: [PATCH] Related: rhbz#718976 crash in SwTxtSizeInfo::GetMultiCreator |
| 5 |
|
| 6 |
--- |
| 7 |
sw/source/core/text/pormulti.cxx | 7 +++++-- |
| 8 |
1 files changed, 5 insertions(+), 2 deletions(-) |
| 9 |
|
| 10 |
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx |
| 11 |
index 1a31cf4..336a57d 100644 |
| 12 |
--- a/sw/source/core/text/pormulti.cxx |
| 13 |
+++ b/sw/source/core/text/pormulti.cxx |
| 14 |
@@ -947,15 +947,18 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos, |
| 15 |
else |
| 16 |
pRotItem = NULL; |
| 17 |
const SvxTwoLinesItem* p2Lines = NULL; |
| 18 |
+ const SwTxtNode *pLclTxtNode = pFrm->GetTxtNode(); |
| 19 |
+ if( !pLclTxtNode ) |
| 20 |
+ return NULL; |
| 21 |
const SfxPoolItem* pItem; |
| 22 |
- if( SFX_ITEM_SET == pFrm->GetTxtNode()->GetSwAttrSet(). |
| 23 |
+ if( SFX_ITEM_SET == pLclTxtNode->GetSwAttrSet(). |
| 24 |
GetItemState( RES_CHRATR_TWO_LINES, sal_True, &pItem ) && |
| 25 |
((SvxTwoLinesItem*)pItem)->GetValue() ) |
| 26 |
p2Lines = (SvxTwoLinesItem*)pItem; |
| 27 |
else |
| 28 |
pItem = NULL; |
| 29 |
|
| 30 |
- const SwpHints *pHints = pFrm->GetTxtNode()->GetpSwpHints(); |
| 31 |
+ const SwpHints *pHints = pLclTxtNode->GetpSwpHints(); |
| 32 |
if( !pHints && !p2Lines && !pRotate ) |
| 33 |
return NULL; |
| 34 |
const SwTxtAttr *pRuby = NULL; |
| 35 |
-- |
| 36 |
1.7.5.4 |
| 37 |
|
Parent Directory
| 
Revision Log