INTEGRATION: CWS swlists01 (1.19.466); FILE MERGED

2008/05/08 16:16:01 od 1.19.466.5: RESYNC: (1.20-1.21); FILE MERGED
2008/04/16 08:15:46 od 1.19.466.4: #i86732# further changes/adjustments for new list handling
2008/03/20 14:27:07 od 1.19.466.3: RESYNC: (1.19-1.20); FILE MERGED
2008/03/20 07:58:24 od 1.19.466.2: #i86732# class <SwCntntNode>
- make methods to set/reset attributes virtual to override them
by sub class <SwTxtNode>
2008/03/06 08:04:42 od 1.19.466.1: #i86732# refactoring: remove <#undef inline>

1 files changed, 13 insertions, 13 deletions

diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 4a584a3df391..433219c407d5 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: node.hxx,v $
- * $Revision: 1.21 $
+ * $Revision: 1.22 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -390,6 +390,10 @@ protected:
     // lasse von den entsprechenden Nodes die spz. AttrSets anlegen
     virtual void NewAttrSet( SwAttrPool& ) = 0;
 
+    // There some functions that like to remove items from the internal
+    // SwAttrSet (handle):
+    USHORT ClearItemsFromAttrSet( const std::vector<USHORT>& rWhichIds );
+
 public:
     TYPEINFO();     //Bereits in Basisklasse Client drin.
 
@@ -451,14 +455,14 @@ public:
     // Ist bInParent FALSE, wird nur in diesem Node nach dem Attribut gesucht.
     const SfxPoolItem& GetAttr( USHORT nWhich, BOOL bInParent=TRUE ) const;
     BOOL GetAttr( SfxItemSet& rSet, BOOL bInParent=TRUE ) const;
-    BOOL SetAttr( const SfxPoolItem& );
-    BOOL SetAttr( const SfxItemSet& rSet );
-    BOOL ResetAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
-    BOOL ResetAttr( const SvUShorts& rWhichArr );
-    USHORT ResetAllAttr();
-    // There some functions that like to remove items from the internal
-    // SwAttrSet (handle):
-    USHORT ClearItemsFromAttrSet( const std::vector<USHORT>& rWhichIds );
+    // --> OD 2008-03-13 #refactorlists#
+    // made virtual
+    virtual BOOL SetAttr( const SfxPoolItem& );
+    virtual BOOL SetAttr( const SfxItemSet& rSet );
+    virtual BOOL ResetAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
+    virtual BOOL ResetAttr( const SvUShorts& rWhichArr );
+    virtual USHORT ResetAllAttr();
+    // <--
 
     // liefert das Attribut, das nicht ueber die bedingte Vorlage kommt!
     const SfxPoolItem* GetNoCondAttr( USHORT nWhich, BOOL bInParents ) const;
@@ -753,8 +757,4 @@ inline const SfxPoolItem& SwCntntNode::GetAttr( USHORT nWhich,
 {
     return GetSwAttrSet().Get( nWhich, bInParents );
 }
-
-
-#undef inline
-
 #endif