diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /sw/source/uibase/docvw | |
parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'sw/source/uibase/docvw')
-rw-r--r-- | sw/source/uibase/docvw/HeaderFooterWin.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/PageBreakWin.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/SidebarTxtControl.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/SidebarTxtControl.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/docvw/SidebarWin.cxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/docvw/edtdd.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/docvw/edtwin.cxx | 8 | ||||
-rw-r--r-- | sw/source/uibase/docvw/srcedtw.cxx | 4 |
10 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 54348396cb19..c443ccfe5763 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -501,7 +501,7 @@ void SwHeaderFooterWin::Select() ExecuteCommand(GetCurItemId()); } -IMPL_LINK_NOARG_TYPED(SwHeaderFooterWin, FadeHandler, Timer *, void) +IMPL_LINK_NOARG(SwHeaderFooterWin, FadeHandler, Timer *, void) { if (m_bIsAppearing && m_nFadeRate > 0) m_nFadeRate -= 25; diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index a7fdc12835a6..a081b8ed19b5 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -430,14 +430,14 @@ void SwPageBreakWin::Fade( bool bFadeIn ) m_aFadeTimer.Start( ); } -IMPL_LINK_NOARG_TYPED(SwPageBreakWin, HideHandler, Menu *, bool) +IMPL_LINK_NOARG(SwPageBreakWin, HideHandler, Menu *, bool) { Fade( false ); return false; } -IMPL_LINK_NOARG_TYPED(SwPageBreakWin, FadeHandler, Timer *, void) +IMPL_LINK_NOARG(SwPageBreakWin, FadeHandler, Timer *, void) { const int TICKS_BEFORE_WE_APPEAR = 10; if ( m_bIsAppearing && m_nDelayAppearing < TICKS_BEFORE_WE_APPEAR ) diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 962755d3ea51..e09dc6ab34cc 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1965,7 +1965,7 @@ void SwPostItMgr::SetActiveSidebarWin( SwSidebarWin* p) } } -IMPL_LINK_NOARG_TYPED( SwPostItMgr, CalcHdl, void*, void ) +IMPL_LINK_NOARG( SwPostItMgr, CalcHdl, void*, void ) { mnEventId = nullptr; if ( mbLayouting ) diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx index 9a21fe6522c5..5ec2a0580d8a 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx @@ -362,7 +362,7 @@ void SidebarTextControl::MouseButtonUp( const MouseEvent& rMEvt ) GetTextView()->MouseButtonUp( rMEvt ); } -IMPL_LINK_TYPED( SidebarTextControl, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void ) +IMPL_LINK( SidebarTextControl, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void ) { if ( rInfo.nCommand == SpellCallbackCommand::STARTSPELLDLG ) { diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx index e290a87c2d2e..f6e49a4d508a 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.hxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx @@ -64,7 +64,7 @@ class SidebarTextControl : public Control OutlinerView* GetTextView() const; - DECL_LINK_TYPED( OnlineSpellCallback, SpellCallbackInfo&, void ); + DECL_LINK( OnlineSpellCallback, SpellCallbackInfo&, void ); virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override; diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index 87f30a65ee21..ffc62edf5049 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -55,7 +55,7 @@ class SidebarTextEditSource : public SvxEditSource, virtual void UpdateData() override; virtual SfxBroadcaster& GetBroadcaster() const override; - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); private: SidebarTextControl& mrSidebarTextControl; @@ -113,7 +113,7 @@ SfxBroadcaster& SidebarTextEditSource::GetBroadcaster() const return *( const_cast< SidebarTextEditSource* > (this) ); } -IMPL_LINK_TYPED(SidebarTextEditSource, NotifyHdl, EENotify&, rNotify, void) +IMPL_LINK(SidebarTextEditSource, NotifyHdl, EENotify&, rNotify, void) { std::unique_ptr< SfxHint > aHint( SvxEditSourceHelper::EENotification2Hint( &rNotify ) ); diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index c1560832a43d..cbccdcc21a1f 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1360,7 +1360,7 @@ void SwSidebarWin::SwitchToPostIt(sal_uInt16 aDirection) pPostIt->GrabFocus(); } -IMPL_LINK_TYPED( SwSidebarWin, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( SwSidebarWin, WindowEventListener, VclWindowEvent&, rEvent, void ) { if ( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE ) { @@ -1417,18 +1417,18 @@ void SwSidebarWin::Delete() } } -IMPL_LINK_TYPED(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll, void) +IMPL_LINK(SwSidebarWin, ScrollHdl, ScrollBar*, pScroll, void) { long nDiff = GetOutlinerView()->GetEditView().GetVisArea().Top() - pScroll->GetThumbPos(); GetOutlinerView()->Scroll( 0, nDiff ); } -IMPL_LINK_NOARG_TYPED(SwSidebarWin, ModifyHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SwSidebarWin, ModifyHdl, LinkParamNone*, void) { mrView.GetDocShell()->SetModified(); } -IMPL_LINK_NOARG_TYPED(SwSidebarWin, DeleteHdl, void*, void) +IMPL_LINK_NOARG(SwSidebarWin, DeleteHdl, void*, void) { mnEventId = nullptr; Delete(); diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index f38daa7324a9..4a496dacba7d 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -476,7 +476,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) return DND_ACTION_NONE; } -IMPL_LINK_NOARG_TYPED(SwEditWin, DDHandler, Timer *, void) +IMPL_LINK_NOARG(SwEditWin, DDHandler, Timer *, void) { g_bDDTimerStarted = false; m_aTimer.Stop(); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index bf319f586943..a32e294d42f4 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -625,7 +625,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier ) /** * Increase timer for selection */ -IMPL_LINK_NOARG_TYPED(SwEditWin, TimerHandler, Timer *, void) +IMPL_LINK_NOARG(SwEditWin, TimerHandler, Timer *, void) { SwWrtShell &rSh = m_rView.GetWrtShell(); Point aModPt( m_aMovePos ); @@ -5907,12 +5907,12 @@ static SfxShell* lcl_GetTextShellFromDispatcher( SwView& rView ) return pShell; } -IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputFlushHandler, Timer *, void) +IMPL_LINK_NOARG(SwEditWin, KeyInputFlushHandler, Timer *, void) { FlushInBuffer(); } -IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputTimerHandler, Timer *, void) +IMPL_LINK_NOARG(SwEditWin, KeyInputTimerHandler, Timer *, void) { m_bTableInsDelMode = false; } @@ -5934,7 +5934,7 @@ void SwEditWin::StopQuickHelp() m_pQuickHlpData->Stop( m_rView.GetWrtShell() ); } -IMPL_LINK_NOARG_TYPED(SwEditWin, TemplateTimerHdl, Idle *, void) +IMPL_LINK_NOARG(SwEditWin, TemplateTimerHdl, Idle *, void) { SetApplyTemplate(SwApplyTemplate()); } diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx index 6b34e90133e9..4998f49882db 100644 --- a/sw/source/uibase/docvw/srcedtw.cxx +++ b/sw/source/uibase/docvw/srcedtw.cxx @@ -573,7 +573,7 @@ void SwSrcEditWindow::InitScrollBars() } -IMPL_LINK_TYPED(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll, void) +IMPL_LINK(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll, void) { if(pScroll == m_pVScrollbar) { @@ -592,7 +592,7 @@ IMPL_LINK_TYPED(SwSrcEditWindow, ScrollHdl, ScrollBar*, pScroll, void) GetSrcView()->GetViewFrame()->GetBindings().Invalidate( SID_TABLE_CELL ); } -IMPL_LINK_TYPED( SwSrcEditWindow, SyntaxTimerHdl, Idle *, pIdle, void ) +IMPL_LINK( SwSrcEditWindow, SyntaxTimerHdl, Idle *, pIdle, void ) { tools::Time aSyntaxCheckStart( tools::Time::SYSTEM ); SAL_WARN_IF(m_pTextView == nullptr, "sw", "No View yet, but syntax highlighting?!"); |