CWS-TOOLING: integrate CWS sfxnotifyremoval

14 files changed, 21 insertions, 33 deletions

diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 14b2f1065c95..59f06c66c6e4 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -340,7 +340,7 @@ bool DrawViewWrapper::IsObjectHit( SdrObject* pObj, const Point& rPnt ) const
     return false;
 }
 
-void DrawViewWrapper::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType)
+void DrawViewWrapper::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
     //prevent wrong reselection of objects
     SdrModel* pSdrModel( this->GetModel() );
@@ -357,7 +357,7 @@ void DrawViewWrapper::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, con
             return;
     }
 
-    E3dView::SFX_NOTIFY(rBC, rBCType, rHint, rHintType);
+    E3dView::Notify(rBC, rHint);
 
     if( pSdrHint != 0 )
     {
diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx
index bf023dbf228a..3709145db281 100644
--- a/chart2/source/controller/inc/DrawViewWrapper.hxx
+++ b/chart2/source/controller/inc/DrawViewWrapper.hxx
@@ -93,7 +93,7 @@ public:
     SdrObject* getNamedSdrObject( const rtl::OUString& rName ) const;
     bool IsObjectHit( SdrObject* pObj, const Point& rPnt ) const;
 
-    virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType);
+    virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 
     static SdrObject* getSdrObject( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::drawing::XShape >& xShape );
diff --git a/sc/inc/stlsheet.hxx b/sc/inc/stlsheet.hxx
index c672036bfb39..06786dfff69d 100644
--- a/sc/inc/stlsheet.hxx
+++ b/sc/inc/stlsheet.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: stlsheet.hxx,v $
- * $Revision: 1.5 $
+ * $Revision: 1.5.46.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -87,8 +87,7 @@ protected:
                               SfxStyleFamily    eFamily,
                               USHORT            nMask );
 
-    virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                         const SfxHint& rHint, const TypeId& rHintType );
+    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 };
 
 #endif     // SC_STLSHEET_HXX
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index 179d44f28072..dafb3077bf27 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: servobj.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.11.10.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -209,8 +209,7 @@ BOOL __EXPORT ScServerObject::GetData(
     return 0;
 }
 
-void __EXPORT ScServerObject::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                                         const SfxHint& rHint, const TypeId& rHintType )
+void __EXPORT ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
     BOOL bDataChanged = FALSE;
 
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index f18bf55b705c..ee9a71290ff1 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -158,8 +158,7 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener
 
 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/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index dab0396e464f..85dfd59d5ba9 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -70,8 +70,7 @@ public:
     virtual         ~ScDrawView();
 
     virtual void    MarkListHasChanged();
-    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    DoConnect(SdrOle2Obj* pOleObj);
 
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index f617b2cb5854..bf2db0f0fd24 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dwfunctr.hxx,v $
- * $Revision: 1.7 $
+ * $Revision: 1.7.46.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -146,8 +146,7 @@ public:
                     ~ScFunctionDockWin();
 
     using SfxDockingWindow::Notify;
-    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/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 3b448f30f67f..48a2a41b0fbc 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -140,8 +140,7 @@ protected:
 
     virtual long    Notify( NotifyEvent& rNEvt );
 
-    virtual void    SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                            const SfxHint& rHint, const TypeId& rHintType );
+    virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
 private:
     void            FillRangeNames();
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index c59c3163e252..9a1236a1facc 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -328,8 +328,7 @@ public:
                 ~ScNavigatorDlg();
 
     using Window::Notify;
-    virtual void    SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                            const SfxHint& rHint, const TypeId& rHintType );
+    virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
     void            CursorPosChanged();
 
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 4f5da2bafe59..b24992fc2ef5 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -114,8 +114,7 @@ public:
                     GetSourceData() const       { return aSourceData; }
     BYTE            GetSourceDesignMode() const { return nSourceDesignMode; }
 
-    virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                         const SfxHint& rHint, const TypeId& rHintType );
+    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
     virtual SfxPrinter*     GetPrinter( BOOL bCreate = FALSE );
     virtual USHORT          SetPrinter( SfxPrinter* pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false );
diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx
index 1a1cd98b206f..0eca2cfafaf1 100644
--- a/sc/source/ui/inc/servobj.hxx
+++ b/sc/source/ui/inc/servobj.hxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: servobj.hxx,v $
- * $Revision: 1.6 $
+ * $Revision: 1.6.46.1 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -69,8 +69,7 @@ public:
                              const String & rMimeType,
                              BOOL bSynchron = FALSE );
 
-    virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                         const SfxHint& rHint, const TypeId& rHintType );
+    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
             void    EndListeningAll();
 };
 
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index e56675fc59b1..602587207f7d 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -358,8 +358,7 @@ public:
     void            SetEditChartName(const String& aStr){aEditChartName=aStr;}
 //UNUSED2008-05  const String&   GetEditChartName() const;
 
-    virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                         const SfxHint& rHint, const TypeId& rHintType );
+    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 
     ScNavigatorSettings*    GetNavigatorSettings();
 
diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx
index bb58738e2d9c..625d62ba280b 100644
--- a/sc/source/ui/view/drawvie3.cxx
+++ b/sc/source/ui/view/drawvie3.cxx
@@ -121,8 +121,7 @@ ScAnchorType ScDrawView::GetAnchor() const
     return SCA_DONTKNOW;
 }
 
-void __EXPORT ScDrawView::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                                     const SfxHint& rHint, const TypeId& rHintType )
+void __EXPORT ScDrawView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
     if (rHint.ISA(ScTabDeletedHint))                        // Tabelle geloescht
     {
@@ -140,7 +139,7 @@ void __EXPORT ScDrawView::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType
             UpdateWorkArea();
     }
     else
-        FmFormView::SFX_NOTIFY( rBC,rBCType,rHint,rHintType );
+        FmFormView::Notify( rBC,rHint );
 }
 
 void ScDrawView::UpdateIMap( SdrObject* pObj )
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index d64ac1b21915..36c0c0694d18 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -58,8 +58,7 @@
 
 //==================================================================
 
-void __EXPORT ScTabViewShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
-                         const SfxHint& rHint, const TypeId& rHintType )
+void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
     if (rHint.ISA(SfxSimpleHint))                       // ohne Parameter
     {
@@ -304,7 +303,7 @@ void __EXPORT ScTabViewShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBC
         }
     }
 
-    SfxViewShell::SFX_NOTIFY( rBC, rBCType, rHint, rHintType );
+    SfxViewShell::Notify( rBC, rHint );
 }
 
 //------------------------------------------------------------------