diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 16:00:45 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 16:00:45 +0000 |
| commit | fc7da270e55e6535cd94e0532ff6543a266a3a51 (patch) | |
| tree | 5406116462648be9be73bd7a1870c44defb9d01a /sw/source/core/edit/ednumber.cxx | |
| parent | c17d523cbd2b127948cfec616f58ecaacc85c690 (diff) | |
INTEGRATION: CWS swnewlistlevelattrs_DEV300 (1.23.142); FILE MERGED
2008/02/13 11:19:24 od 1.23.142.2: #i85348# reset of indent attributes on applying list style at paragraphs
2008/01/31 12:38:06 od 1.23.142.1: #i85348# refactoring: adjust includes
Diffstat (limited to 'sw/source/core/edit/ednumber.cxx')
| -rw-r--r-- | sw/source/core/edit/ednumber.cxx | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx index 8c41f91dc2bc..7ff817c419ea 100644 --- a/sw/source/core/edit/ednumber.cxx +++ b/sw/source/core/edit/ednumber.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ednumber.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: obo $ $Date: 2008-02-26 10:39:41 $ + * last change: $Author: kz $ $Date: 2008-03-05 17:00:45 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,6 +58,9 @@ #ifndef _SWUNDO_HXX #include <swundo.hxx> #endif +#ifndef _NUMRULE_HXX +#include <numrule.hxx> +#endif SV_IMPL_VARARR_SORT( _SwPamRanges, SwPamRange ) @@ -706,7 +709,9 @@ const SwNumRule* SwEditShell::GetCurNumRule() const return GetDoc()->GetCurrNumRule( *GetCrsr()->GetPoint() ); } -void SwEditShell::SetCurNumRule( const SwNumRule& rRule ) +// OD 2008-02-08 #newlistlevelattrs# - add handling of parameter <bResetIndentAttrs> +void SwEditShell::SetCurNumRule( const SwNumRule& rRule, + const bool bResetIndentAttrs ) { StartAllAction(); @@ -719,14 +724,18 @@ void SwEditShell::SetCurNumRule( const SwNumRule& rRule ) for( USHORT n = 0; n < aRangeArr.Count(); ++n ) { aRangeArr.SetPam( n, aPam ); - GetDoc()->SetNumRule( aPam, rRule ); + // --> OD 2008-02-08 #newlistlevelattrs# + GetDoc()->SetNumRule( aPam, rRule, sal_True, bResetIndentAttrs ); + // <-- GetDoc()->SetCounted( aPam, true ); } GetDoc()->EndUndo( UNDO_END, NULL ); } else { - GetDoc()->SetNumRule( *pCrsr, rRule); + // --> OD 2008-02-08 #newlistlevelattrs# + GetDoc()->SetNumRule( *pCrsr, rRule, sal_True, bResetIndentAttrs ); + // <-- GetDoc()->SetCounted( *pCrsr, true ); } |