summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-12-07 14:16:06 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-12-07 14:17:00 +0000
commitf9f243b1ed1314d7f5d04924e36502a8899ff13d (patch)
tree7e439f701c950efb60deba3561601df1388827e4
parent4ac876084bb89b6460b31e090a666b395f66b1e8 (diff)
fdo#42785 fix crashing again with this doc in 4-4 series
Change-Id: I834c97a373c55733515e8e1e4945b0f1cd972f89
-rw-r--r--sw/source/core/doc/textboxhelper.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index c59bcbded025..d0c99df5afb1 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -257,7 +257,7 @@ SwFrmFmt* SwTextBoxHelper::findTextBox(const SwFrmFmt* pShape)
SwFrmFmt* pRet = 0;
// Only draw frames can have TextBoxes.
- if (pShape->Which() == RES_DRAWFRMFMT && pShape->GetAttrSet().HasItem(RES_CNTNT))
+ if (pShape && pShape->Which() == RES_DRAWFRMFMT && pShape->GetAttrSet().HasItem(RES_CNTNT))
{
const SwFmtCntnt& rCntnt = pShape->GetCntnt();
const SwFrmFmts& rSpzFrmFmts = *pShape->GetDoc()->GetSpzFrmFmts();