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

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;