From d58a29430615a531ece6434033c8dc0fb26539d1 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 (cherry picked from commit 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7) (cherry picked from commit 03bfafb36107d18c0cccf53efdd550c0b7a81b8f) --- chart2/source/controller/main/ElementSelector.cxx | 4 ++-- chart2/source/controller/main/ElementSelector.hxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'chart2') diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index ef9a4515a41d..920658d9e6a1 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -201,7 +201,7 @@ void SelectorListBox::Select() } } -bool SelectorListBox::Notify( NotifyEvent& rNEvt ) +bool SelectorListBox::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -234,7 +234,7 @@ bool SelectorListBox::Notify( NotifyEvent& rNEvt ) SelectEntryPos( GetSavedValue() ); } - return bHandled || ListBox::Notify( rNEvt ); + return bHandled || ListBox::EventNotify(rNEvt); } Reference< css::accessibility::XAccessible > SelectorListBox::CreateAccessible() diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index acb7d2cf3034..b7dd5708d28f 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -47,7 +47,7 @@ class SelectorListBox : public ListBox SelectorListBox( vcl::Window* pParent, WinBits nStyle ); virtual void Select() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; void ReleaseFocus_Impl(); -- cgit v1.2.3