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 /editeng | |
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 'editeng')
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 8 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 6 | ||||
-rw-r--r-- | editeng/source/misc/hangulhanja.cxx | 32 | ||||
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 12 |
5 files changed, 30 insertions, 30 deletions
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 3daf3313a2fe..6143dfaea7fd 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -668,10 +668,10 @@ private: inline VirtualDevice* GetVirtualDevice( const MapMode& rMapMode, DrawModeFlags nDrawMode ); inline void EraseVirtualDevice() { pVirtDev.disposeAndClear(); } - DECL_LINK_TYPED( StatusTimerHdl, Timer *, void); - DECL_LINK_TYPED( IdleFormatHdl, Idle *, void); - DECL_LINK_TYPED( OnlineSpellHdl, Timer *, void); - DECL_LINK_TYPED( DocModified, LinkParamNone*, void ); + DECL_LINK( StatusTimerHdl, Timer *, void); + DECL_LINK( IdleFormatHdl, Idle *, void); + DECL_LINK( OnlineSpellHdl, Timer *, void); + DECL_LINK( DocModified, LinkParamNone*, void ); void CheckIdleFormatter(); diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index ae6f37228fc0..0badeb5a712a 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -4367,7 +4367,7 @@ void ImpEditEngine::LeaveBlockNotifications() } } -IMPL_LINK_NOARG_TYPED(ImpEditEngine, DocModified, LinkParamNone*, void) +IMPL_LINK_NOARG(ImpEditEngine, DocModified, LinkParamNone*, void) { aModifyHdl.Call( nullptr /*GetEditEnginePtr()*/ ); // NULL, because also used for Outliner } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 0ec971186558..ad5ba382fd1f 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -302,7 +302,7 @@ void ImpEditEngine::UpdateViews( EditView* pCurView ) CallStatusHdl(); } -IMPL_LINK_NOARG_TYPED(ImpEditEngine, OnlineSpellHdl, Timer *, void) +IMPL_LINK_NOARG(ImpEditEngine, OnlineSpellHdl, Timer *, void) { if ( !Application::AnyInput( VclInputFlags::KEYBOARD ) && GetUpdateMode() && IsFormatted() ) DoOnlineSpelling(); @@ -310,7 +310,7 @@ IMPL_LINK_NOARG_TYPED(ImpEditEngine, OnlineSpellHdl, Timer *, void) aOnlineSpellTimer.Start(); } -IMPL_LINK_NOARG_TYPED(ImpEditEngine, IdleFormatHdl, Idle *, void) +IMPL_LINK_NOARG(ImpEditEngine, IdleFormatHdl, Idle *, void) { aIdleFormatter.ResetRestarts(); @@ -3882,7 +3882,7 @@ void ImpEditEngine::InvalidateFromParagraph( sal_Int32 nFirstInvPara ) pTmpPortion->ResetHeight(); } -IMPL_LINK_NOARG_TYPED(ImpEditEngine, StatusTimerHdl, Timer *, void) +IMPL_LINK_NOARG(ImpEditEngine, StatusTimerHdl, Timer *, void) { CallStatusHdl(); } diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index c0338efe5fc7..00b0da046717 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -152,14 +152,14 @@ namespace editeng bool ContinueConversion( bool _bRepeatCurrentUnit ); private: - DECL_LINK_TYPED( OnOptionsChanged, LinkParamNone*, void ); - DECL_LINK_TYPED( OnIgnore, Button*, void ); - DECL_LINK_TYPED( OnIgnoreAll, Button*, void ); - DECL_LINK_TYPED( OnChange, Button*, void ); - DECL_LINK_TYPED( OnChangeAll, Button*, void ); - DECL_LINK_TYPED( OnByCharClicked, CheckBox*, void ); - DECL_LINK_TYPED( OnConversionTypeChanged, Button*, void ); - DECL_LINK_TYPED( OnFind, Button*, void ); + DECL_LINK( OnOptionsChanged, LinkParamNone*, void ); + DECL_LINK( OnIgnore, Button*, void ); + DECL_LINK( OnIgnoreAll, Button*, void ); + DECL_LINK( OnChange, Button*, void ); + DECL_LINK( OnChangeAll, Button*, void ); + DECL_LINK( OnByCharClicked, CheckBox*, void ); + DECL_LINK( OnConversionTypeChanged, Button*, void ); + DECL_LINK( OnFind, Button*, void ); /** proceed, after the current convertible has been handled @@ -810,20 +810,20 @@ namespace editeng m_pAntiImpl->HandleNewUnit( m_nCurrentStartIndex - m_nReplacementBaseIndex, m_nCurrentEndIndex - m_nReplacementBaseIndex ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnOptionsChanged, LinkParamNone*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnOptionsChanged, LinkParamNone*, void) { //options and dictionaries might have been changed //-> update our internal settings and the dialog implUpdateData(); } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnIgnore, Button*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnIgnore, Button*, void) { // simply ignore, and proceed implProceed( false ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnIgnoreAll, Button*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnIgnoreAll, Button*, void) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnIgnoreAll: no dialog! How this?" ); @@ -841,7 +841,7 @@ namespace editeng } } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnChange, Button*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnChange, Button*, void) { // change DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" ); @@ -851,7 +851,7 @@ namespace editeng implProceed( false ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnChangeAll, Button*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnChangeAll, Button*, void) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnChangeAll: no dialog! How this?" ); if ( m_pConversionDialog ) @@ -873,7 +873,7 @@ namespace editeng } } - IMPL_LINK_TYPED( HangulHanjaConversion_Impl, OnByCharClicked, CheckBox*, _pBox, void ) + IMPL_LINK( HangulHanjaConversion_Impl, OnByCharClicked, CheckBox*, _pBox, void ) { m_bByCharacter = _pBox->IsChecked(); @@ -881,14 +881,14 @@ namespace editeng implProceed( true ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnConversionTypeChanged, Button*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnConversionTypeChanged, Button*, void) { DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" ); if( m_pConversionDialog ) m_eConversionFormat = m_pConversionDialog->GetConversionFormat( ); } - IMPL_LINK_NOARG_TYPED(HangulHanjaConversion_Impl, OnFind, Button*, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnFind, Button*, void) { DBG_ASSERT( m_pConversionDialog, "HangulHanjaConversion_Impl::OnFind: where did this come from?" ); if ( m_pConversionDialog ) diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index 1a2861054105..a7f86b652142 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1753,25 +1753,25 @@ SfxItemSet Outliner::GetParaAttribs( sal_Int32 nPara ) return pEditEngine->GetParaAttribs( nPara ); } -IMPL_LINK_TYPED( Outliner, ParaVisibleStateChangedHdl, Paragraph&, rPara, void ) +IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph&, rPara, void ) { sal_Int32 nPara = pParaList->GetAbsPos( &rPara ); pEditEngine->ShowParagraph( nPara, rPara.IsVisible() ); } -IMPL_LINK_NOARG_TYPED(Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo&, void) +IMPL_LINK_NOARG(Outliner, BeginMovingParagraphsHdl, MoveParagraphsInfo&, void) { if( !IsInUndo() ) aBeginMovingHdl.Call( this ); } -IMPL_LINK_TYPED( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos&, rInfos, void ) +IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos&, rInfos, void ) { UndoActionStart( EDITUNDO_DRAGANDDROP ); maBeginPasteOrDropHdl.Call(&rInfos); } -IMPL_LINK_TYPED( Outliner, EndPasteOrDropHdl, PasteOrDropInfos&, rInfos, void ) +IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos&, rInfos, void ) { bPasting = false; ImpTextPasted( rInfos.nStartPara, rInfos.nEndPara - rInfos.nStartPara + 1 ); @@ -1779,7 +1779,7 @@ IMPL_LINK_TYPED( Outliner, EndPasteOrDropHdl, PasteOrDropInfos&, rInfos, void ) UndoActionEnd( EDITUNDO_DRAGANDDROP ); } -IMPL_LINK_TYPED( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo&, rInfos, void ) +IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo&, rInfos, void ) { pParaList->MoveParagraphs( rInfos.nStartPara, rInfos.nDestPara, rInfos.nEndPara - rInfos.nStartPara + 1 ); sal_Int32 nChangesStart = std::min( rInfos.nStartPara, rInfos.nDestPara ); @@ -1985,7 +1985,7 @@ void Outliner::ImplBlockInsertionCallbacks( bool b ) } } -IMPL_LINK_TYPED( Outliner, EditEngineNotifyHdl, EENotify&, rNotify, void ) +IMPL_LINK( Outliner, EditEngineNotifyHdl, EENotify&, rNotify, void ) { if ( !nBlockInsCallback ) pEditEngine->aOutlinerNotifyHdl.Call( rNotify ); |