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 /include/svx | |
| 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 'include/svx')
| -rw-r--r-- | include/svx/colrctrl.hxx | 2 | ||||
| -rw-r--r-- | include/svx/itemwin.hxx | 8 | ||||
| -rw-r--r-- | include/svx/ruler.hxx | 1 | ||||
| -rw-r--r-- | include/svx/sidebar/PanelLayout.hxx | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index 03ba6c97133c..c3b8eaf18b86 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -107,7 +107,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; #endif diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index f992be48ec1b..0dbba2e42aee 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -54,7 +54,7 @@ public: protected: virtual void Select() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; @@ -76,7 +76,7 @@ protected: virtual void Modify() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: @@ -100,7 +100,7 @@ public: protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; private: sal_uInt16 nCurPos; @@ -119,7 +119,7 @@ public: protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; private: sal_uInt16 nCurPos; diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index d8a78516b156..71d5e78691bc 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -77,7 +77,6 @@ namespace o3tl class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener { friend class SvxRulerItem; - using Window::Notify; std::vector<std::unique_ptr<SvxRulerItem> > pCtrlItems; diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index ca4086f6bfd1..7492b887d41f 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -39,7 +39,7 @@ public: virtual Size GetOptimalSize() const override; virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, PosSizeFlags nFlags = PosSizeFlags::All) override; virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; - virtual bool Notify(NotifyEvent& rNEvt) override; + virtual bool EventNotify(NotifyEvent& rNEvt) override; }; #endif |