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 /forms | |
| 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 'forms')
| -rw-r--r-- | forms/source/richtext/richtextvclcontrol.cxx | 4 | ||||
| -rw-r--r-- | forms/source/richtext/richtextvclcontrol.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index a16d97612956..5ea1f430ef49 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -284,7 +284,7 @@ namespace frm } - bool RichTextControl::Notify( NotifyEvent& _rNEvt ) + bool RichTextControl::EventNotify( NotifyEvent& _rNEvt ) { bool bDone = false; if ( _rNEvt.GetType() == MouseNotifyEvent::COMMAND ) @@ -292,7 +292,7 @@ namespace frm const CommandEvent& rEvent = *_rNEvt.GetCommandEvent(); bDone = m_pImpl->HandleCommand( rEvent ); } - return bDone || Control::Notify( _rNEvt ); + return bDone || Control::EventNotify(_rNEvt); } diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index 00c366369f3c..b83f4e9cb0ec 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -109,7 +109,7 @@ namespace frm virtual void GetFocus() override; virtual void StateChanged( StateChangedType nStateChange ) override; virtual bool PreNotify( NotifyEvent& _rNEvt ) override; - virtual bool Notify( NotifyEvent& _rNEvt ) override; + virtual bool EventNotify( NotifyEvent& _rNEvt ) override; private: void applyAttributes( const SfxItemSet& _rAttributesToApply ); |