vcl: rename Window::Notify to EventNotify

There is annoying overloading between Window::Notify and
SfxListener::Notify, and the Window one has apparently fewer
implementations, so rename that and remove lots of disambiguating
"using Notify" in multiply inheriting classes.

Change-Id: I8b597fd9e70cf2e7103b9dfa7cc666e79e7aff49

4 files changed, 3 insertions, 5 deletions

diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx
index 110e3bfca519..1dfddaf29da2 100644
--- a/reportdesign/source/ui/inc/ColorListener.hxx
+++ b/reportdesign/source/ui/inc/ColorListener.hxx
@@ -50,7 +50,6 @@ namespace rptui
         virtual ~OColorListener() override;
         virtual void dispose() override;
 
-        using Window::Notify;
         // SfxListener
         virtual void Notify(SfxBroadcaster & rBc, SfxHint const & rHint) override;
 
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 3c1d31a13cd1..c995b964b4a1 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -67,7 +67,7 @@ namespace rptui
         virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
         // window
         virtual void            Resize() override;
-        virtual bool            Notify( NotifyEvent& rNEvt ) override;
+        virtual bool            EventNotify( NotifyEvent& rNEvt ) override;
         // OPropertyChangeListener
         virtual void            _propertyChanged(const css::beans::PropertyChangeEvent& _rEvent) throw( css::uno::RuntimeException, std::exception) override;
     public:
diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx
index b5179cf20a68..305fc10f53b5 100644
--- a/reportdesign/source/ui/inc/StartMarker.hxx
+++ b/reportdesign/source/ui/inc/StartMarker.hxx
@@ -62,7 +62,6 @@ namespace rptui
         virtual void MouseButtonUp(const MouseEvent& rMEvt) override;
         virtual void Resize() override;
         virtual void RequestHelp(const HelpEvent& rHEvt) override;
-        using Window::Notify;
 
         void setTitle(const OUString& _sTitle);
         sal_Int32 getMinHeight() const;
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 55cf12a58eb8..994dc51ed8ba 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -325,7 +325,7 @@ void OScrollWindowHelper::collapseSections(const uno::Sequence< css::beans::Prop
     m_aReportWindow->collapseSections(_aCollpasedSections);
 }
 
-bool OScrollWindowHelper::Notify( NotifyEvent& rNEvt )
+bool OScrollWindowHelper::EventNotify( NotifyEvent& rNEvt )
 {
     const CommandEvent* pCommandEvent = rNEvt.GetCommandEvent();
     if ( pCommandEvent &&
@@ -344,7 +344,7 @@ bool OScrollWindowHelper::Notify( NotifyEvent& rNEvt )
         if ( HandleScrollCommand( *pCommandEvent, pHScrBar, pVScrBar ) )
             return true;
     }
-    return OScrollWindowHelper_BASE::Notify(rNEvt);
+    return OScrollWindowHelper_BASE::EventNotify(rNEvt);
 }
 
 void OScrollWindowHelper::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection)