diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-10-25 14:22:57 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-10-25 14:22:57 +0200 |
commit | 0a1fd15663b6ebb99807cd04dcf84ab1af6711f8 (patch) | |
tree | 031a775b51a38adc7f4522ffa2dcfedfb2f765e0 /sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | |
parent | 9aab0238e78d474b0b36d70bf65bb95d49bf6a78 (diff) | |
parent | 40504a99ac475cbab3571a445040ca26b5527b3c (diff) |
CWS monogolianlayout: resync to m90
Diffstat (limited to 'sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx')
-rw-r--r-- | sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx index a1dbc2baeec0..d2b74afdafa1 100644 --- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx +++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx @@ -213,9 +213,11 @@ void SwToCntntAnchoredObjectPosition::CalcPosition() !GetAnchoredObj().GetLastCharRect().Width() ) || !GetAnchoredObj().GetLastTopOfLine() ) { - // --> OD 2004-07-15 #117380# - suppress check for paragraph - // portion information by passing <false> as first parameter - GetAnchoredObj().CheckCharRectAndTopOfLine( false ); + // --> OD 2010-07-02 #i111886# + // Check existence of paragraph portion information in order + // to avoid formatting which could cause deletion of follow frames. + GetAnchoredObj().CheckCharRectAndTopOfLine(); + // <-- // OD 2005-01-12 - Due to table break algorithm the character // rectangle can have no height. Thus, check also the width if ( ( !GetAnchoredObj().GetLastCharRect().Height() && |