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 /dbaccess | |
| 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 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/app/AppDetailPageHelper.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/sqledit.hxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 8 |
3 files changed, 7 insertions, 8 deletions
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 706a886e5778..512005e8f9a4 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -134,15 +134,15 @@ namespace virtual void DataChanged(const DataChangedEvent& rDCEvt) override; public: OTablePreviewWindow( vcl::Window* pParent, WinBits nStyle = 0 ); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; OTablePreviewWindow::OTablePreviewWindow(vcl::Window* pParent, WinBits nStyle) : Window( pParent, nStyle) { ImplInitSettings(); } - bool OTablePreviewWindow::Notify( NotifyEvent& rNEvt ) + bool OTablePreviewWindow::EventNotify( NotifyEvent& rNEvt ) { - bool bRet = Window::Notify( rNEvt ); + bool bRet = Window::EventNotify(rNEvt); if ( rNEvt.GetType() == MouseNotifyEvent::INPUTENABLE && IsInputEnabled() ) PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput), nullptr, true ); return bRet; diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 038fa361f168..c144cdea252f 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -82,7 +82,6 @@ namespace dbaui void startTimer(); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, ConfigurationHints ) override; - using MultiLineEditSyntaxHighlight::Notify; }; } diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index cf17ee449068..890c63f35f4b 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -35,7 +35,7 @@ class LimitBoxImpl: public LimitBox public: LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl ); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; private: LimitBoxController* m_pControl; @@ -47,14 +47,14 @@ LimitBoxImpl::LimitBoxImpl( vcl::Window* pParent, LimitBoxController* pCtrl ) { } -bool LimitBoxImpl::Notify( NotifyEvent& rNEvt ) +bool LimitBoxImpl::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = false; switch ( rNEvt.GetType() ) { case MouseNotifyEvent::LOSEFOCUS: { - bHandled = LimitBox::Notify( rNEvt ); + bHandled = LimitBox::EventNotify(rNEvt); uno::Sequence< beans::PropertyValue > aArgs( 1 ); aArgs[0].Name = "DBLimit.Value"; aArgs[0].Value = uno::makeAny( GetValue() ); @@ -82,7 +82,7 @@ bool LimitBoxImpl::Notify( NotifyEvent& rNEvt ) default: break; } - return bHandled || LimitBox::Notify( rNEvt ); + return bHandled || LimitBox::EventNotify(rNEvt); } |