diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-11-24 22:40:33 +0100 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:08:07 -0500 |
| commit | d58a29430615a531ece6434033c8dc0fb26539d1 (patch) | |
| tree | e801a36c928cf658a9f18cd005dedd70d18a0350 /filter | |
| parent | 0c8a76cec8bc5cb72d4140ade378037d2a166476 (diff) | |
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)
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 8 | ||||
| -rw-r--r-- | filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 29afee37a3a1..1c0bc8f37866 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 ) @@ -1392,9 +1392,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;} |