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)
(cherry picked from commit 03bfafb36107d18c0cccf53efdd550c0b7a81b8f)

9 files changed, 11 insertions, 15 deletions

diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx
index 95b97d6b186f..e71f49a94ccc 100644
--- a/sw/source/uibase/cctrl/actctrl.cxx
+++ b/sw/source/uibase/cctrl/actctrl.cxx
@@ -21,7 +21,7 @@
 #include <vcl/builderfactory.hxx>
 #include "actctrl.hxx"
 
-bool NumEditAction::Notify( NotifyEvent& rNEvt )
+bool NumEditAction::EventNotify( NotifyEvent& rNEvt )
 {
     bool bHandled = false;
 
@@ -39,7 +39,7 @@ bool NumEditAction::Notify( NotifyEvent& rNEvt )
 
     }
     if(!bHandled)
-        NumericField::Notify( rNEvt );
+        NumericField::EventNotify(rNEvt);
     return bHandled;
 }
 
diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx
index 2c2f7f8ca4c9..3dfe68ac77bf 100644
--- a/sw/source/uibase/inc/actctrl.hxx
+++ b/sw/source/uibase/inc/actctrl.hxx
@@ -28,7 +28,8 @@ class SW_DLLPUBLIC NumEditAction: public NumericField
     Link<NumEditAction&,void> aActionLink;
 
 protected:
-    virtual bool Notify( NotifyEvent& rNEvt ) override;
+    virtual bool EventNotify( NotifyEvent& rNEvt ) override;
+
 public:
     NumEditAction(vcl::Window* pParent, WinBits nBits)
         : NumericField(pParent, nBits)
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 5d61660c55bb..98aedef598c4 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -220,7 +220,6 @@ public:
     virtual bool    Select( SvTreeListEntry* pEntry, bool bSelect=true ) override;
     virtual Size    GetOptimalSize() const override;
 
-    using Control::Notify; // FIXME why do we have 2 of these
     virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) override;
 
 };
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index ef71b6492e9e..34d8e5c58e4b 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -142,7 +142,6 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
     DECL_LINK( HeaderHdl, Button*, void );
 
     bool SplitTextToColArr( const OUString& rText, DB_Columns& rColArr, bool bInsField );
-        using SfxModalDialog::Notify;
     virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override;
     virtual void            ImplCommit() override;
     void                    Load();
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index c7417dd582e5..1b6f3cf39f46 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -119,7 +119,6 @@ class SwNavigationPI : public PanelLayout,
 
     void SetPopupWindow( SfxPopupWindow* );
 
-    using Window::Notify;
     using Window::StateChanged;
 
 protected:
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index fdffc807f95d..cfb0a8b69b84 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -173,7 +173,6 @@ public:
     virtual void dispose() override;
 
     /// We need to be a SfxListener to be able to update the list of changes when we get SFX_HINT_DOCCHANGED.
-    using Control::Notify;
     virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override;
 };
 
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index d3b4f8b6d423..ee60c2814622 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.hxx
@@ -94,7 +94,6 @@ private:
 
     DECL_LINK( SyntaxTimerHdl, Idle *, void );
 
-    using Window::Notify;
     using Window::Invalidate;
 
 protected:
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index aafae34192d2..99cf8565515f 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -453,7 +453,7 @@ public:
 
     void                PreTokenButtonRemoved(const SwFormToken& rToken);
     void SetFocus2theAllBtn();
-    virtual bool Notify( NotifyEvent& rNEvt ) override;
+    virtual bool EventNotify( NotifyEvent& rNEvt ) override;
 };
 
 class SwTOXStylesTabPage : public SfxTabPage
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 3e51a781c131..4107d35986e4 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -364,7 +364,7 @@ public:
 
 protected:
     virtual void    Select() override;
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
 
     void ReleaseFocus();
 
@@ -427,7 +427,7 @@ void    SwZoomBox_Impl::Select()
     }
 }
 
-bool SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
+bool SwZoomBox_Impl::EventNotify( NotifyEvent& rNEvt )
 {
     bool bHandled = false;
 
@@ -461,7 +461,7 @@ bool SwZoomBox_Impl::Notify( NotifyEvent& rNEvt )
             SetText( GetSavedValue() );
     }
 
-    return bHandled || ComboBox::Notify( rNEvt );
+    return bHandled || ComboBox::EventNotify(rNEvt);
 }
 
 void SwZoomBox_Impl::ReleaseFocus()
@@ -527,7 +527,7 @@ public:
 
 protected:
     void            Select();
-    virtual bool    Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 };
 
 SwJumpToSpecificBox_Impl::SwJumpToSpecificBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot)
@@ -547,11 +547,11 @@ void SwJumpToSpecificBox_Impl::Select()
             { &aPageNum });
 }
 
-bool SwJumpToSpecificBox_Impl::Notify( NotifyEvent& rNEvt )
+bool SwJumpToSpecificBox_Impl::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
         Select();
-    return NumericField::Notify( rNEvt );
+    return NumericField::EventNotify(rNEvt);
 }
 
 SFX_IMPL_TOOLBOX_CONTROL( SwJumpToSpecificPageControl, SfxUInt16Item);