diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2012-09-21 10:40:24 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-09-21 10:39:57 +0200 |
| commit | 157d7440e873428e276b523351cac22cda890d14 (patch) | |
| tree | 0afe6e908d8bf53e67af5336895165de3e57fff9 | |
| parent | 49eaecd04bab1239b93cb576bf1c6bdb3620f52e (diff) | |
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
| -rw-r--r-- | sw/source/core/text/porrst.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx index 037dd13c0510..a992d41939bd 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; |