[Libreoffice-commits] .: sw/source

[Caolán McNamara]

 sw/source/core/text/frmform.cxx |   11 ++++++-----
 sw/source/core/text/inftxt.cxx  |    3 ++-
 sw/source/core/text/txtfly.cxx  |    6 ++++--
 sw/source/core/text/txtfrm.cxx  |    7 +++++--
 4 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 3682609659c1cfe6308f17c394f139fd16536964
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 23 15:14:00 2011 +0100

    Related: #i58612# don't crash anyway

diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index ba6e3e8..9a95b72 100755
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1463,10 +1463,11 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
 
     if( IsFollow() && IsFieldFollow() && rLine.GetStart() == GetOfst() )
     {
-        const SwLineLayout* pLine;
+        SwTxtFrm *pMaster = FindMaster();
+        OSL_ENSURE( pMaster, "SwTxtFrm::Format: homeless follow" );
+        const SwLineLayout* pLine=NULL;
+        if (pMaster)
         {
-            SwTxtFrm *pMaster = FindMaster();
-            OSL_ENSURE( pMaster, "SwTxtFrm::Format: homeless follow" );
             if( !pMaster->HasPara() )
                 pMaster->GetFormatted();
             SwTxtSizeInfo aInf( pMaster );
@@ -1474,8 +1475,8 @@ void SwTxtFrm::_Format( SwTxtFormatter &rLine, SwTxtFormatInfo &rInf,
             aMasterLine.Bottom();
             pLine = aMasterLine.GetCurr();
         }
-        SwLinePortion* pRest =
-            rLine.MakeRestPortion( pLine, GetOfst() );
+        SwLinePortion* pRest = pLine ?
+            rLine.MakeRestPortion(pLine, GetOfst()) : NULL;
         if( pRest )
             rInf.SetRest( pRest );
         else
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index d60b222..e04d713 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1465,7 +1465,8 @@ void SwTxtFormatInfo::Init()
     if ( GetTxtFrm()->IsFollow() )
     {
         const SwTxtFrm* pMaster = GetTxtFrm()->FindMaster();
-        const SwLinePortion* pTmpPara = pMaster->GetPara();
+        OSL_ENSURE(pMaster, "pTxtFrm without Master");
+        const SwLinePortion* pTmpPara = pMaster ? pMaster->GetPara() : NULL;
 
         // there is a master for this follow and the master does not have
         // any contents (especially it does not have a number portion)
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 7d7068a..513c2d5 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -890,7 +890,7 @@ sal_Bool SwTxtFly::IsAnyObj( const SwRect &rRect ) const
 const SwCntntFrm* SwTxtFly::_GetMaster()
 {
     pMaster = pCurrFrm;
-    while( pMaster->IsFollow() )
+    while( pMaster && pMaster->IsFollow() )
         pMaster = (SwCntntFrm*)pMaster->FindMaster();
     return pMaster;
 }
@@ -1551,7 +1551,9 @@ SwAnchoredObjList* SwTxtFly::InitAnchoredObjList()
 SwTwips SwTxtFly::CalcMinBottom() const
 {
     SwTwips nRet = 0;
-    const SwSortedObjs *pDrawObj = GetMaster()->GetDrawObjs();
+    const SwCntntFrm *pLclMaster = GetMaster();
+    OSL_ENSURE(pLclMaster, "SwTxtFly without master");
+    const SwSortedObjs *pDrawObj = pLclMaster ? pLclMaster->GetDrawObjs() : NULL;
     const sal_uInt32 nCount = pDrawObj ? pDrawObj->Count() : 0;
     if( nCount )
     {
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index cf6b0c1..fd4a314 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -646,9 +646,12 @@ void SwTxtFrm::HideAndShowObjects()
         }
     }
 
-    if ( IsFollow() )
+    if (IsFollow())
     {
-        FindMaster()->HideAndShowObjects();
+        SwTxtFrm *pMaster = FindMaster();
+        OSL_ENSURE(pMaster, "SwTxtFrm without master");
+        if (pMaster)
+            pMaster->HideAndShowObjects();
     }
 }