[Libreoffice-commits] .: sw/source

[Libreoffice Gerrit user]

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

New commits:
commit 157d7440e873428e276b523351cac22cda890d14
Author: Cédric Bosdonnat <cedric.bosdonnat.ooo at free.fr>
Date:   Fri Sep 21 10:40:24 2012 +0200

    n#779627: table empty cell para collapse fix with fly frames
    
    Make sure that the collapsed empty cell paragraph is more important in
    FormatEmpty than anything else (fly frames are the onle case.
    
    Change-Id: Id88e3370e988b45eabe4b9b30628e5472e9db1fe

diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 037dd13..a992d41 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -330,7 +330,7 @@ sal_Bool SwTxtFrm::FormatEmpty()
         SwTxtFly aTxtFly( this );
         SwRect aRect;
         sal_Bool bFirstFlyCheck = 0 != Prt().Height();
-        if ( bFirstFlyCheck &&
+        if ( !bCollapse && bFirstFlyCheck &&
              aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) )
             return sal_False;
         else
@@ -363,7 +363,7 @@ sal_Bool SwTxtFrm::FormatEmpty()
                 SetEmpty( sal_True );
                 SetCompletePaint();
             }
-            if( !bFirstFlyCheck &&
+            if( !bCollapse && !bFirstFlyCheck &&
                  aTxtFly.IsOn() && aTxtFly.IsAnyObj( aRect ) )
                  return sal_False;