[Libreoffice-commits] .: Branch 'libreoffice-3-3' - sw/source

[Caolán McNamara]

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

New commits:
commit f3b47ff0c59c046e390cf433004fe6d3f03100ee
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 30 13:52:10 2010 +0000

    Resolves: rhbz#657718# Crash in SwObjectFormatterTxtFrm::CreateObjFormatter
    (cherry picked from commit 7f75773f59f4e755c8e18b8f604d3ac56d94914e)

diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index 472db36..db63431 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -103,7 +103,7 @@ SwObjectFormatterTxtFrm* SwObjectFormatterTxtFrm::CreateObjFormatter(
     if ( _rAnchorTxtFrm.IsFollow() )
     {
         pMasterOfAnchorFrm = _rAnchorTxtFrm.FindMaster();
-        while ( pMasterOfAnchorFrm->IsFollow() )
+        while ( pMasterOfAnchorFrm && pMasterOfAnchorFrm->IsFollow() )
         {
             pMasterOfAnchorFrm = pMasterOfAnchorFrm->FindMaster();
         }