diff options
author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 12:22:12 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 12:22:12 +0000 |
commit | d1460294a378dbcc39f7c704a3202c4333d2dec3 (patch) | |
tree | 471209126f4acc8af2b7f1907d3bb9e54b5b1bb4 /sw/inc/fmtcol.hxx | |
parent | e5244a866f266bed1e00823ec37521ac547a1e57 (diff) |
INTEGRATION: CWS oasisbf2 (1.4.70); FILE MERGED
2004/11/08 13:08:14 dvo 1.4.70.2: #i31024# fix symbol export
2004/11/04 15:30:21 dvo 1.4.70.1: #i31024# prevent headings with outline num-rules from being written as lists
(plus dependent changes for NO_NUM removal)
Diffstat (limited to 'sw/inc/fmtcol.hxx')
-rw-r--r-- | sw/inc/fmtcol.hxx | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 8561cebc4e91..a0a8f34d3f81 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fmtcol.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2004-09-08 14:50:21 $ + * last change: $Author: rt $ $Date: 2004-11-26 13:22:12 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -100,7 +100,7 @@ private: }; -class SwTxtFmtColl: public SwFmtColl +class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl { friend class SwDoc; @@ -133,7 +133,7 @@ public: TYPEINFO(); //Bereits in Basisklasse Client drin. - inline void SetOutlineLevel( BYTE ); + void SetOutlineLevel( BYTE ); inline BYTE GetOutlineLevel() const { return nOutlineLevel; } inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext); @@ -297,14 +297,5 @@ inline void SwTxtFmtColl::SetNextTxtFmtColl( SwTxtFmtColl& rNext ) { pNextTxtFmtColl = &rNext; } - -inline void SwTxtFmtColl::SetOutlineLevel( BYTE nLevel ) -{ - ASSERT( nLevel < MAXLEVEL || nLevel == NO_NUMBERING , - "SwTxtFmtColl: Level too low" ); - nOutlineLevel = nLevel; -} - - #endif |