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
(cherry picked from commit 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7)

9 files changed, 20 insertions, 22 deletions

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 902c1f72c96b..c014cf6ffadc 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2189,7 +2189,7 @@ void ScPosWnd::DoEnter()
     ReleaseFocus_Impl();
 }
 
-bool ScPosWnd::Notify( NotifyEvent& rNEvt )
+bool ScPosWnd::EventNotify( NotifyEvent& rNEvt )
 {
     bool bHandled = true;
 
@@ -2241,7 +2241,7 @@ bool ScPosWnd::Notify( NotifyEvent& rNEvt )
     }
 
     if (!bHandled)
-        bHandled = ComboBox::Notify(rNEvt);
+        bHandled = ComboBox::EventNotify(rNEvt);
 
     return bHandled;
 }
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index e73c229ff975..2fb76d03abc2 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1321,7 +1321,7 @@ void ScCheckListMenuWindow::MouseMove(const MouseEvent& rMEvt)
         queueCloseSubMenu();
 }
 
-bool ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt)
+bool ScCheckListMenuWindow::EventNotify(NotifyEvent& rNEvt)
 {
     if (rNEvt.GetType() == MouseNotifyEvent::KEYUP)
     {
@@ -1334,7 +1334,7 @@ bool ScCheckListMenuWindow::Notify(NotifyEvent& rNEvt)
             return true;
         }
     }
-    return ScMenuFloatingWindow::Notify(rNEvt);
+    return ScMenuFloatingWindow::EventNotify(rNEvt);
 }
 
 void ScCheckListMenuWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 5106753d34a1..97a898360bd2 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -94,13 +94,13 @@ void ScCondFrmtEntry::dispose()
     VclContainer::dispose();
 }
 
-bool ScCondFrmtEntry::Notify( NotifyEvent& rNEvt )
+bool ScCondFrmtEntry::EventNotify( NotifyEvent& rNEvt )
 {
     if (rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN)
     {
         maClickHdl.Call(*this);
     }
-    return VclContainer::Notify(rNEvt);
+    return VclContainer::EventNotify(rNEvt);
 }
 
 void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex)
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index d80e20b76d21..e7ee94d6ba15 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -331,7 +331,7 @@ public:
     virtual void dispose() override;
 
     virtual void MouseMove(const MouseEvent& rMEvt) override;
-    virtual bool Notify(NotifyEvent& rNEvt) override;
+    virtual bool EventNotify(NotifyEvent& rNEvt) override;
     virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override;
     virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
 
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx
index 642e6ceae019..5b23e6ec12fb 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
@@ -72,7 +72,7 @@ public:
     virtual void setAllocation(const Size &rAllocation) override;
     virtual void dispose() override;
 
-    virtual bool Notify( NotifyEvent& rNEvt ) override;
+    virtual bool EventNotify( NotifyEvent& rNEvt ) override;
 
     bool IsSelected() const { return mbActive;}
     void SetIndex(sal_Int32 nIndex);
@@ -131,7 +131,6 @@ public:
     virtual void SetInactive() override;
 
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
-    using ScCondFrmtEntry::Notify;
 
     virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::CONDITION; }
 };
@@ -272,7 +271,7 @@ public:
     virtual condformat::entry::ScCondFrmtEntryType GetType() override { return condformat::entry::DATE; }
 
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
-    using ScCondFrmtEntry::Notify;
+
 protected:
     virtual OUString GetExpressionString() override;
 
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index 4b7ec0c8a0c6..b53d794d5fbf 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -170,7 +170,7 @@ protected:
     virtual void    Select() override;
     virtual void    Modify() override;
 
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
 
     virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index c0dd4c7fa04e..4adc0549c694 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -60,7 +60,7 @@ public:
 protected:
     virtual void        Select() override;
     virtual void        DoubleClick() override;
-    virtual bool        Notify( NotifyEvent& rNEvt ) override;
+    virtual bool        EventNotify( NotifyEvent& rNEvt ) override;
 
 private:
     struct ScenarioEntry
@@ -120,7 +120,7 @@ public:
     void    SetCol( SCCOL nColNo );
 
 protected:
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     virtual void    LoseFocus() override;
     virtual void    Up() override;
     virtual void    Down() override;
@@ -152,7 +152,7 @@ public:
     void    SetRow(SCROW nRow) { SetValue(nRow); }
 
 protected:
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     virtual Size    GetOptimalSize() const override;
     virtual void    LoseFocus() override;
     virtual void    dispose() override;
@@ -260,8 +260,7 @@ public:
     virtual ~ScNavigatorDlg() override;
     virtual void dispose() override;
 
-    using Window::Notify;
-    virtual void    Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
+    virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 };
 
 class ScNavigatorDialogWrapper: public SfxChildWindowContext
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index fc963515a1e6..212d3160fa58 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -85,9 +85,9 @@ ColumnEdit::~ColumnEdit()
 
 VCL_BUILDER_FACTORY_ARGS(ColumnEdit, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT)
 
-bool ColumnEdit::Notify( NotifyEvent& rNEvt )
+bool ColumnEdit::EventNotify( NotifyEvent& rNEvt )
 {
-    bool bHandled = SpinField::Notify( rNEvt );
+    bool bHandled = SpinField::EventNotify(rNEvt);
 
     MouseNotifyEvent nType = rNEvt.GetType();
     if ( nType == MouseNotifyEvent::KEYINPUT )
@@ -262,9 +262,9 @@ RowEdit::~RowEdit()
 
 VCL_BUILDER_FACTORY_ARGS(RowEdit, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT)
 
-bool RowEdit::Notify( NotifyEvent& rNEvt )
+bool RowEdit::EventNotify( NotifyEvent& rNEvt )
 {
-    bool bHandled = NumericField::Notify( rNEvt );
+    bool bHandled = NumericField::EventNotify(rNEvt);
 
     if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
     {
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 9c6884b05c6c..6255cb2e6806 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -107,7 +107,7 @@ void ScScenarioListBox::DoubleClick()
     SelectScenario();
 }
 
-bool ScScenarioListBox::Notify( NotifyEvent& rNEvt )
+bool ScScenarioListBox::EventNotify( NotifyEvent& rNEvt )
 {
     bool bHandled = false;
 
@@ -155,7 +155,7 @@ bool ScScenarioListBox::Notify( NotifyEvent& rNEvt )
         }
     }
 
-    return bHandled || ListBox::Notify( rNEvt );
+    return bHandled || ListBox::EventNotify(rNEvt);
 }
 
 const ScScenarioListBox::ScenarioEntry* ScScenarioListBox::GetSelectedEntry() const