diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-02-05 09:51:35 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-02-05 09:51:35 +0000 |
| commit | 2289dc55aae35a6eb269ec26721380a18522fa83 (patch) | |
| tree | 0484be067e22934d9c6a26b9acce77a9f476bd0b /sw/inc/fmtcol.hxx | |
| parent | 670865e6ebb9c7bb0f439a3850ede7094f6502a4 (diff) | |
INTEGRATION: CWS swqbf95_SRC680 (1.7.156.1.4); FILE MERGED
2007/01/25 08:19:13 od 1.7.156.1.4.1: #i73790# class <SwTxtFmtColl>
- introduce new boolean member <mbStayAssignedToListLevelOfOutlineStyle>
- override method <ResetAllFmtAttr> to stay assigned to list level
of outline style
Diffstat (limited to 'sw/inc/fmtcol.hxx')
| -rw-r--r-- | sw/inc/fmtcol.hxx | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index f42266e24a71..837463d263c5 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -4,9 +4,9 @@ * * $RCSfile: fmtcol.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2007-01-23 08:29:35 $ + * last change: $Author: vg $ $Date: 2007-02-05 10:51:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -80,6 +80,9 @@ class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl SwTxtFmtColl(const SwTxtFmtColl & rRef); + // --> OD 2007-01-24 #i73790# + bool mbStayAssignedToListLevelOfOutlineStyle; + // <-- protected: BYTE nOutlineLevel; SwTxtFmtColl *pNextTxtFmtColl; @@ -89,7 +92,10 @@ protected: USHORT nFmtWh = RES_TXTFMTCOLL ) : SwFmtColl( rPool, pFmtCollName, aTxtFmtCollSetRange, pDerFrom, nFmtWh ), - nOutlineLevel( NO_NUMBERING ) + // --> OD 2007-01-24 #i73790# + mbStayAssignedToListLevelOfOutlineStyle( false ), + // <-- + nOutlineLevel( NO_NUMBERING ) { pNextTxtFmtColl = this; } SwTxtFmtColl( SwAttrPool& rPool, const String &rFmtCollName, @@ -97,7 +103,10 @@ protected: USHORT nFmtWh = RES_TXTFMTCOLL ) : SwFmtColl( rPool, rFmtCollName, aTxtFmtCollSetRange, pDerFrom, nFmtWh ), - nOutlineLevel( NO_NUMBERING ) + // --> OD 2007-01-24 #i73790# + mbStayAssignedToListLevelOfOutlineStyle( false ), + // <-- + nOutlineLevel( NO_NUMBERING ) { pNextTxtFmtColl = this; } public: @@ -127,6 +136,15 @@ public: } // <-- + // --> OD 2007-01-24 #i73790# + // override <ResetAllFmtAttr()> to stay assigned to list level of outline style + virtual USHORT ResetAllFmtAttr(); + + inline bool StayAssignedToListLevelOfOutlineStyle() const + { + return mbStayAssignedToListLevelOfOutlineStyle; + } + // <-- /*----------------- JP 09.08.94 17:36 ------------------- wird die Funktionalitaet von Zeichenvorlagen an Absatzvorlagen ueberhaupt benoetigt ?? |