diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-11-24 22:40:33 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-11-24 22:56:34 +0100 |
| commit | 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7 (patch) | |
| tree | 8faf98099786b0c7b6520075d376c55bbd3cddd6 /svtools/source/hatchwindow | |
| parent | 502f0cde77bd45979ba3562e80b59a7d5fd8dc56 (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 'svtools/source/hatchwindow')
| -rw-r--r-- | svtools/source/hatchwindow/ipwin.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/hatchwindow/ipwin.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx index c4014ba31e5f..8ec5c97fa338 100644 --- a/svtools/source/hatchwindow/ipwin.cxx +++ b/svtools/source/hatchwindow/ipwin.cxx @@ -599,7 +599,7 @@ bool SvResizeWindow::PreNotify( NotifyEvent& rEvt ) return Window::PreNotify(rEvt); } -bool SvResizeWindow::Notify( NotifyEvent& rEvt ) +bool SvResizeWindow::EventNotify( NotifyEvent& rEvt ) { if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && m_bActive ) { @@ -611,7 +611,7 @@ bool SvResizeWindow::Notify( NotifyEvent& rEvt ) } } - return Window::Notify(rEvt); + return Window::EventNotify(rEvt); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx index bc612974b25d..07da60607b2c 100644 --- a/svtools/source/hatchwindow/ipwin.hxx +++ b/svtools/source/hatchwindow/ipwin.hxx @@ -84,7 +84,7 @@ public: virtual void KeyInput( const KeyEvent & rEvt ) override; virtual void Resize() override; virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle & ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; }; |