|
 |
d6875cc |
From 04a5edc0b8a6399e0e692b4164dc72851fffcab9 Mon Sep 17 00:00:00 2001
|
|
|
d6875cc |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
d6875cc |
Date: Tue, 5 Jul 2011 12:41:43 +0100
|
|
|
d6875cc |
Subject: [PATCH] Related: rhbz#718976 crash in SwTxtSizeInfo::GetMultiCreator
|
|
|
d6875cc |
|
|
|
d6875cc |
---
|
|
|
d6875cc |
sw/source/core/text/pormulti.cxx | 7 +++++--
|
|
|
d6875cc |
1 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
d6875cc |
|
|
|
d6875cc |
diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
|
|
|
d6875cc |
index 1a31cf4..336a57d 100644
|
|
|
d6875cc |
--- a/sw/source/core/text/pormulti.cxx
|
|
|
d6875cc |
+++ b/sw/source/core/text/pormulti.cxx
|
|
|
d6875cc |
@@ -947,15 +947,18 @@ SwMultiCreator* SwTxtSizeInfo::GetMultiCreator( xub_StrLen &rPos,
|
|
|
d6875cc |
else
|
|
|
d6875cc |
pRotItem = NULL;
|
|
|
d6875cc |
const SvxTwoLinesItem* p2Lines = NULL;
|
|
|
d6875cc |
+ const SwTxtNode *pLclTxtNode = pFrm->GetTxtNode();
|
|
|
d6875cc |
+ if( !pLclTxtNode )
|
|
|
d6875cc |
+ return NULL;
|
|
|
d6875cc |
const SfxPoolItem* pItem;
|
|
|
d6875cc |
- if( SFX_ITEM_SET == pFrm->GetTxtNode()->GetSwAttrSet().
|
|
|
d6875cc |
+ if( SFX_ITEM_SET == pLclTxtNode->GetSwAttrSet().
|
|
|
d6875cc |
GetItemState( RES_CHRATR_TWO_LINES, sal_True, &pItem ) &&
|
|
|
d6875cc |
((SvxTwoLinesItem*)pItem)->GetValue() )
|
|
|
d6875cc |
p2Lines = (SvxTwoLinesItem*)pItem;
|
|
|
d6875cc |
else
|
|
|
d6875cc |
pItem = NULL;
|
|
|
d6875cc |
|
|
|
d6875cc |
- const SwpHints *pHints = pFrm->GetTxtNode()->GetpSwpHints();
|
|
|
d6875cc |
+ const SwpHints *pHints = pLclTxtNode->GetpSwpHints();
|
|
|
d6875cc |
if( !pHints && !p2Lines && !pRotate )
|
|
|
d6875cc |
return NULL;
|
|
|
d6875cc |
const SwTxtAttr *pRuby = NULL;
|
|
|
d6875cc |
--
|
|
|
d6875cc |
1.7.5.4
|
|
|
d6875cc |
|