diff options
| author | Frank Meies <fme@openoffice.org> | 2001-10-30 12:47:02 +0000 |
|---|---|---|
| committer | Frank Meies <fme@openoffice.org> | 2001-10-30 12:47:02 +0000 |
| commit | cf8e5e46a132c7091a49db8c78cf16f009a83ea2 (patch) | |
| tree | fdc828cf107a51716c2be6870ba59dfb845e1a1e /sw/source/core/text/frmform.cxx | |
| parent | da3cd036e36fc285a107ca81c39453d4468f3551 (diff) | |
Chg: Vertical Formatting - Adjust repaint rectangle for growing or shrinking frames
Diffstat (limited to 'sw/source/core/text/frmform.cxx')
| -rw-r--r-- | sw/source/core/text/frmform.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 4aad84a7701b..3edcf79b4f22 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmform.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: fme $ $Date: 2001-10-29 11:14:27 $ + * last change: $Author: fme $ $Date: 2001-10-30 13:47:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1281,6 +1281,20 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine, const SwTwips nOldHeight = Prt().SSize().Height(); const SwTwips nChg = rLine.CalcBottomLine() - nDocPrtTop - nOldHeight; +#ifdef VERTICAL_LAYOUT + // Vertical Formatting: + // The (rotated) repaint rectangle's x coordinate referes to the frame. + // If the frame grows (or shirks) the repaint rectangle cannot simply + // be rotated back after formatting, because we use the upper left point + // of the frame for rotation. This point changes when growing/shrinking. + if ( IsVertical() && nChg ) + { + SwRect &rRepaint = *(pPara->GetRepaint()); + rRepaint.Left( rRepaint.Left() - nChg ); + rRepaint.Width( rRepaint.Width() - nChg ); + } +#endif + AdjustFrm( nChg, bHasToFit ); if( HasFollow() || IsInFtn() ) @@ -1302,6 +1316,10 @@ void SwTxtFrm::FormatAdjust( SwTxtFormatter &rLine, sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev ) { +#ifdef VERTICAL_LAYOUT + ASSERT( ! IsVertical() || IsSwapped(), + "SwTxtFrm::FormatLine( rLine, bPrev) with unswapped frame" ); +#endif SwParaPortion *pPara = rLine.GetInfo().GetParaPortion(); // Nach rLine.FormatLine() haelt nStart den neuen Wert, // waehrend in pOldStart der alte Offset gepflegt wird. |