diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-11-24 22:40:33 +0100 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:08:07 -0500 |
commit | d58a29430615a531ece6434033c8dc0fb26539d1 (patch) | |
tree | e801a36c928cf658a9f18cd005dedd70d18a0350 /sw/source | |
parent | 0c8a76cec8bc5cb72d4140ade378037d2a166476 (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
(cherry picked from commit 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7)
(cherry picked from commit 03bfafb36107d18c0cccf53efdd550c0b7a81b8f)
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/ui/dbui/mmaddressblockpage.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/cctrl/actctrl.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/actctrl.hxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/inc/conttree.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/dbinsdlg.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/navipi.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/redlndlg.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/srcedtw.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/swuicnttab.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/ribbar/workctrl.cxx | 12 |
11 files changed, 13 insertions, 19 deletions
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index d66ef383fe33..dcc18a1df03b 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -150,8 +150,6 @@ class AddressMultiLineEdit : public VclMultiLineEdit, public SfxListener Link<AddressMultiLineEdit&,void> m_aSelectionLink; VclPtr<SwCustomizeAddressBlockDialog> m_pParentDialog; - using VclMultiLineEdit::Notify; - using VclMultiLineEdit::SetText; protected: diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 25197fbfd13d..ed767a1bda95 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2270,7 +2270,7 @@ void SwTOXEntryTabPage::SetFocus2theAllBtn() m_pAllLevelsPB->GrabFocus(); } -bool SwTOXEntryTabPage::Notify( NotifyEvent& rNEvt ) +bool SwTOXEntryTabPage::EventNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { @@ -2286,7 +2286,7 @@ bool SwTOXEntryTabPage::Notify( NotifyEvent& rNEvt ) } - return SfxTabPage::Notify( rNEvt ); + return SfxTabPage::EventNotify(rNEvt); } // This function initializes the default value in the Token diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx index 95b97d6b186f..e71f49a94ccc 100644 --- a/sw/source/uibase/cctrl/actctrl.cxx +++ b/sw/source/uibase/cctrl/actctrl.cxx @@ -21,7 +21,7 @@ #include <vcl/builderfactory.hxx> #include "actctrl.hxx" -bool NumEditAction::Notify( NotifyEvent& rNEvt ) +bool NumEditAction::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -39,7 +39,7 @@ bool NumEditAction::Notify( NotifyEvent& rNEvt ) } if(!bHandled) - NumericField::Notify( rNEvt ); + NumericField::EventNotify(rNEvt); return bHandled; } diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx index 2c2f7f8ca4c9..3dfe68ac77bf 100644 --- a/sw/source/uibase/inc/actctrl.hxx +++ b/sw/source/uibase/inc/actctrl.hxx @@ -28,7 +28,8 @@ class SW_DLLPUBLIC NumEditAction: public NumericField Link<NumEditAction&,void> aActionLink; protected: - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; + public: NumEditAction(vcl::Window* pParent, WinBits nBits) : NumericField(pParent, nBits) diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index 5d61660c55bb..98aedef598c4 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -220,7 +220,6 @@ public: virtual bool Select( SvTreeListEntry* pEntry, bool bSelect=true ) override; virtual Size GetOptimalSize() const override; - using Control::Notify; // FIXME why do we have 2 of these virtual void Notify(SfxBroadcaster& rBC, SfxHint const& rHint) override; }; diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index ef71b6492e9e..34d8e5c58e4b 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -142,7 +142,6 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem DECL_LINK( HeaderHdl, Button*, void ); bool SplitTextToColArr( const OUString& rText, DB_Columns& rColArr, bool bInsField ); - using SfxModalDialog::Notify; virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; virtual void ImplCommit() override; void Load(); diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index c7417dd582e5..1b6f3cf39f46 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -119,7 +119,6 @@ class SwNavigationPI : public PanelLayout, void SetPopupWindow( SfxPopupWindow* ); - using Window::Notify; using Window::StateChanged; protected: diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index fdffc807f95d..cfb0a8b69b84 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -173,7 +173,6 @@ public: virtual void dispose() override; /// We need to be a SfxListener to be able to update the list of changes when we get SFX_HINT_DOCCHANGED. - using Control::Notify; virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; }; diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index d3b4f8b6d423..ee60c2814622 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -94,7 +94,6 @@ private: DECL_LINK( SyntaxTimerHdl, Idle *, void ); - using Window::Notify; using Window::Invalidate; protected: diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index aafae34192d2..99cf8565515f 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -453,7 +453,7 @@ public: void PreTokenButtonRemoved(const SwFormToken& rToken); void SetFocus2theAllBtn(); - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; class SwTOXStylesTabPage : public SfxTabPage diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 3e51a781c131..4107d35986e4 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -364,7 +364,7 @@ public: protected: virtual void Select() override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; void ReleaseFocus(); @@ -427,7 +427,7 @@ void SwZoomBox_Impl::Select() } } -bool SwZoomBox_Impl::Notify( NotifyEvent& rNEvt ) +bool SwZoomBox_Impl::EventNotify( NotifyEvent& rNEvt ) { bool bHandled = false; @@ -461,7 +461,7 @@ bool SwZoomBox_Impl::Notify( NotifyEvent& rNEvt ) SetText( GetSavedValue() ); } - return bHandled || ComboBox::Notify( rNEvt ); + return bHandled || ComboBox::EventNotify(rNEvt); } void SwZoomBox_Impl::ReleaseFocus() @@ -527,7 +527,7 @@ public: protected: void Select(); - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool EventNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; SwJumpToSpecificBox_Impl::SwJumpToSpecificBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot) @@ -547,11 +547,11 @@ void SwJumpToSpecificBox_Impl::Select() { &aPageNum }); } -bool SwJumpToSpecificBox_Impl::Notify( NotifyEvent& rNEvt ) +bool SwJumpToSpecificBox_Impl::EventNotify( NotifyEvent& rNEvt ) { if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) Select(); - return NumericField::Notify( rNEvt ); + return NumericField::EventNotify(rNEvt); } SFX_IMPL_TOOLBOX_CONTROL( SwJumpToSpecificPageControl, SfxUInt16Item); |