diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 16:30:39 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 16:30:39 +0000 |
| commit | 41282d3c078dc521a5d0c078eaf0ebb40deeba38 (patch) | |
| tree | 657e4c9680aae346b89878768e7e9310cf98d221 /sw/source/core | |
| parent | 817114603856353779254ae6eeb48a47461ea51e (diff) | |
INTEGRATION: CWS xmlfilter03_DEV300 (1.47.160); FILE MERGED
2008/02/18 16:15:53 dr 1.47.160.2: RESYNC: (1.47-1.48); FILE MERGED
2008/01/22 14:21:14 os 1.47.160.1: calculation right aligned tab stops depending on compatibility option
Diffstat (limited to 'sw/source/core')
| -rw-r--r-- | sw/source/core/doc/doctxm.cxx | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index b3552a30c611..ac1ff93a45c2 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -4,9 +4,9 @@ * * $RCSfile: doctxm.cxx,v $ * - * $Revision: 1.48 $ + * $Revision: 1.49 $ * - * last change: $Author: vg $ $Date: 2008-01-29 08:37:38 $ + * last change: $Author: kz $ $Date: 2008-03-05 17:30:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1868,10 +1868,14 @@ void SwTOXBaseSection::GenerateText( USHORT nArrayIdx, } else nRightMargin = aNdRect.Width(); - //left margin of paragraph style - const SvxLRSpaceItem& rLRSpace = pTOXNd->GetTxtColl()->GetLRSpace(); - nRightMargin -= rLRSpace.GetLeft(); - nRightMargin -= rLRSpace.GetTxtFirstLineOfst(); + //#i24363# tab stops relative to indent + if( pDoc->get(IDocumentSettingAccess::TABS_RELATIVE_TO_INDENT) ) + { + //left margin of paragraph style + const SvxLRSpaceItem& rLRSpace = pTOXNd->GetTxtColl()->GetLRSpace(); + nRightMargin -= rLRSpace.GetLeft(); + nRightMargin -= rLRSpace.GetTxtFirstLineOfst(); + } aTStops.Insert( SvxTabStop( nRightMargin, SVX_TAB_ADJUST_RIGHT, cDfltDecimalChar, |