diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 11:27:41 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 11:27:41 +0000 |
| commit | 23c80e58e22ea7f178bc67914fabd0145edccb07 (patch) | |
| tree | e30ad5fb9adb8dd68f4d3c1293ac0aae317c2a33 /svx | |
| parent | b7cacb637b5c3e49011f930e1ad880dad0830b64 (diff) | |
INTEGRATION: CWS impressodf12 (1.118.324); FILE MERGED
2008/04/25 09:00:17 cl 1.118.324.2: RESYNC: (1.118-1.119); FILE MERGED
2008/04/21 15:31:49 tl 1.118.324.1: #i35937# EditEngine/outliner changes regarding number format and bullets
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/editeng/impedit2.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx index 16345faabd85..d51edae22cb2 100644 --- a/svx/source/editeng/impedit2.cxx +++ b/svx/source/editeng/impedit2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: impedit2.cxx,v $ - * $Revision: 1.120 $ + * $Revision: 1.121 $ * * This file is part of OpenOffice.org. * @@ -3029,10 +3029,11 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace ) for ( USHORT nPara = 0; nPara < nParas; nPara++ ) { ParaPortion* pPortion = GetParaPortions().GetObject( nPara ); - const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pPortion->GetNode() ); - if ( pPortion->IsVisible() ) { + const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pPortion->GetNode() ); + sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth( pPortion->GetNode() ); + // -------------------------------------------------- // Ueber die Zeilen des Absatzes... // -------------------------------------------------- @@ -3046,14 +3047,14 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace ) // Papierbreite ab, hier nicht erwuenscht. // Am besten generell nicht auf StartPosX verlassen, // es muss auch die rechte Einrueckung beruecksichtigt werden! - nCurWidth = GetXValue( rLRItem.GetTxtLeft() ); + nCurWidth = GetXValue( rLRItem.GetTxtLeft() + nSpaceBeforeAndMinLabelWidth ); if ( nLine == 0 ) { long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() ); - nCurWidth += nFI; + nCurWidth -= nFI; if ( pPortion->GetBulletX() > nCurWidth ) { - nCurWidth -= nFI; // LI? + nCurWidth += nFI; // LI? if ( pPortion->GetBulletX() > nCurWidth ) nCurWidth = pPortion->GetBulletX(); } |