From 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 24 Nov 2016 22:40:33 +0100 Subject: 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 --- filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 8 ++++---- filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'filter/source/xsltdialog') diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 02b30e958faa..a99d35af59fc 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -992,10 +992,10 @@ void XMLFilterSettingsDialog::onOpen() } } -bool XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt ) +bool XMLFilterSettingsDialog::EventNotify( NotifyEvent& rNEvt ) { // Because of tab control first call the base class. - bool bRet = ModelessDialog::Notify( rNEvt ); + bool bRet = ModelessDialog::EventNotify(rNEvt); if ( !bRet ) { if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) @@ -1394,9 +1394,9 @@ void SvxPathControl::dispose() VCL_BUILDER_FACTORY(SvxPathControl) -bool SvxPathControl::Notify(NotifyEvent& rNEvt) +bool SvxPathControl::EventNotify(NotifyEvent& rNEvt) { - bool bRet = Window::Notify(rNEvt); + bool bRet = Window::EventNotify(rNEvt); if ( m_pFocusCtrl && rNEvt.GetWindow() != m_pFocusCtrl && rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) m_pFocusCtrl->GrabFocus(); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index a44e5da01637..24617d0261fd 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -52,7 +52,7 @@ public: virtual ~SvxPathControl() override; virtual void dispose() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; class HeaderBar; @@ -103,7 +103,7 @@ public: void updateStates(); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; bool isClosable() { return m_bIsClosable;} -- cgit