CWS-TOOLING: integrate CWS sfxnotifyremoval

5 files changed, 13 insertions, 32 deletions

diff --git a/svtools/inc/svtools/brdcst.hxx b/svtools/inc/svtools/brdcst.hxx
index 8148df32c9e0..2f9270f3cd4b 100644
--- a/svtools/inc/svtools/brdcst.hxx
+++ b/svtools/inc/svtools/brdcst.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: brdcst.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.60.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -41,9 +41,6 @@ class SfxHint;
 typedef SvPtrarr SfxListenerArr_Impl;
 #endif
 
-#define SFX_FORWARD( rBC, rBCT, rHint, rHintT ) \
-        Forward( rBC, rHint )
-
 //-------------------------------------------------------------------------
 
 class SVL_DLLPUBLIC SfxBroadcaster
@@ -58,8 +55,7 @@ private:
     const SfxBroadcaster&   operator=(const SfxBroadcaster &); // verboten
 
 protected:
-    void                    SFX_FORWARD(SfxBroadcaster& rBC, const TypeId& rBCType,
-                                        const SfxHint& rHint, const TypeId& rHintType);
+    void                    Forward(SfxBroadcaster& rBC, const SfxHint& rHint);
     virtual void            ListenersGone();
 
 public:
diff --git a/svtools/inc/svtools/style.hxx b/svtools/inc/svtools/style.hxx
index 7a24acc9ca5c..17e4bf7b9c06 100644
--- a/svtools/inc/svtools/style.hxx
+++ b/svtools/inc/svtools/style.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: style.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.60.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -296,8 +296,7 @@ public:
                         SfxStyleSheet( const UniString&, const SfxStyleSheetBasePool&, SfxStyleFamily, USHORT );
                         SfxStyleSheet( const SfxStyleSheet& );
 
-    virtual void        SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                                const SfxHint& rHint, const TypeId& rHintType );
+    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
     virtual BOOL        SetParent( const UniString& );
 
 protected:
diff --git a/svtools/source/items/style.cxx b/svtools/source/items/style.cxx
index 874299d55f9f..26ef160ffb93 100644
--- a/svtools/source/items/style.cxx
+++ b/svtools/source/items/style.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: style.cxx,v $
- * $Revision: 1.19 $
+ * $Revision: 1.19.60.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1283,10 +1283,9 @@ BOOL SfxStyleSheet::SetParent( const XubString& rName )
 
 // alle Zuhoerer benachtichtigen
 
-void SfxStyleSheet::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType,
-                           const SfxHint& rHint, const TypeId& rHintType )
+void SfxStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint )
 {
-    SFX_FORWARD(rBC, rBCType, rHint, rHintType);
+    Forward(rBC, rHint);
 }
 
 //////////////////////// SfxStyleSheetPool ///////////////////////////////
diff --git a/svtools/source/notify/brdcst.cxx b/svtools/source/notify/brdcst.cxx
index 7617fd515f7a..3a698c725c5c 100644
--- a/svtools/source/notify/brdcst.cxx
+++ b/svtools/source/notify/brdcst.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: brdcst.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.60.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -61,22 +61,12 @@ void SfxBroadcaster::Broadcast( const SfxHint &rHint )
     // is anybody to notify?
     if ( aListeners.Count() /*! || aGlobListeners.Count() */ )
     {
-        #if 0
-        // determine the type only once, because of its expensiveness
-        const TypeId& rBCType = Type();
-        const TypeId& rHintType = rHint.Type();
-        #endif
-
         // notify all registered listeners exactly once
         for ( USHORT n = 0; n < aListeners.Count(); ++n )
         {
             SfxListener* pListener = aListeners[n];
             if ( pListener )
-                #if 0
-                pListener->SFX_NOTIFY( *this, rBCType, rHint, rHintType );
-                #else
                 pListener->Notify( *this, rHint );
-                #endif
         }
     }
 }
@@ -183,15 +173,14 @@ void SfxBroadcaster::ListenersGone()
 
 // forward a notification to all registered listeners
 
-void SfxBroadcaster::SFX_FORWARD(SfxBroadcaster& rBC, const TypeId& rBCType,
-                               const SfxHint& rHint, const TypeId& rHintType)
+void SfxBroadcaster::Forward(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     const USHORT nCount = aListeners.Count();
     for ( USHORT i = 0; i < nCount; ++i )
     {
         SfxListener *pListener = aListeners[i];
         if ( pListener )
-            pListener->SFX_NOTIFY( rBC, rBCType, rHint, rHintType);
+            pListener->Notify( rBC, rHint );
     }
 }
 
diff --git a/svtools/source/notify/lstner.cxx b/svtools/source/notify/lstner.cxx
index a356a482eab2..d7345d7ed3db 100644
--- a/svtools/source/notify/lstner.cxx
+++ b/svtools/source/notify/lstner.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: lstner.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.60.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -182,11 +182,9 @@ BOOL SfxListener::IsListening( SfxBroadcaster& rBroadcaster ) const
 // base implementation of notification handler
 
 #ifdef DBG_UTIL
-void SfxListener::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                              const SfxHint&, const TypeId& rHintType )
+void SfxListener::Notify( SfxBroadcaster& rBC, const SfxHint& )
 #else
-void SfxListener::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
-                              const SfxHint&, const TypeId& )
+void SfxListener::Notify( SfxBroadcaster&, const SfxHint& )
 #endif
 {
     #ifdef DBG_UTIL