diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-07-02 10:54:46 +0200 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-07-02 10:54:46 +0200 |
| commit | 9b87346bf4a1d32abfa781aa66d4d5b627133edf (patch) | |
| tree | 648d0a70f4bdbc062dd7a4bfb9749ac3b7199311 /sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | |
| parent | 513cbeb409f73108ba1a8455ceb04f8aa03b2b63 (diff) | |
sw33bf06: #i111886#: apply patch by od:
SwToCntntAnchoredObjectPosition::CalcPosition(): use the cached paragraph
portions; recalculating deletes layout frames that are on call stack (crash)
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 5f5e0155e77c..209ceb3c20e0 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() && |