diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-08 16:17:52 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-08 16:17:52 +0000 |
| commit | 80667a5c870a33db1dbd0ad7c64eec4d9ac13d1c (patch) | |
| tree | f5c85aa7be2259558c2b7d6bac152612493fd8f1 /sw/source/core/doc/poolfmt.cxx | |
| parent | 6a29d5acfbd9dfac8eb651de8c2b9f5d0cc35cbc (diff) | |
INTEGRATION: CWS swnumtree (1.37.166); FILE MERGED
2005/09/13 20:31:45 hbrinkm 1.37.166.2: RESYNC: (1.37-1.38); FILE MERGED
2005/08/09 12:38:50 hbrinkm 1.37.166.1: #121445# lcl_SetHeadline: observe IsOutlineLevelYieldsOutlineRule
Diffstat (limited to 'sw/source/core/doc/poolfmt.cxx')
| -rw-r--r-- | sw/source/core/doc/poolfmt.cxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx index 16dfa650fe59..706833bf008c 100644 --- a/sw/source/core/doc/poolfmt.cxx +++ b/sw/source/core/doc/poolfmt.cxx @@ -4,9 +4,9 @@ * * $RCSfile: poolfmt.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: rt $ $Date: 2005-09-09 03:18:32 $ + * last change: $Author: rt $ $Date: 2005-11-08 17:17:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -326,7 +326,8 @@ void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl, pColl->SetOutlineLevel( nLevel ); if( !pDoc->IsHTMLMode() ) { - const SwNumFmt& rNFmt = pDoc->GetOutlineNumRule()->Get( nLevel ); + SwNumRule * pOutlineRule = pDoc->GetOutlineNumRule(); + const SwNumFmt& rNFmt = pOutlineRule->Get( nLevel ); if( rNFmt.GetAbsLSpace() || rNFmt.GetFirstLineOffset() ) { SvxLRSpaceItem aLR( (SvxLRSpaceItem&)pColl->GetAttr( RES_LR_SPACE ) ); @@ -334,6 +335,13 @@ void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl, aLR.SetTxtLeft( rNFmt.GetAbsLSpace() ); pColl->SetAttr( aLR ); } + + if (! pDoc->IsOutlineLevelYieldsOutlineRule()) + { + SwNumRuleItem aItem(pOutlineRule->GetName()); + + pColl->SetAttr(aItem); + } } } pColl->SetNextTxtFmtColl( *pDoc->GetTxtCollFromPool( |