diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-11-24 22:40:33 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-11-24 22:56:34 +0100 |
commit | 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7 (patch) | |
tree | 8faf98099786b0c7b6520075d376c55bbd3cddd6 /extensions | |
parent | 502f0cde77bd45979ba3562e80b59a7d5fd8dc56 (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
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 9d6b899ce0e2..2ea57a2d8713 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -1231,7 +1231,7 @@ namespace pcr return Control::PreNotify( _rNEvt ); } - bool OBrowserListBox::Notify( NotifyEvent& _rNEvt ) + bool OBrowserListBox::EventNotify( NotifyEvent& _rNEvt ) { if ( _rNEvt.GetType() == MouseNotifyEvent::COMMAND) { @@ -1248,7 +1248,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); |