CWS-TOOLING: integrate CWS sfxnotifyremoval

43 files changed, 76 insertions, 115 deletions

diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx
index fc663888f3a0..0fef77f3b9ed 100644
--- a/basic/source/app/app.cxx
+++ b/basic/source/app/app.cxx
@@ -826,8 +826,7 @@ void BasicFrame::SetAutoRun( BOOL bAuto )
     bIsAutoRun = bAuto;
 }
 
-void BasicFrame::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
-                            const SfxHint& rHint, const TypeId& )
+void BasicFrame::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.ISA( TTExecutionStatusHint ) )
     {
diff --git a/basic/source/app/appbased.cxx b/basic/source/app/appbased.cxx
index abb96b59557f..8a92d69ab259 100644
--- a/basic/source/app/appbased.cxx
+++ b/basic/source/app/appbased.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: appbased.cxx,v $
- * $Revision: 1.13 $
+ * $Revision: 1.13.20.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -108,8 +108,7 @@ AppBasEd::~AppBasEd()
     pMod->SetName( CUniString("--").Append( pMod->GetName() ) );
 }
 
-void AppBasEd::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
-                            const SfxHint& rHint, const TypeId& )
+void AppBasEd::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     const SfxSimpleHint* p = PTR_CAST(SfxSimpleHint,&rHint);
     if( p )
diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx
index df0c91851150..08ea57d12e3a 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 96c58a223387..71ce2b903e7e 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 c3ea4ea87798..636c7e20c8e2 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 9d3809173a7a..2fab1bc97d2a 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 b77cba9ceb9e..0c23aa4ffbdf 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 2f6b683178b9..224f3ea96855 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 536bdacef60f..d0b8842b0fe6 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();
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index 4b0e5712e19d..56a7e0a410fa 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: colrctrl.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.76.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -136,8 +136,7 @@ public:
                                            const ResId& rResId );
                     ~SvxColorDockingWindow();
 
-    virtual void    SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                            const SfxHint& rHint, const TypeId& rHintType );
+    virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
     void            SetSlotIDs( USHORT nLeft, USHORT nRight )
                         { nLeftSlot = nLeft; nRightSlot = nRight; }
diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx
index d411385c11dd..2488ad229fcd 100644
--- a/svx/inc/svx/fntctl.hxx
+++ b/svx/inc/svx/fntctl.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fntctl.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.76.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -54,10 +54,7 @@ private:
     DECL_LINK( MenuSelect, FontNameMenu * );
     SVX_DLLPRIVATE virtual void StateChanged( USHORT nSID, SfxItemState eState,
                                   const SfxPoolItem* pState );
-    SVX_DLLPRIVATE virtual void     SFX_NOTIFY( SfxBroadcaster& rBC,
-                                const TypeId& rBCType,
-                                const SfxHint& rHint,
-                                const TypeId& rHintType );
+    SVX_DLLPRIVATE virtual void     Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 //#endif
 
 public:
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index 8ba726c9e996..53c713161156 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/ruler.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: ruler.hxx,v $
- * $Revision: 1.4 $
+ * $Revision: 1.4.76.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -216,8 +216,7 @@ protected:
     virtual void    ExtraDown();
     virtual void    MouseMove( const MouseEvent& rMEvt );
 
-    virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                         const SfxHint& rHint, const TypeId& rHintType );
+    virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
     // Berechnung der Grenzwerte fuer Objectgrenzen
     // Werte sind bezogen auf die Seite
diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
index fc283acbb30e..b295c93d743b 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -120,10 +120,7 @@ protected:
 
     void RebuildLists();
 
-    virtual void SFX_NOTIFY(SfxBroadcaster &rBC,
-                            const TypeId   &rBCType,
-                            const SfxHint  &rHint,
-                            const TypeId   &rHintType);
+    virtual void Notify(SfxBroadcaster &rBC, const SfxHint  &rHint);
 
 protected:
     void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index fd0927e45bb7..ccfc74ab00af 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: svdedxv.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.4.76.2 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -162,7 +162,7 @@ public:
     virtual void BckAction();
     virtual void TakeActionRect(Rectangle& rRect) const;
 
-    virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
     virtual void ModelHasChanged();
 
     //************************************************************************
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index 6ee2a7c87817..c9a590feccc5 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: svdmrkv.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.76.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -166,7 +166,7 @@ private:
     void UndirtyMrkPnt() const;
 
 protected:
-    virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
     virtual void ModelHasChanged(); // Wird von der PaintView gerufen
     virtual void SetMarkHandles();                                           // aHdl (Liste der Handles) fuellen
     virtual void SetMarkRects();                                             // Rects an den PageViews
diff --git a/svx/inc/svx/svdoattr.hxx b/svx/inc/svx/svdoattr.hxx
index fc26179bfc7c..20b196443739 100644
--- a/svx/inc/svx/svdoattr.hxx
+++ b/svx/inc/svx/svdoattr.hxx
@@ -70,7 +70,7 @@ protected:
     FASTBOOL ImpGetShadowDist(sal_Int32& nXDist, sal_Int32& nYDist) const;
 
     // Zuhoeren, ob sich ein StyleSheet aendert
-    virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 
     SdrAttrObj();
     virtual ~SdrAttrObj();
diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx
index d716313bc2b2..35ea8a6a6712 100644
--- a/svx/inc/svx/svdocapt.hxx
+++ b/svx/inc/svx/svdocapt.hxx
@@ -118,7 +118,7 @@ public:
 
     virtual basegfx::B2DPolyPolygon TakeXorPoly(sal_Bool bDetail) const;
     virtual void SetModel(SdrModel* pNewModel);
-    virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 
     virtual sal_uInt32 GetHdlCount() const;
     virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const;
diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx
index 3cfd34650d17..bf781d970849 100644
--- a/svx/inc/svx/svdocirc.hxx
+++ b/svx/inc/svx/svdocirc.hxx
@@ -98,7 +98,7 @@ private:
     SVX_DLLPRIVATE virtual void RecalcXPoly();
 
 protected:
-    virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 
 public:
     TYPEINFO();
diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx
index 4f6e7aaf344c..a7e6e904a97d 100644
--- a/svx/inc/svx/svdoedge.hxx
+++ b/svx/inc/svx/svdoedge.hxx
@@ -210,7 +210,7 @@ public:
     sal_Bool IsBoundRectCalculationRunning() const { return mbBoundRectCalculationRunning; }
 
 protected:
-    virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 
     XPolygon ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rCenter) const;
     void ImpRecalcEdgeTrack();  // Neuberechnung des Verbindungsverlaufs
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 16689d147046..992edae87f4f 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -213,8 +213,7 @@ public:
 
     void                    AdjustToMaxRect( const Rectangle& rMaxRect, BOOL bShrinkOnly );
 
-    virtual void            SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                                        const SfxHint& rHint, const TypeId& rHintType );
+    virtual void            Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
     bool                    IsMirrored() { return bMirrored; }
     void                    SetMirrored( bool _bMirrored ) { bMirrored = _bMirrored; }
diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx
index 5b0e170103f4..bbbebc8dd711 100644
--- a/svx/inc/svx/svdorect.hxx
+++ b/svx/inc/svx/svdorect.hxx
@@ -146,7 +146,7 @@ public:
 
     virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
 
-    virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 };
 
 #endif //_SVDORECT_HXX
diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx
index ef915c8e5513..8477bf4ec9af 100644
--- a/svx/inc/svx/svdovirt.hxx
+++ b/svx/inc/svx/svdovirt.hxx
@@ -58,7 +58,7 @@ protected:
     Rectangle                   aSnapRect;
 
 protected:
-    virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 
     virtual SdrObjGeoData* NewGeoData() const;
     virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index 9535779c6d04..5fa95b379b3d 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -140,7 +140,7 @@ protected:
     sal_Bool IsLayer(const String& rName, const SetOfByte& rBS) const;
     void SetAllLayers(SetOfByte& rB, sal_Bool bJa);
 
-    virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 
     // Nachsehen, ob AktGroup noch Inserted ist.
     void CheckAktGroup();
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index 65eef54a693b..a4ffdb0c7a94 100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -275,7 +275,7 @@ public:
     BOOL ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
 protected:
 
-    virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
     void GlueInvalidate() const;
 
     void ShowEncirclement(OutputDevice* pOut);
diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx
index 9936c745ecf4..a6ae55eddafa 100644
--- a/svx/inc/svx/svdview.hxx
+++ b/svx/inc/svx/svdview.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: svdview.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.76.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -197,7 +197,7 @@ class SVX_DLLPUBLIC SdrView: public SdrCreateView, public tools::WeakBase< SdrVi
 protected:
     SvtAccessibilityOptions maAccessibilityOptions;
 
-    virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 
 public:
     TYPEINFO();
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index ad1afb606a9a..9784086c231b 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: svxruler.cxx,v $
- * $Revision: 1.39 $
+ * $Revision: 1.39.76.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -3621,8 +3621,7 @@ void __EXPORT SvxRuler::ExtraDown()
 }
 
 
-void __EXPORT SvxRuler::SFX_NOTIFY(SfxBroadcaster& , const TypeId& rBCType,
-                               const SfxHint& rHint, const TypeId& rHintType)
+void __EXPORT SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint)
 /*
 
    [Beschreibung]
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 1018effa32b7..ff8f35a44c52 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -866,13 +866,10 @@ void E3dScene::RestGeoData(const SdrObjGeoData& rGeo)
 |*
 \************************************************************************/
 
-void E3dScene::SFX_NOTIFY(SfxBroadcaster &rBC,
-                          const TypeId   &rBCType,
-                          const SfxHint  &rHint,
-                          const TypeId   &rHintType)
+void E3dScene::Notify(SfxBroadcaster &rBC, const SfxHint  &rHint)
 {
     SetRectsDirty();
-    E3dObject::SFX_NOTIFY(rBC, rBCType, rHint, rHintType);
+    E3dObject::Notify(rBC, rHint);
 }
 
 /*************************************************************************
diff --git a/svx/source/items/boxobj.hxx b/svx/source/items/boxobj.hxx
index 3841846efe4c..4b4b901dbd38 100644
--- a/svx/source/items/boxobj.hxx
+++ b/svx/source/items/boxobj.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: boxobj.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.3.76.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -66,8 +66,7 @@ private:
 
 protected:
     // Schnittstelle zum SbxObject/SvDispatch/SfxShell..Object
-    void                    SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                                    const SfxHint& rHint, const TypeId& rHintType );
+    void                    Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
     virtual ULONG           SetProperty( USHORT nSID, SbxVariable &rRet );
     virtual ULONG           GetProperty( USHORT nSID, SbxVariable &rRet );
 
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index 6c897125f2bc..1b00c199da48 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: fntctl.cxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.8.76.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -132,8 +132,7 @@ void SvxFontMenuControl::StateChanged(
     der DocumentShell gef"ullt.
 */
 
-void SvxFontMenuControl::SFX_NOTIFY( SfxBroadcaster&, const TypeId& rBCType,
-                                 const SfxHint& rHint, const TypeId& rHintType )
+void SvxFontMenuControl::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
     if ( rHint.Type() != TYPE(SfxSimpleHint) &&
          ( (SfxSimpleHint&)rHint ).GetId() == SFX_HINT_DOCCHANGED )
diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx
index bf3cc43e795d..8f478540d993 100644
--- a/svx/source/sdr/properties/graphicproperties.cxx
+++ b/svx/source/sdr/properties/graphicproperties.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: graphicproperties.cxx,v $
- * $Revision: 1.12 $
+ * $Revision: 1.12.76.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -91,7 +91,7 @@ namespace sdr
             rObj.SetXPolyDirty();
 
             // #i29367# Update GraphicAttr, too. This was formerly
-            // triggered by SdrGrafObj::SFX_NOTIFY, which is no longer
+            // triggered by SdrGrafObj::Notify, which is no longer
             // called nowadays. BTW: strictly speaking, the whole
             // ImpSetAttrToGrafInfo/ImpSetGrafInfoToAttr stuff could
             // be dumped, when SdrGrafObj::aGrafInfo is removed and
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index a2d99a5efddf..49ba83ed35ae 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -154,9 +154,9 @@ void SdrObjEditView::TakeActionRect(Rectangle& rRect) const
     }
 }
 
-void __EXPORT SdrObjEditView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void __EXPORT SdrObjEditView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
-    SdrGlueEditView::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
+    SdrGlueEditView::Notify(rBC,rHint);
     // Printerwechsel waerend des Editierens
     SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
     if (pSdrHint!=NULL && pTextEditOutliner!=NULL) {
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index bee7e32821bd..42a27dc99e36 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: svdmrkv.cxx,v $
- * $Revision: 1.39 $
+ * $Revision: 1.39.74.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -203,7 +203,7 @@ SdrMarkView::~SdrMarkView()
     delete mpSdrViewSelection;
 }
 
-void __EXPORT SdrMarkView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void __EXPORT SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
     if (pSdrHint!=NULL)
@@ -216,7 +216,7 @@ void __EXPORT SdrMarkView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType
             bMarkedPointsRectsDirty=TRUE;
         }
     }
-    SdrSnapView::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
+    SdrSnapView::Notify(rBC,rHint);
 }
 
 void SdrMarkView::ModelHasChanged()
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 9338930d9f0c..546add85e862 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -140,8 +140,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel)
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // syntactical sugar for ItemSet accesses
 
-void __EXPORT SdrAttrObj::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& rBCType,
-    const SfxHint& rHint, const TypeId& rHintType)
+void __EXPORT SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
 {
     SfxSimpleHint *pSimple = PTR_CAST(SfxSimpleHint, &rHint);
     BOOL bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId());
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index c29c65580f4c..af09d0fd8ca5 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -792,9 +792,9 @@ void SdrCaptionObj::SetModel(SdrModel* pNewModel)
     ImpRecalcTail();
 }
 
-void SdrCaptionObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void SdrCaptionObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
-    SdrRectObj::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
+    SdrRectObj::Notify(rBC,rHint);
     ImpRecalcTail();
 }
 
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 3678cc86ec4d..4141c761bc53 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -1202,10 +1202,10 @@ Point SdrCircObj::GetSnapPoint(sal_uInt32 i) const
     }
 }
 
-void __EXPORT SdrCircObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void __EXPORT SdrCircObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     SetXPolyDirty();
-    SdrRectObj::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
+    SdrRectObj::Notify(rBC,rHint);
     ImpSetAttrToCircInfo();
 }
 
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 249e619fcaab..c65c5d4fc62f 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1579,7 +1579,7 @@ je Objekt variiert von 0-3:
 'C':  n  0-3  0-3   = 1+U+1
 */
 
-void __EXPORT SdrEdgeObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId&, const SfxHint& rHint, const TypeId&)
+void __EXPORT SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     SfxSimpleHint* pSimple=PTR_CAST(SfxSimpleHint,&rHint);
     ULONG nId=pSimple==0 ? 0 : pSimple->GetId();
@@ -1598,7 +1598,7 @@ void __EXPORT SdrEdgeObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId&, const S
     {
         bEdgeTrackUserDefined = sal_False;
     }
-    SdrTextObj::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
+    SdrTextObj::Notify(rBC,rHint);
     if (nNotifyingCount==0) { // Hier nun auch ein VerriegelungsFlag
         ((SdrEdgeObj*)this)->nNotifyingCount++;
         SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
@@ -1634,13 +1634,13 @@ void SdrEdgeObj::Reformat()
     if( NULL != aCon1.pObj )
     {
         SfxSimpleHint aHint( SFX_HINT_DATACHANGED );
-        SFX_NOTIFY( *const_cast<SfxBroadcaster*>(aCon1.pObj->GetBroadcaster()), NULL, aHint, NULL );
+        Notify( *const_cast<SfxBroadcaster*>(aCon1.pObj->GetBroadcaster()), aHint );
     }
 
     if( NULL != aCon2.pObj )
     {
         SfxSimpleHint aHint( SFX_HINT_DATACHANGED );
-        SFX_NOTIFY( *const_cast<SfxBroadcaster*>(aCon2.pObj->GetBroadcaster()), NULL, aHint, NULL );
+        Notify( *const_cast<SfxBroadcaster*>(aCon2.pObj->GetBroadcaster()), aHint );
     }
 }
 
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index a84574bdf389..5b15013a7031 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -977,11 +977,10 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const
 
 // -----------------------------------------------------------------------------
 
-void SdrGrafObj::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                             const SfxHint& rHint, const TypeId& rHintType )
+void SdrGrafObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
     SetXPolyDirty();
-    SdrRectObj::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
+    SdrRectObj::Notify( rBC, rHint );
     ImpSetAttrToGrafInfo();
 }
 
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 817234b7bf40..44b71e5f7c16 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -679,9 +679,9 @@ SdrObject* SdrRectObj::DoConvertToPolyObj(BOOL bBezier) const
     return pRet;
 }
 
-void SdrRectObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void SdrRectObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
-    SdrTextObj::SFX_NOTIFY(rBC,rBCType,rHint,rHintType);
+    SdrTextObj::Notify(rBC,rHint);
     SetXPolyDirty(); // wg. Eckenradius
 }
 
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index b87df98704c1..3d191cfa78a8 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -91,7 +91,7 @@ SdrObject& SdrVirtObj::ReferencedObj()
     return rRefObj;
 }
 
-void __EXPORT SdrVirtObj::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& rBCType, const SfxHint& /*rHint*/, const TypeId& rHintType)
+void __EXPORT SdrVirtObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
 {
     bClosedObj=rRefObj.IsClosedObj();
     SetRectsDirty(); // hier noch Optimieren.
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 9f1a66366c38..eb41ebab2d2b 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -265,7 +265,7 @@ void SdrPageView::RemovePaintWindowFromPageView(SdrPaintWindow& rPaintWindow)
     return xReturn;
 }
 
-void __EXPORT SdrPageView::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& /*rBCType*/, const SfxHint& /*rHint*/, const TypeId& /*rHintType*/)
+void __EXPORT SdrPageView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& /*rHint*/)
 {
     // not really interested in
 }
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 3bad186a2b47..be6805c3c544 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -320,7 +320,7 @@ SdrPaintView::~SdrPaintView()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void __EXPORT SdrPaintView::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void __EXPORT SdrPaintView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
 {
     BOOL bObjChg=!bSomeObjChgdFlag; // TRUE= auswerten fuer ComeBack-Timer
     if (bObjChg) {
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 07a3fbb658cf..355f0a261615 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -1555,14 +1555,14 @@ BOOL SdrView::IsDeleteMarkedPossible() const
     return IsDeleteMarkedObjPossible();
 }
 
-void SdrView::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void SdrView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     if( rHint.ISA( SfxSimpleHint ) && ( (SfxSimpleHint&) rHint ).GetId() == SFX_HINT_ACCESSIBILITY_CHANGED )
     {
         onAccessibilityOptionsChanged();
     }
 
-     SdrCreateView::SFX_NOTIFY(rBC, rBCType, rHint, rHintType );
+     SdrCreateView::Notify(rBC, rHint);
 }
 
 SvtAccessibilityOptions& SdrView::getAccessibilityOptions()
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 10720a26d8c6..12978b5a6b44 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: colrctrl.cxx,v $
- * $Revision: 1.20 $
+ * $Revision: 1.20.76.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -357,10 +357,7 @@ SvxColorDockingWindow::~SvxColorDockingWindow()
 |*
 \************************************************************************/
 
-void SvxColorDockingWindow::SFX_NOTIFY( SfxBroadcaster& ,
-                                         const TypeId& rBCType,
-                                         const SfxHint& rHint,
-                                         const TypeId& rHintType )
+void SvxColorDockingWindow::Notify( SfxBroadcaster& , const SfxHint& rHint )
 {
     const SfxPoolItemHint *pPoolItemHint = PTR_CAST(SfxPoolItemHint, &rHint);
     if ( pPoolItemHint