[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/core/text/txtfrm.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 969941f996385fa48f405f51f97a39454ef2b79a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 1 12:17:38 2014 +0100

    Related: fdo#58277 if the SwFrm is not IsValid so are its portions
    
    i.e. they don't necessarily match the SwTxtNode anymore, e.g.
    content deleted from node, SwFrm is invalid, old portions
    refer to old offsets not new ones yet
    
    Change-Id: I755051cd647aa7bb203a6e1f815193fb6ec39191

diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 389127d..720f888 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -2512,9 +2512,9 @@ void SwTxtFrm::RecalcAllLines()
 
 void SwTxtFrm::VisitPortions( SwPortionHandler& rPH ) const
 {
-    const SwParaPortion* pPara = GetPara();
+    const SwParaPortion* pPara = IsValid() ? GetPara() : NULL;
 
-    if( pPara )
+    if (pPara)
     {
         if ( IsFollow() )
             rPH.Skip( GetOfst() );