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)

8 files changed, 12 insertions, 12 deletions

diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 70dbf42d335b..1fcf3146f369 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -115,9 +115,9 @@ IMPL_LINK( MacroEventListBox, HeaderEndDrag_Impl, HeaderBar*, pBar, void )
     }
 }
 
-bool MacroEventListBox::Notify( NotifyEvent& rNEvt )
+bool MacroEventListBox::EventNotify( NotifyEvent& rNEvt )
 {
-    bool bRet = Control::Notify( rNEvt );
+    bool bRet = Control::EventNotify(rNEvt);
 
     if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
     {
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index a4e83e5b3c48..0fd06c8f9f9c 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -968,7 +968,7 @@ IMPL_LINK_NOARG(SpellDialog, CancelHdl, Button*, void)
 }
 
 
-bool SpellDialog::Notify( NotifyEvent& rNEvt )
+bool SpellDialog::EventNotify( NotifyEvent& rNEvt )
 {
     /* #i38338#
     *   FIXME: LoseFocus and GetFocus are signals from vcl that
@@ -992,7 +992,7 @@ bool SpellDialog::Notify( NotifyEvent& rNEvt )
             rParent.LoseFocus();
         }
     }
-    return SfxModelessDialog::Notify(rNEvt);
+    return SfxModelessDialog::EventNotify(rNEvt);
 }
 
 
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 4ca5eee8587b..04af246c6f82 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -215,7 +215,7 @@ private:
     void            SetTitle_Impl(LanguageType nLang);
 
 protected:
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
 
     OUString getReplacementString() const;
 
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index 085213fc9eb1..2b8cea750c7c 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -31,7 +31,7 @@ private:
     VclPtr<SvHeaderTabListBox>      maListBox;
 protected:
     DECL_LINK( HeaderEndDrag_Impl, HeaderBar*, void );
-    virtual bool                Notify( NotifyEvent& rNEvt ) override;
+    virtual bool EventNotify( NotifyEvent& rNEvt ) override;
 public:
     MacroEventListBox( vcl::Window* pParent, WinBits nStyle );
     virtual ~MacroEventListBox() override;
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 7cbbe3a6783c..0510327bd880 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -168,7 +168,7 @@ protected:
     DECL_LINK(OKHdl_Impl, Button*, void);
     void SelectHdl_Impl();
 
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     virtual short   Execute() override;
 
 public:
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index bf34078cac9a..514581f9ce8e 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -363,13 +363,13 @@ namespace offapp
     }
 
 
-    bool ConnectionPoolOptionsPage::Notify( NotifyEvent& _rNEvt )
+    bool ConnectionPoolOptionsPage::EventNotify( NotifyEvent& _rNEvt )
     {
         if (MouseNotifyEvent::LOSEFOCUS == _rNEvt.GetType())
             if (m_pTimeout->IsWindowOrChild(_rNEvt.GetWindow()))
                 commitTimeoutField();
 
-        return SfxTabPage::Notify(_rNEvt);
+        return SfxTabPage::EventNotify(_rNEvt);
     }
 
 
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index e143b39fd9c1..b91f6a323864 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -54,7 +54,7 @@ namespace offapp
         static VclPtr<SfxTabPage>  Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet);
 
     protected:
-        virtual bool        Notify( NotifyEvent& _rNEvt ) override;
+        virtual bool        EventNotify( NotifyEvent& _rNEvt ) override;
 
         virtual bool        FillItemSet(SfxItemSet* _rSet) override;
         virtual void        Reset(const SfxItemSet* _rSet) override;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index a9e9e306a8eb..3c2cd5b49502 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -865,7 +865,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection()
     pTreeLB->GrabFocus();
 }
 
-bool OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt )
+bool OfaTreeOptionsDialog::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
     {
@@ -903,7 +903,7 @@ bool OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt )
             }
         }
     }
-    return SfxModalDialog::Notify(rNEvt);
+    return SfxModalDialog::EventNotify(rNEvt);
 }
 
 void OfaTreeOptionsDialog::SelectHdl_Impl()