[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/source

[Caolán McNamara]

 sw/source/core/doc/textboxhelper.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 67dd8a4958404c8f6e6caaae3ecdd9d7823d3681
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Dec 7 14:16:06 2014 +0000

    fdo#42785 fix crashing again with this doc in 4-4 series
    
    Change-Id: I834c97a373c55733515e8e1e4945b0f1cd972f89
    (cherry picked from commit f9f243b1ed1314d7f5d04924e36502a8899ff13d)

diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index 0c8ede9..e051234 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -248,7 +248,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();