summaryrefslogtreecommitdiff
path: root/forms
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-11-24 22:40:33 +0100
committerMichael Stahl <mstahl@redhat.com>2016-11-24 22:56:34 +0100
commit6bb20609a2fd1d591cedc7fa2b9cabb589c346c7 (patch)
tree8faf98099786b0c7b6520075d376c55bbd3cddd6 /forms
parent502f0cde77bd45979ba3562e80b59a7d5fd8dc56 (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 'forms')
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx4
-rw-r--r--forms/source/richtext/richtextvclcontrol.hxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 5dcf54c7131f..253ffa074626 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 );