fmtcol.hxx (1d2dbeb0) fmtcol.hxx (28f5a95a)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 55 unchanged lines hidden (view full) ---

64 // <--
65
66protected:
67 //sal_uInt8 nOutlineLevel; //<-#outline level, removed by zhaojianwei
68 bool mbAssignedToOutlineStyle;//<-#outline level added by zhaojianwei
69
70 SwTxtFmtColl *pNextTxtFmtColl;
71
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 55 unchanged lines hidden (view full) ---

64 // <--
65
66protected:
67 //sal_uInt8 nOutlineLevel; //<-#outline level, removed by zhaojianwei
68 bool mbAssignedToOutlineStyle;//<-#outline level added by zhaojianwei
69
70 SwTxtFmtColl *pNextTxtFmtColl;
71
72 SwTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
73 SwTxtFmtColl* pDerFrom = 0,
74 sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
75 : SwFmtColl( rPool, pFmtCollName, aTxtFmtCollSetRange,
76 pDerFrom, nFmtWh ),
77 // --> OD 2007-01-24 #i73790#
78 mbStayAssignedToListLevelOfOutlineStyle( false ),
79 // <--
80 //nOutlineLevel( NO_NUMBERING ) //<-#outline level,removed by zhaojianwei
81 mbAssignedToOutlineStyle(false) //<-#outline level,added by zhaojianwei
82 { pNextTxtFmtColl = this; }
72 SwTxtFmtColl(
73 SwAttrPool& rPool,
74 const sal_Char* pFmtCollName,
75 SwTxtFmtColl* pDerFrom = 0,
76 sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
77 : SwFmtColl( rPool, pFmtCollName, aTxtFmtCollSetRange
78 , pDerFrom, nFmtWh )
79 , mbStayAssignedToListLevelOfOutlineStyle( false )
80 , mbAssignedToOutlineStyle( false )
81 {
82 pNextTxtFmtColl = this;
83 }
83
84
84 SwTxtFmtColl( SwAttrPool& rPool, const String &rFmtCollName,
85 SwTxtFmtColl* pDerFrom = 0,
86 sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
87 : SwFmtColl( rPool, rFmtCollName, aTxtFmtCollSetRange,
88 pDerFrom, nFmtWh ),
89 // --> OD 2007-01-24 #i73790#
90 mbStayAssignedToListLevelOfOutlineStyle( false ),
91 // <--
92 //nOutlineLevel( NO_NUMBERING ) //<-#outline level,removed by zhaojianwei
93 mbAssignedToOutlineStyle(false) //<-#outline level,added by zhaojianwei
94 { pNextTxtFmtColl = this; }
85 SwTxtFmtColl(
86 SwAttrPool& rPool,
87 const String &rFmtCollName,
88 SwTxtFmtColl* pDerFrom = 0,
89 sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
90 : SwFmtColl( rPool, rFmtCollName, aTxtFmtCollSetRange
91 , pDerFrom, nFmtWh )
92 , mbStayAssignedToListLevelOfOutlineStyle( false )
93 , mbAssignedToOutlineStyle( false )
94 {
95 pNextTxtFmtColl = this;
96 }
95
96 // zum "abfischen" von UL-/LR-/FontHeight Aenderungen
97 virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
98
99public:
100
101 TYPEINFO(); //Bereits in Basisklasse Client drin.
102
103 inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext);
104 SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; }
105
106 sal_Bool IsAtDocNodeSet() const;
107
97
98 // zum "abfischen" von UL-/LR-/FontHeight Aenderungen
99 virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
100
101public:
102
103 TYPEINFO(); //Bereits in Basisklasse Client drin.
104
105 inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext);
106 SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; }
107
108 sal_Bool IsAtDocNodeSet() const;
109
108 // --> OD 2006-11-22 #i71574#
109 //<-#outline level,zhaojianwei
110 void SetAttrOutlineLevel( int );
111 int GetAttrOutlineLevel() const;
112 int GetAssignedOutlineStyleLevel() const;
110 void SetAttrOutlineLevel( int );
111 int GetAttrOutlineLevel() const;
112
113 // Return the list level of the Outline Style - the List Style for the outline numbering -
114 // to which the Paragraph Style is assigned.
115 int GetAssignedOutlineStyleLevel() const;
116
113 inline bool IsAssignedToListLevelOfOutlineStyle() const
114 {
115 return mbAssignedToOutlineStyle;
116 }
117 inline bool IsAssignedToListLevelOfOutlineStyle() const
118 {
119 return mbAssignedToOutlineStyle;
120 }
117 void AssignToListLevelOfOutlineStyle(const int nAssignedListLevel);
118 void DeleteAssignmentToListLevelOfOutlineStyle();
119 //<-end
120 // <--
121
121
122 // --> OD 2008-03-04 #refactorlists#
122 // If a Paragraph Style is assigned to list level N of the Outline Style,
123 // then its outline level - AttrOutlineLevel - is set to N+1
124 void AssignToListLevelOfOutlineStyle(const int nAssignedListLevel);
125
126 void DeleteAssignmentToListLevelOfOutlineStyle( const bool bResetOutlineLevel = true );
127
123 // override to recognize changes on the <SwNumRuleItem> and register/unregister
124 // the paragragh style at the corresponding <SwNumRule> instance
125 virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr );
126 virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet );
127 virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
128 // override to recognize changes on the <SwNumRuleItem> and register/unregister
129 // the paragragh style at the corresponding <SwNumRule> instance
130 virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr );
131 virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet );
132 virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
128 // <--
129
133
130 // --> OD 2007-01-24 #i73790#
131 // override <ResetAllFmtAttr()> to stay assigned to list level of outline style
132 virtual sal_uInt16 ResetAllFmtAttr();
133
134 inline bool StayAssignedToListLevelOfOutlineStyle() const
135 {
136 return mbStayAssignedToListLevelOfOutlineStyle;
137 }
138 // <--

--- 161 unchanged lines hidden --- 		134 // override <ResetAllFmtAttr()> to stay assigned to list level of outline style
135 virtual sal_uInt16 ResetAllFmtAttr();
136
137 inline bool StayAssignedToListLevelOfOutlineStyle() const
138 {
139 return mbStayAssignedToListLevelOfOutlineStyle;
140 }
141 // <--

--- 161 unchanged lines hidden ---