From 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 24 Nov 2016 22:40:33 +0100 Subject: 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 --- svx/source/tbxctrls/colrctrl.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svx/source/tbxctrls/colrctrl.cxx') diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index acef7151f2ec..87187f6c5417 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -494,7 +494,7 @@ void SvxColorDockingWindow::GetFocus() } } -bool SvxColorDockingWindow::Notify( NotifyEvent& rNEvt ) +bool SvxColorDockingWindow::EventNotify( NotifyEvent& rNEvt ) { bool bRet = false; if( ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) ) @@ -510,7 +510,7 @@ bool SvxColorDockingWindow::Notify( NotifyEvent& rNEvt ) } } - return bRet || SfxDockingWindow::Notify( rNEvt ); + return bRet || SfxDockingWindow::EventNotify(rNEvt); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit