diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-05-03 13:40:26 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-05-03 13:40:26 +0000 |
| commit | bd8ab5a1c3590be0ddc32c5454dc0fee68ad0407 (patch) | |
| tree | fd4fb8d5e4b6b38978c6b2edcf8927074f278c73 /sw/source/ui | |
| parent | 99e690ab62021086b8b5082ee640709740daaf14 (diff) | |
INTEGRATION: CWS fr8fix2 (1.27.26); FILE MERGED
2005/04/19 14:36:09 hbrinkm 1.27.26.2: #i47232#
2005/04/15 13:16:26 hbrinkm 1.27.26.1: #i47232# set outline levels after change of numbering rule
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/misc/outline.cxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 7d1cc81266f8..ee45195eac7b 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outline.cxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: obo $ $Date: 2005-04-18 15:15:08 $ + * last change: $Author: obo $ $Date: 2005-05-03 14:40:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -478,14 +478,15 @@ short SwOutlineTabDialog::Ok() // bei allen erzeugten Vorlagen die Ebenen setzen, muss // geschehen, um evtl. aufgehobene Zuordnungen // auch wieder zu loeschen + + const SwNumRule * pOutlineRule = rWrtSh.GetOutlineNumRule(); + USHORT i, nCount = rWrtSh.GetTxtFmtCollCount(); for( i = 0; i < nCount; ++i ) { SwTxtFmtColl &rTxtColl = rWrtSh.GetTxtFmtColl(i); if( !rTxtColl.IsDefault() ) { - const SwNumRule * pOutlineRule = rWrtSh.GetOutlineNumRule(); - rTxtColl.SetOutlineLevel( (BYTE)GetLevel(rTxtColl.GetName())); if ((BYTE)GetLevel(rTxtColl.GetName()) == NO_NUMBERING) @@ -519,12 +520,18 @@ short SwOutlineTabDialog::Ok() SwTxtFmtColl* pTxtColl = rWrtSh.GetParaStyle( aCollNames[i], SwWrtShell::GETSTYLE_CREATESOME); if(pTxtColl) - pTxtColl->SetOutlineLevel( (BYTE)i ); + { + pTxtColl->SetOutlineLevel( i ); + + SwNumRuleItem aItem(pOutlineRule->GetName()); + pTxtColl->SetAttr(aItem); + } } } } - rWrtSh.SetOutlineNumRule( *pNumRule ); + rWrtSh.SetOutlineNumRule( *pNumRule); + return RET_OK; } |