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 --- basctl/source/basicide/baside2.hxx | 1 - basctl/source/basicide/bastypes.cxx | 4 ++-- basctl/source/inc/bastypes.hxx | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 465be0b7f491..d1799d116fae 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -94,7 +94,6 @@ private: class ProgressInfo; std::unique_ptr pProgress; - using Window::Notify; virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; void ImpDoHighlight( sal_uLong nLineOff ); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index 5b0f9debc066..11f834212b5e 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -102,7 +102,7 @@ void BaseWindow::ExecuteGlobal (SfxRequest&) { } -bool BaseWindow::Notify( NotifyEvent& rNEvt ) +bool BaseWindow::EventNotify( NotifyEvent& rNEvt ) { bool bDone = false; @@ -128,7 +128,7 @@ bool BaseWindow::Notify( NotifyEvent& rNEvt ) } } - return bDone || Window::Notify( rNEvt ); + return bDone || Window::EventNotify( rNEvt ); } diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx index b487d40153f4..77fb024857da 100644 --- a/basctl/source/inc/bastypes.hxx +++ b/basctl/source/inc/bastypes.hxx @@ -184,7 +184,7 @@ public: virtual void ExecuteCommand (SfxRequest&); virtual void ExecuteGlobal (SfxRequest&); virtual void GetState (SfxItemSet&) = 0; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void StoreData(); virtual void UpdateData(); -- cgit