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 /extensions | |
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 'extensions')
-rw-r--r-- | extensions/source/propctrlr/browserlistbox.cxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserlistbox.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserview.cxx | 4 | ||||
-rw-r--r-- | extensions/source/propctrlr/browserview.hxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index 93e901f98131..59efe5a81e3b 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -1232,7 +1232,7 @@ namespace pcr return Control::PreNotify( _rNEvt ); } - bool OBrowserListBox::Notify( NotifyEvent& _rNEvt ) + bool OBrowserListBox::EventNotify( NotifyEvent& _rNEvt ) { if ( _rNEvt.GetType() == MouseNotifyEvent::COMMAND) { @@ -1249,7 +1249,7 @@ namespace pcr } } } - return Control::Notify( _rNEvt ); + return Control::EventNotify(_rNEvt); } diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 21710f213e45..a0b608917a55 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -112,7 +112,7 @@ namespace pcr sal_uInt16 CalcVisibleLines(); void EnableUpdate(); void DisableUpdate(); - bool Notify( NotifyEvent& _rNEvt ) override; + bool EventNotify( NotifyEvent& _rNEvt ) override; virtual bool PreNotify( NotifyEvent& _rNEvt ) override; void SetListener( IPropertyLineListener* _pListener ); diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index d31417c85cf6..48f19b53bae9 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -81,7 +81,7 @@ namespace pcr } - bool OPropertyBrowserView::Notify( NotifyEvent& _rNEvt ) + bool OPropertyBrowserView::EventNotify( NotifyEvent& _rNEvt ) { if ( MouseNotifyEvent::KEYINPUT == _rNEvt.GetType() ) { @@ -93,7 +93,7 @@ namespace pcr // #i63285# return true; } - return Window::Notify( _rNEvt ); + return Window::EventNotify(_rNEvt); } diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 9057f754b48c..d88ce3c4012f 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -41,7 +41,7 @@ namespace pcr protected: virtual void Resize() override; virtual void GetFocus() override; - virtual bool Notify( NotifyEvent& _rNEvt ) override; + virtual bool EventNotify( NotifyEvent& _rNEvt ) override; public: explicit OPropertyBrowserView( vcl::Window* pParent); |