diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-05 09:52:23 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-05 09:52:23 +0000 |
| commit | ef87b802c70c410263ca336fceaea3500510be8f (patch) | |
| tree | 69b36fda6699c29cd11cfae45c88ef67393aa126 /sw/source/core/doc/fmtcol.cxx | |
| parent | dbcc7492a383a8913a15ce1a4e46d57228d8a907 (diff) | |
INTEGRATION: CWS swqbf95_SRC680 (1.20.78.1.4); FILE MERGED
2007/01/25 08:23:41 od 1.20.78.1.4.1: #i73790# method <TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle(..)>
- check, if deletion of assignment is suppress.
class <SwTxtFmtColl>
- implementation of method <ResetAllFmtAttr()>
Diffstat (limited to 'sw/source/core/doc/fmtcol.cxx')
| -rw-r--r-- | sw/source/core/doc/fmtcol.cxx | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx index 1dccc951e07e..71489f82afa4 100644 --- a/sw/source/core/doc/fmtcol.cxx +++ b/sw/source/core/doc/fmtcol.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fmtcol.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: obo $ $Date: 2007-01-23 08:30:31 $ + * last change: $Author: vg $ $Date: 2007-02-05 10:52:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -103,7 +103,11 @@ void TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle( return; } - if ( pTxtFmtColl->AssignedToListLevelOfOutlineStyle() ) + // --> OD 2007-01-24 #i73790# +// if ( pTxtFmtColl->AssignedToListLevelOfOutlineStyle() ) + if ( !pTxtFmtColl->StayAssignedToListLevelOfOutlineStyle() && + pTxtFmtColl->AssignedToListLevelOfOutlineStyle() ) + // <-- { if ( !pNewNumRuleItem ) { @@ -354,6 +358,20 @@ BOOL SwTxtFmtColl::IsAtDocNodeSet() const return FALSE; } +// --> OD 2007-01-24 #i73790# +USHORT SwTxtFmtColl::ResetAllFmtAttr() +{ + const bool bOldState( mbStayAssignedToListLevelOfOutlineStyle ); + mbStayAssignedToListLevelOfOutlineStyle = true; + + USHORT nRet = SwFmtColl::ResetAllFmtAttr(); + + mbStayAssignedToListLevelOfOutlineStyle = bOldState; + + return nRet; +} +// <-- + //FEATURE::CONDCOLL SwCollCondition::SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond, |