CWS-TOOLING: integrate CWS sfxnotifyremoval

7 files changed, 16 insertions, 33 deletions

diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index 3d1e1447ca..b551a4942f 100644
--- a/sfx2/inc/sfx2/viewfrm.hxx
+++ b/sfx2/inc/sfx2/viewfrm.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: viewfrm.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.46.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -145,8 +145,7 @@ private:
 #endif
 
 protected:
-    virtual void            SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                                    const SfxHint& rHint, const TypeId& rHintType );
+    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
     SAL_DLLPRIVATE void SetWindow_Impl( Window *pWin );
 
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index f00c50d1c5..861e676177 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: viewsh.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.46.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -185,10 +185,8 @@ protected:
 
     virtual void				Move();
 
-    virtual void                SFX_NOTIFY( SfxBroadcaster& rBC,
-                                        const TypeId& rBCType,
-                                        const SfxHint& rHint,
-                                        const TypeId& rHintType );
+    virtual void                Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
+
 public:
     // Iteration
     static SfxViewShell*        GetFirst( const TypeId* pType = 0, BOOL bOnlyVisible = TRUE );
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 19908936c3..fda9402d0d 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: templdlg.cxx,v $
- * $Revision: 1.58 $
+ * $Revision: 1.58.46.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1562,8 +1562,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
 
 
 //-------------------------------------------------------------------------
-void SfxCommonTemplateDialog_Impl::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& rBCType,
-                                          const SfxHint& rHint, const TypeId& rHintType)
+void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
 {
     // Aktualisierung anstossen
     if(rHint.Type() == TYPE(SfxSimpleHint))
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index e29a58c7ee..a7996eea0b 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: templdgi.hxx,v $
- * $Revision: 1.18 $
+ * $Revision: 1.18.46.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -226,8 +226,7 @@ protected:
     USHORT				StyleNrToInfoOffset( USHORT i );
     USHORT				InfoOffsetToStyleNr( USHORT i );
 
-    void				SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                                    const SfxHint& rHint, const TypeId& rHintType );
+    void				Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
     void				FamilySelect( USHORT nId );
     void				SetFamily( USHORT nId );
diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx
index beddaa53f0..a2645c69d4 100644
--- a/sfx2/source/view/prnmon.cxx
+++ b/sfx2/source/view/prnmon.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: prnmon.cxx,v $
- * $Revision: 1.25 $
+ * $Revision: 1.25.46.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -113,17 +113,10 @@ public:
     SfxViewShell*			GetViewShell() const { return pViewShell; }
     BOOL					SetPage( USHORT nPage, const String &rPage );
     void                    CreateMonitor();
-    virtual void            SFX_NOTIFY( SfxBroadcaster& rBC,
-                                        const TypeId& rBCType,
-                                        const SfxHint& rHint,
-                                        const TypeId& rHintType );
+    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 };
 
-void SfxPrintProgress_Impl::SFX_NOTIFY(
-    SfxBroadcaster& /*rBC*/,
-    const TypeId& rBCType,
-    const SfxHint& rHint,
-    const TypeId& rHintType )
+void SfxPrintProgress_Impl::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     SfxPrintingHint* pPrintHint = PTR_CAST( SfxPrintingHint, &rHint );
     if ( pPrintHint )
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx
index eda31d3574..2b1ccdfbc9 100644
--- a/sfx2/source/view/topfrm.cxx
+++ b/sfx2/source/view/topfrm.cxx
@@ -1151,7 +1151,7 @@ void SfxTopViewFrame::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     }
     }
 
-    SfxViewFrame::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
+    SfxViewFrame::Notify( rBC, rHint );
 }
 
 //--------------------------------------------------------------------
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 1edb60a688..7f3b58275c 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: viewfrm.cxx,v $
- * $Revision: 1.136 $
+ * $Revision: 1.136.8.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -1221,13 +1221,8 @@ void SfxViewFrame::ReleaseObjectShell_Impl( sal_Bool bStoreView )
         pDispatcher->Flush();
         EndListening( *xObjSh );
 
-        SFX_NOTIFY( *xObjSh, xObjSh->Type(),
-                SfxSimpleHint(SFX_HINT_TITLECHANGED),
-                TYPE(SfxSimpleHint) );
-
-        SFX_NOTIFY( *xObjSh, xObjSh->Type(),
-                SfxSimpleHint(SFX_HINT_DOCCHANGED),
-                TYPE(SfxSimpleHint) );
+        Notify( *xObjSh, SfxSimpleHint(SFX_HINT_TITLECHANGED) );
+        Notify( *xObjSh, SfxSimpleHint(SFX_HINT_DOCCHANGED) );
 
         if ( 1 == xObjSh->GetOwnerLockCount() && pImp->bObjLocked && xObjSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED )
             xObjSh->DoClose();