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

9 files changed, 15 insertions, 15 deletions

diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index cd67fbdd6d92..bef35545c845 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -583,7 +583,7 @@ void ClientBox::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-bool ClientBox::Notify( NotifyEvent& rNEvt )
+bool ClientBox::EventNotify( NotifyEvent& rNEvt )
 {
     if ( !m_bInDelete )
         DeleteRemoved();
@@ -619,7 +619,7 @@ bool ClientBox::Notify( NotifyEvent& rNEvt )
     }
 
     if ( !bHandled )
-        return Control::Notify( rNEvt );
+        return Control::EventNotify(rNEvt);
     else
         return true;
 }
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
index f953a0f87c4a..d6ffe9dc7f49 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx
@@ -137,7 +137,7 @@ public:
     void Paint( vcl::RenderContext& rRenderContext, const Rectangle &rPaintRect ) override;
     void Resize() override;
     Size GetOptimalSize() const override;
-    bool Notify( NotifyEvent& rNEvt ) override;
+    bool EventNotify( NotifyEvent& rNEvt ) override;
 
     TClientBoxEntry GetEntryData( long nPos ) { return m_vEntries[ nPos ]; }
     long GetActiveEntryIndex();
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 4d8e4bb93f1f..6d987cbd59ab 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -154,7 +154,7 @@ void SdDocPreviewWin::Paint( vcl::RenderContext& /*rRenderContext*/, const Recta
     }
 }
 
-bool SdDocPreviewWin::Notify( NotifyEvent& rNEvt )
+bool SdDocPreviewWin::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN )
     {
@@ -168,7 +168,7 @@ bool SdDocPreviewWin::Notify( NotifyEvent& rNEvt )
         }
     }
 
-    return Control::Notify( rNEvt );
+    return Control::EventNotify(rNEvt);
 }
 
 void SdDocPreviewWin::updateViewSettings()
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 084fdaf2fc03..0f3c15fd9ace 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -649,7 +649,7 @@ NavDocInfo* SdNavigatorWin::GetDocInfo()
 /**
  * PreNotify
  */
-bool SdNavigatorWin::Notify(NotifyEvent& rNEvt)
+bool SdNavigatorWin::EventNotify(NotifyEvent& rNEvt)
 {
     const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
     bool            bOK = false;
@@ -671,7 +671,7 @@ bool SdNavigatorWin::Notify(NotifyEvent& rNEvt)
                     sd::SlideShow::Stop( *pBase );
                     // Stopping the slide show may result in a synchronous
                     // deletion of the navigator window.  Calling the
-                    // parents Notify after this is unsafe.  Therefore we
+                    // parent's EventNotify after this is unsafe.  Therefore we
                     // return now.
                     return true;
                 }
@@ -680,7 +680,7 @@ bool SdNavigatorWin::Notify(NotifyEvent& rNEvt)
     }
 
     if( !bOK )
-        bOK = Window::Notify( rNEvt );
+        bOK = Window::EventNotify(rNEvt);
 
     return bOK;
 }
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 4a9a3da0c0f8..5c3e08a9a4a6 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -177,7 +177,7 @@ protected:
     virtual void Command(const CommandEvent& rCEvt) override;
     virtual void RequestHelp( const HelpEvent& rEvt ) override;
     virtual void LoseFocus() override;
-    virtual bool Notify( NotifyEvent& rNEvt ) override;
+    virtual bool EventNotify( NotifyEvent& rNEvt ) override;
 
     /** Create an accessibility object that makes this window accessible.
 
diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx
index 48269801b3c5..2fe0e851da5a 100644
--- a/sd/source/ui/inc/docprev.hxx
+++ b/sd/source/ui/inc/docprev.hxx
@@ -63,7 +63,7 @@ public:
     virtual void    dispose() override;
     virtual void    Resize() override;
 
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
 
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 419a1441e3db..93c950962a12 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -103,7 +103,7 @@ public:
     NavigatorDragType           GetNavigatorDragType();
 
 protected:
-    virtual bool                Notify(NotifyEvent& rNEvt) override;
+    virtual bool                EventNotify(NotifyEvent& rNEvt) override;
 
 private:
     friend class ::sd::NavigatorChildWindow;
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 78dd6be59b5e..0c7b22a441a5 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -59,7 +59,7 @@ public:
     virtual void MouseButtonUp (const MouseEvent& rEvent) override;
     virtual void MouseButtonDown (const MouseEvent& rEvent) override;
     virtual void Command (const CommandEvent& rEvent) override;
-    virtual bool Notify (NotifyEvent& rEvent) override;
+    virtual bool EventNotify (NotifyEvent& rEvent) override;
 
 private:
     SlideSorter& mrSlideSorter;
@@ -483,7 +483,7 @@ void ContentWindow::Command(const CommandEvent& rEvent)
         mpCurrentFunction->Command(rEvent);
 }
 
-bool ContentWindow::Notify (NotifyEvent&)
+bool ContentWindow::EventNotify(NotifyEvent&)
 {
     return false;
 }
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index af5ddf90c8b8..e1b4fa5267b3 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -273,7 +273,7 @@ void Window::Command(const CommandEvent& rCEvt)
         vcl::Window::Command(rCEvt);
 }
 
-bool Window::Notify( NotifyEvent& rNEvt )
+bool Window::EventNotify( NotifyEvent& rNEvt )
 {
     bool bResult = false;
     if ( mpViewShell )
@@ -281,7 +281,7 @@ bool Window::Notify( NotifyEvent& rNEvt )
         bResult = mpViewShell->Notify(rNEvt, this);
     }
     if( !bResult )
-        bResult = vcl::Window::Notify( rNEvt );
+        bResult = vcl::Window::EventNotify(rNEvt);
 
     return bResult;
 }