diff options
| author | Andreas Martens <ama@openoffice.org> | 2000-11-09 10:39:59 +0000 |
|---|---|---|
| committer | Andreas Martens <ama@openoffice.org> | 2000-11-09 10:39:59 +0000 |
| commit | d1ec40f1908cb6ec7fac66f9af01d178e4a447a6 (patch) | |
| tree | 7fdb7cc81f0218cc9d6e2f67ca5a1c931b2728c8 | |
| parent | 8acbc2b70f5d7e7b0bb5efa62bbf0b0b9479038f (diff) | |
Fix: Background for field portions with additional space, especally in ruby portions
| -rw-r--r-- | sw/source/core/text/inftxt.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index a7639984aa2e..06b9c1064599 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: inftxt.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: ama $ $Date: 2000-11-06 09:24:36 $ + * last change: $Author: ama $ $Date: 2000-11-09 11:39:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -604,9 +604,12 @@ SwRect lcl_CalcRect( const SwTxtPaintInfo *pInf, const SwLinePortion &rPor ) SwRect aRect( GetDrawPos( pInf->GetPos(), rPor ), Size( rPor.Width(), rPor.Height() ) ); if( rPor.InSpaceGrp() && pInf->GetSpaceAdd() ) - aRect.Width( aRect.Width() + - rPor.CalcSpacing( pInf->GetSpaceAdd(), *pInf ) ); - + { + SwTwips nAdd = rPor.CalcSpacing( pInf->GetSpaceAdd(), *pInf ); + if( rPor.InFldGrp() && pInf->GetSpaceAdd() < 0 && nAdd ) + nAdd += pInf->GetSpaceAdd(); + aRect.Width( aRect.Width() + nAdd ); + } if( aRect.HasArea() ) { ::SwAlignRect( aRect, (ViewShell*)pInf->GetVsh() ); @@ -673,7 +676,7 @@ void SwTxtPaintInfo::_DrawBackBrush( const SwLinePortion &rPor ) const void SwTxtPaintInfo::DrawViewOpt( const SwLinePortion &rPor, const MSHORT nWhich ) const { - if( OnWin() ) + if( OnWin() && !IsMulti() ) { sal_Bool bDraw = sal_False; switch( nWhich ) |