diff options
241 files changed, 356 insertions, 547 deletions
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 8bc513bb9592..75caec60ae92 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -357,7 +357,7 @@ uno::Sequence< OUString > SAL_CALL OGLPlayer::getSupportedServiceNames() return aRet; } -IMPL_LINK(OGLPlayer,TimerHandler,Timer*,pTimer) +IMPL_LINK_TYPED(OGLPlayer,TimerHandler,Timer*,pTimer,void) { if (pTimer == &m_aTimer) { @@ -365,8 +365,6 @@ IMPL_LINK(OGLPlayer,TimerHandler,Timer*,pTimer) assert(m_pOGLWindow); m_pOGLWindow->update(); } - - return 0; } } // namespace ogl diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx index e7a4ecce98b1..605233d47f92 100644 --- a/avmedia/source/opengl/oglplayer.hxx +++ b/avmedia/source/opengl/oglplayer.hxx @@ -62,7 +62,7 @@ public: virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - DECL_LINK( TimerHandler, Timer* ); + DECL_LINK_TYPED( TimerHandler, Timer*, void ); OUString m_sURL; diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index 05ca39ddede5..3840ba98390e 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -27,14 +27,13 @@ namespace basctl { -IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *, pTimer ) +IMPL_LINK_TYPED( DlgEdFunc, ScrollTimeout, Timer *, pTimer, void ) { (void)pTimer; vcl::Window& rWindow = rParent.GetWindow(); Point aPos = rWindow.ScreenToOutputPixel( rWindow.GetPointerPosPixel() ); aPos = rWindow.PixelToLogic( aPos ); ForceScroll( aPos ); - return 0; } void DlgEdFunc::ForceScroll( const Point& rPos ) diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx index d6982debb4b4..50148b3baa66 100644 --- a/basctl/source/inc/dlgedfunc.hxx +++ b/basctl/source/inc/dlgedfunc.hxx @@ -35,7 +35,7 @@ protected: DlgEditor& rParent; Timer aScrollTimer; - DECL_LINK( ScrollTimeout, Timer * ); + DECL_LINK_TYPED( ScrollTimeout, Timer *, void ); void ForceScroll( const Point& rPos ); public: diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 9f901e7cd176..0da480d54f6b 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -233,7 +233,7 @@ private: //methods css::awt::Rectangle impl_createDiagramAndContent( const CreateShapeParam2D& rParam, const css::awt::Size& rPageSize ); - DECL_LINK( UpdateTimeBased, void* ); + DECL_LINK_TYPED( UpdateTimeBased, Timer*, void ); private: //member ::osl::Mutex m_aMutex; diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx index 34aec553d199..565c0e74718c 100644 --- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx +++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx @@ -45,10 +45,9 @@ void TimerTriggeredControllerLock::startTimer() m_apControllerLockGuard.reset( new ControllerLockGuardUNO(m_xModel) ); m_aTimer.Start(); } -IMPL_LINK_NOARG(TimerTriggeredControllerLock, TimerTimeout) +IMPL_LINK_NOARG_TYPED(TimerTriggeredControllerLock, TimerTimeout, Timer *, void) { m_apControllerLockGuard.reset(); - return 0; } } //namespace chart diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx index 9b724e24f2df..c3250375791d 100644 --- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx @@ -43,7 +43,7 @@ private: boost::scoped_ptr< ControllerLockGuardUNO > m_apControllerLockGuard; AutoTimer m_aTimer; - DECL_LINK( TimerTimeout, void* ); + DECL_LINK_TYPED( TimerTimeout, Timer*, void ); }; } //namespace chart diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index f5c73bff7459..9462df665397 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -625,7 +625,7 @@ private: void impl_ShapeControllerDispatch( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs ); - DECL_LINK( DoubleClickWaitingHdl, void* ); + DECL_LINK_TYPED( DoubleClickWaitingHdl, Timer*, void ); void execute_DoubleClick( const Point* pMousePixel = NULL ); void startDoubleClickWaiting(); void stopDoubleClickWaiting(); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 685560558603..9d0f94a71839 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -533,7 +533,7 @@ void ChartController::stopDoubleClickWaiting() m_bWaitingForDoubleClick = false; } -IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl) +IMPL_LINK_NOARG_TYPED(ChartController, DoubleClickWaitingHdl, Timer *, void) { m_bWaitingForDoubleClick = false; @@ -553,8 +553,6 @@ IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl) impl_SetMousePointer( aMouseEvent ); } } - - return 0; } void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt ) diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 1ef10303457e..c85da489eaa5 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -3151,12 +3151,10 @@ void ChartView::setViewDirty() m_bViewDirty = true; } -IMPL_LINK_NOARG(ChartView, UpdateTimeBased) +IMPL_LINK_NOARG_TYPED(ChartView, UpdateTimeBased, Timer *, void) { setViewDirty(); update(); - - return 0; } void ChartView::createShapes2D( const awt::Size& rPageSize ) diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 875b71b57fe3..e6ca100f7690 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -289,7 +289,7 @@ void SfxConfigFunctionListBox::MouseMove( const MouseEvent& ) { } -IMPL_LINK( SfxConfigFunctionListBox, TimerHdl, Timer*, pTimer) +IMPL_LINK_TYPED( SfxConfigFunctionListBox, TimerHdl, Timer*, pTimer, void) /* Description Timer-handler for showing a help-text. If the mouse pointer is still on the currently selected entry after the timer has run out, @@ -297,7 +297,6 @@ IMPL_LINK( SfxConfigFunctionListBox, TimerHdl, Timer*, pTimer) */ { (void)pTimer; // unused - return 0L; } void SfxConfigFunctionListBox::ClearAll() diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx index 7477032f1567..a3d6acf0e350 100644 --- a/cui/source/customize/selector.cxx +++ b/cui/source/customize/selector.cxx @@ -135,14 +135,13 @@ void SvxConfigFunctionListBox::MouseMove( const MouseEvent& rMEvt ) } -IMPL_LINK_NOARG(SvxConfigFunctionListBox, TimerHdl) +IMPL_LINK_NOARG_TYPED(SvxConfigFunctionListBox, TimerHdl, Timer *, void) { aTimer.Stop(); Point aMousePos = GetPointerPosPixel(); SvTreeListEntry *pEntry = GetCurEntry(); if ( pEntry && GetEntry( aMousePos ) == pEntry && pCurEntry == pEntry ) Help::ShowBalloon( this, OutputToScreenPixel( aMousePos ), GetHelpText( pEntry ) ); - return 0L; } void SvxConfigFunctionListBox::ClearAll() diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index f7a063979589..77d1150f62b2 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -690,10 +690,9 @@ void FmSearchDialog::EnableControlPaint(bool bEnable) } } -IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint) +IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnDelayedPaint, Timer *, void) { EnableControlPaint(true); - return 0L; } void FmSearchDialog::OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_Int16 nFieldPos) diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index a4e9ea50b114..3a2ebf328db1 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -1247,11 +1247,10 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl) -IMPL_LINK_NOARG(TPGalleryThemeProperties, PreviewTimerHdl) +IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, PreviewTimerHdl, Timer *, void) { aPreviewTimer.Stop(); DoPreview(); - return 0L; } diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 42cac22e856b..0623a45ac372 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -165,13 +165,11 @@ void GraphicFilterDialog::dispose() } -IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl) +IMPL_LINK_NOARG_TYPED(GraphicFilterDialog, ImplPreviewTimeoutHdl, Timer *, void) { maTimer.Stop(); mpPreview->SetPreview(GetFilteredGraphic(mpPreview->GetScaledOriginal(), mpPreview->GetScaleX(), mpPreview->GetScaleY())); - - return 0; } diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index fd9340d599b2..936c5f859d58 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -279,7 +279,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void) { if ( IsMarkWndVisible() && ( GetPathType( maStrURL )==Type_ExistsFile || maStrURL.isEmpty() || @@ -294,8 +294,6 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl) LeaveWait(); } - - return 0L; } /************************************************************************* diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 860fa291d06c..82bb1384cb37 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -243,10 +243,9 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkInternetTp, TimeoutHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, TimeoutHdl_Impl, Timer *, void) { RefreshMarkWindow(); - return 0L; } /************************************************************************* diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index 478559bf26b4..c6c3ad9d9ea8 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -107,7 +107,7 @@ class SfxConfigFunctionListBox : public SvTreeListBox SfxGroupInfoArr_Impl aArr; SfxStylesInfo_Impl* pStylesInfo; - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK_TYPED( TimerHdl, Timer*, void ); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index f0717aa758e2..8d32d5e8d9fd 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -173,7 +173,7 @@ private: DECL_LINK( OnSearchProgress, FmSearchProgress* ); - DECL_LINK( OnDelayedPaint, void* ); ///< see EnableSearchUI + DECL_LINK_TYPED( OnDelayedPaint, Timer*, void ); ///< see EnableSearchUI void initCommon( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _rxCursor ); }; diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 134b6533b33b..644cf4a6d767 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -289,7 +289,7 @@ class TPGalleryThemeProperties : public SfxTabPage DECL_LINK( SelectThemeHdl, void* ); DECL_LINK( SelectFileTypeHdl, void* ); DECL_LINK( DClickFoundHdl, void* ); - DECL_LINK( PreviewTimerHdl, void* ); + DECL_LINK_TYPED( PreviewTimerHdl, Timer*, void ); DECL_LINK(EndSearchProgressHdl, void *); DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 0f2048862526..ca79d09918fd 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -73,7 +73,7 @@ private: Size maSizePixel; bool bIsBitmap; - DECL_LINK(ImplPreviewTimeoutHdl, void *); + DECL_LINK_TYPED(ImplPreviewTimeoutHdl, Timer *, void); DECL_LINK( ImplModifyHdl, void* p ); protected: diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 1a79416ee305..ae50b065641c 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -103,7 +103,7 @@ class SvxGrfCropPage : public SfxTabPage DECL_LINK( CropLoseFocusHdl, MetricField * ); DECL_LINK( CropModifyHdl, MetricField * ); DECL_LINK(OrigSizeHdl, void *); - DECL_LINK(Timeout, void *); + DECL_LINK_TYPED(Timeout, Timer *, void); void CalcZoom(); void CalcMinMaxBorder(); diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 19c69ba16ba7..9214f8024a0f 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -49,7 +49,7 @@ private: DECL_LINK (LostFocusPathHdl_Impl, void * ); ///< Combobox "path" lost its focus - DECL_LINK(TimeoutHdl_Impl , void *); ///< Handler for timer -timeout + DECL_LINK_TYPED(TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout enum EPathType { Type_Unknown, Type_Invalid, Type_ExistsFile, Type_File, diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 99f60cdca909..a9252e102ed9 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -54,7 +54,7 @@ private: DECL_LINK (LostFocusTargetHdl_Impl , void * ); ///< Combobox "Target" lost its focus DECL_LINK (ModifiedTargetHdl_Impl , void * ); ///< Contens of editfield "Target" modified - DECL_LINK(TimeoutHdl_Impl , void *); ///< Handler for timer -timeout + DECL_LINK_TYPED(TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout void SetScheme(const OUString& rScheme); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index dae84fea1d13..65e9f1aa56e2 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -152,7 +152,7 @@ private: DECL_LINK( ClickHdl_Impl, PushButton* ); DECL_LINK( EditHdl_Impl, Edit* ); DECL_LINK( OptHdl_Impl, void * ); - DECL_LINK(TimeHdl_Impl, void *); + DECL_LINK_TYPED(TimeHdl_Impl, Timer *, void); }; #endif diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 625da381375e..e5fc99d201fc 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -341,7 +341,7 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_LINK( SameLevelHdl_Impl, CheckBox * ); DECL_LINK( BulColorHdl_Impl, ColorListBox* ); DECL_LINK( BulRelSizeHdl_Impl, MetricField *); - DECL_LINK(PreviewInvalidateHdl_Impl, void *); + DECL_LINK_TYPED(PreviewInvalidateHdl_Impl, Timer *, void); DECL_STATIC_LINK( SvxNumOptionsTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* ); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 0cfa71112b74..898314dd2c66 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -96,7 +96,7 @@ friend class SvxConfigGroupListBox; SvxGroupInfoArr_Impl aArr; SvTreeListEntry* m_pDraggingEntry; - DECL_LINK(TimerHdl, void *); + DECL_LINK_TYPED(TimerHdl, Timer *, void); virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 035ddab252c1..645867a185b0 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -736,12 +736,11 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound ) m_pZoomConstRB->Enable(bFound); } -IMPL_LINK_NOARG(SvxGrfCropPage, Timeout) +IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, Timeout, Timer *, void) { DBG_ASSERT(pLastCropField,"Timeout ohne Feld?"); CropHdl(pLastCropField); pLastCropField = 0; - return 0; } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index be2ab716a598..2663c39e2f9d 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1567,10 +1567,9 @@ IMPL_LINK( SvxNumberFormatTabPage, OptHdl_Impl, void *, pOptCtrl ) return 0; } -IMPL_LINK_NOARG(SvxNumberFormatTabPage, TimeHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void) { pLastActivWindow=NULL; - return 0; } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 797a37dcf22b..2af50a74dd08 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1755,10 +1755,9 @@ IMPL_LINK( SvxNumOptionsTabPage, LevelHdl_Impl, ListBox *, pBox ) return 0; } -IMPL_LINK_NOARG(SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxNumOptionsTabPage, PreviewInvalidateHdl_Impl, Timer *, void) { m_pPreviewWIN->Invalidate(); - return 0; } IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox ) diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index d39dd447553b..189117d2a90a 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2281,10 +2281,11 @@ void SbaXDataBrowserController::CellDeactivated() IMPL_LINK_NOARG(SbaXDataBrowserController, OnClipboardChanged) { SolarMutexGuard aGuard; - return OnInvalidateClipboard( NULL ); + OnInvalidateClipboard( NULL ); + return 0; } -IMPL_LINK(SbaXDataBrowserController, OnInvalidateClipboard, AutoTimer*, _pTimer) +IMPL_LINK_TYPED(SbaXDataBrowserController, OnInvalidateClipboard, Timer*, _pTimer, void) { InvalidateFeature(ID_BROWSER_CUT); InvalidateFeature(ID_BROWSER_COPY); @@ -2296,8 +2297,6 @@ IMPL_LINK(SbaXDataBrowserController, OnInvalidateClipboard, AutoTimer*, _pTimer) // changes. This would be much better than this cycle-eating polling mechanism here .... if ( _pTimer != &m_aInvalidateClipboard ) InvalidateFeature(ID_BROWSER_PASTE); - - return 0L; } Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 nViewPos) const diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index afd7b1b60fb0..6ecacbc76a19 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -659,12 +659,11 @@ void DBTreeListBox::ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ) m_pContextMenuProvider->getCommandController().executeChecked( _nSelectedPopupEntry, Sequence< PropertyValue >() ); } -IMPL_LINK(DBTreeListBox, OnTimeOut, void*, /*EMPTY_ARG*/) +IMPL_LINK_NOARG_TYPED(DBTreeListBox, OnTimeOut, Timer*, void) { implStopSelectionTimer(); m_aSelChangeHdl.Call( NULL ); - return 0L; } void DBTreeListBox::StateChanged( StateChangedType nStateChange ) diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 9048294db7c3..77036352e97d 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -149,7 +149,7 @@ void OSqlEdit::GetFocus() MultiLineEditSyntaxHighlight::GetFocus(); } -IMPL_LINK_NOARG(OSqlEdit, OnUndoActionTimer) +IMPL_LINK_NOARG_TYPED(OSqlEdit, OnUndoActionTimer, Timer *, void) { OUString aText = GetText(); if(aText != m_strOrigText) @@ -166,18 +166,15 @@ IMPL_LINK_NOARG(OSqlEdit, OnUndoActionTimer) m_strOrigText =aText; } - - return 0L; } -IMPL_LINK_NOARG(OSqlEdit, OnInvalidateTimer) +IMPL_LINK_NOARG_TYPED(OSqlEdit, OnInvalidateTimer, Timer *, void) { OJoinController& rController = m_pView->getContainerWindow()->getDesignView()->getController(); rController.InvalidateFeature(SID_CUT); rController.InvalidateFeature(SID_COPY); if(!m_bStopTimer) m_timerInvalidate.Start(); - return 0L; } IMPL_LINK(OSqlEdit, ModifyHdl, void*, /*EMPTYTAG*/) diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 30f898773fd7..3b34eabc3406 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -319,7 +319,7 @@ namespace dbaui return 0L; } - IMPL_LINK(OParameterDialog, OnVisitedTimeout, Timer*, /*pTimer*/) + IMPL_LINK_NOARG_TYPED(OParameterDialog, OnVisitedTimeout, Timer*, void) { OSL_ENSURE(m_nCurrentlySelected != LISTBOX_ENTRY_NOTFOUND, "OParameterDialog::OnVisitedTimeout : invalid call !"); @@ -363,8 +363,6 @@ namespace dbaui m_pParam->SetSelection(aSel); } } - - return 0L; } IMPL_LINK(OParameterDialog, OnValueModified, Control*, /*pBox*/) diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index dfd8f4b39e21..c6199d3c087f 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -48,8 +48,8 @@ namespace dbaui ,public IDragTransferableListener { DECL_LINK( OnDoubleClick, SvTreeListBox* ); - DECL_LINK( ScrollUpHdl, SvTreeListBox* ); - DECL_LINK( ScrollDownHdl, SvTreeListBox* ); + DECL_LINK_TYPED( ScrollUpHdl, Timer*, void ); + DECL_LINK_TYPED( ScrollDownHdl, Timer*, void ); DECL_LINK( DropHdl, void* ); DECL_LINK( LookForUiHdl, void* ); diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 5cbc9361e5ed..1f30a833c0f6 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -330,7 +330,7 @@ namespace dbaui void impl_checkForCannotSelectUnfiltered( const ::dbtools::SQLExceptionInfo& _rError ); // time to check the CUT/COPY/PASTE-slot-states - DECL_LINK( OnInvalidateClipboard, AutoTimer* ); + DECL_LINK_TYPED( OnInvalidateClipboard, Timer*, void ); DECL_LINK( OnClipboardChanged, void* ); // search callbacks diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 4dfd3c84a713..a47af3e632d9 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -74,7 +74,7 @@ namespace dbaui private: void init(); - DECL_LINK( OnTimeOut, void* ); + DECL_LINK_TYPED( OnTimeOut, Timer*, void ); DECL_LINK( OnResetEntry, SvTreeListEntry* ); DECL_LINK( ScrollUpHdl, SvTreeListBox* ); DECL_LINK( ScrollDownHdl, SvTreeListBox* ); diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 11db9808841f..7a52aa15d9a7 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -95,7 +95,7 @@ namespace dbaui ::connectivity::OSQLParseNode* implPredicateTree(OUString& _rErrorMessage, const OUString& _rStatement, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField); private: - DECL_LINK(OnVisitedTimeout, Timer*); + DECL_LINK_TYPED(OnVisitedTimeout, Timer*, void); DECL_LINK(OnValueModified, Control*); DECL_LINK(OnEntrySelected, ListBox*); DECL_LINK(OnButtonClicked, PushButton*); diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 81695cc21f72..2e8a8a2be294 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -53,8 +53,8 @@ namespace dbaui com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertySet > m_notifier; - DECL_LINK(OnUndoActionTimer, void*); - DECL_LINK(OnInvalidateTimer, void*); + DECL_LINK_TYPED(OnUndoActionTimer, Timer*, void); + DECL_LINK_TYPED(OnInvalidateTimer, Timer*, void); private: void ImplSetFont(); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 05d3d05219db..65ffa8fec570 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2487,14 +2487,13 @@ void OSelectionBrowseBox::appendUndoAction(const OUString& _rOldValue,const OUSt } } -IMPL_LINK_NOARG(OSelectionBrowseBox, OnInvalidateTimer) +IMPL_LINK_NOARG_TYPED(OSelectionBrowseBox, OnInvalidateTimer, Timer *, void) { static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature(SID_CUT); static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature(SID_COPY); static_cast<OQueryController&>(getDesignView()->getController()).InvalidateFeature(SID_PASTE); if(!m_bStopTimer) m_timerInvalidate.Start(); - return 0L; } void OSelectionBrowseBox::stopTimer() diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 45dbfcbe4fd8..4a1276767862 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -77,7 +77,7 @@ namespace dbaui bool m_bDisableErrorBox; bool m_bInUndoMode; - DECL_LINK(OnInvalidateTimer, void*); + DECL_LINK_TYPED(OnInvalidateTimer, Timer*, void); public: OSelectionBrowseBox( vcl::Window* pParent ); virtual ~OSelectionBrowseBox(); virtual void dispose() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 2453bd292f67..545e7712d361 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -167,11 +167,11 @@ bool OTableWindowListBox::PreNotify(NotifyEvent& rNEvt) return true; } -IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ ) +IMPL_LINK_NOARG_TYPED( OTableWindowListBox, ScrollUpHdl, Timer*, void ) { SvTreeListEntry* pEntry = GetEntry( m_aMousePos ); if( !pEntry ) - return 0; + return; if( pEntry != Last() ) { @@ -179,15 +179,13 @@ IMPL_LINK( OTableWindowListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ ) pEntry = GetEntry( m_aMousePos ); Select( pEntry, true ); } - - return 0; } -IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ ) +IMPL_LINK_NOARG_TYPED( OTableWindowListBox, ScrollDownHdl, Timer*, void ) { SvTreeListEntry* pEntry = GetEntry( m_aMousePos ); if( !pEntry ) - return 0; + return; if( pEntry != Last() ) { @@ -195,8 +193,6 @@ IMPL_LINK( OTableWindowListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ ) pEntry = GetEntry( m_aMousePos ); Select( pEntry, true ); } - - return 0; } void OTableWindowListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ ) @@ -247,7 +243,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) if( !m_aScrollTimer.IsActive() ) { m_aScrollTimer.SetTimeoutHdl( LINK(this, OTableWindowListBox, ScrollUpHdl) ); - ScrollUpHdl( this ); + ScrollUpHdl( nullptr ); } } @@ -257,7 +253,7 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) if( !m_aScrollTimer.IsActive() ) { m_aScrollTimer.SetTimeoutHdl( LINK(this, OTableWindowListBox, ScrollDownHdl) ); - ScrollDownHdl( this ); + ScrollDownHdl( nullptr ); } } else diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index d8321b173b39..c47fc25d70a1 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -88,12 +88,11 @@ OTableEditorCtrl::ClipboardInvalidator::~ClipboardInvalidator() } -IMPL_LINK_NOARG(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate) +IMPL_LINK_NOARG_TYPED(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate, Timer *, void) { m_pOwner->GetView()->getController().InvalidateFeature(SID_CUT); m_pOwner->GetView()->getController().InvalidateFeature(SID_COPY); m_pOwner->GetView()->getController().InvalidateFeature(SID_PASTE); - return 0L; } void OTableEditorCtrl::Init() diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index a91c88396737..bbd4d18e0184 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -78,7 +78,7 @@ namespace dbaui ~ClipboardInvalidator(); protected: - DECL_LINK(OnInvalidate, void*); + DECL_LINK_TYPED(OnInvalidate, Timer*, void); }; friend class OTableEditorCtrl::ClipboardInvalidator; diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index d5d184d2e02d..21ab2f0b0916 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -154,7 +154,7 @@ class Desktop : public Application static void EnableOleAutomation(); DECL_LINK( ImplInitFilterHdl, ConvertData* ); - DECL_LINK( AsyncInitFirstRun, void* ); + DECL_LINK_TYPED( AsyncInitFirstRun, Timer*, void ); /** checks if the office is run the first time <p>If so, <method>DoFirstRunInitializations</method> is called (asynchronously and delayed) and the respective flag in the configuration is reset.</p> diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 389389294551..5be7223be8ab 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1864,10 +1864,9 @@ void Desktop::OverrideSystemSettings( AllSettings& rSettings ) } -IMPL_LINK_NOARG(Desktop, AsyncInitFirstRun) +IMPL_LINK_NOARG_TYPED(Desktop, AsyncInitFirstRun, Timer *, void) { DoFirstRunInitializations(); - return 0L; } diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 35fbc7ada465..ca187731b2e0 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -666,9 +666,9 @@ private: inline VirtualDevice* GetVirtualDevice( const MapMode& rMapMode, sal_uLong nDrawMode ); inline void EraseVirtualDevice() { pVirtDev.disposeAndClear(); } - DECL_LINK(StatusTimerHdl, void *); + DECL_LINK_TYPED(StatusTimerHdl, Timer *, void); DECL_LINK(IdleFormatHdl, void *); - DECL_LINK(OnlineSpellHdl, void *); + DECL_LINK_TYPED(OnlineSpellHdl, Timer *, void); DECL_LINK( DocModified, void* ); void CheckIdleFormatter(); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 34f9f1c3f4d5..1928ba02f1a5 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -308,14 +308,12 @@ void ImpEditEngine::UpdateViews( EditView* pCurView ) CallStatusHdl(); } -IMPL_LINK_NOARG(ImpEditEngine, OnlineSpellHdl) +IMPL_LINK_NOARG_TYPED(ImpEditEngine, OnlineSpellHdl, Timer *, void) { if ( !Application::AnyInput( VclInputFlags::KEYBOARD ) && GetUpdateMode() && IsFormatted() ) DoOnlineSpelling(); else aOnlineSpellTimer.Start(); - - return 0; } IMPL_LINK_NOARG(ImpEditEngine, IdleFormatHdl) @@ -4016,10 +4014,9 @@ void ImpEditEngine::InvalidateFromParagraph( sal_Int32 nFirstInvPara ) pTmpPortion->ResetHeight(); } -IMPL_LINK_NOARG(ImpEditEngine, StatusTimerHdl) +IMPL_LINK_NOARG_TYPED(ImpEditEngine, StatusTimerHdl, Timer *, void) { CallStatusHdl(); - return 0; } void ImpEditEngine::CallStatusHdl() diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index fcfd11afbeec..6c666f59a922 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -146,7 +146,7 @@ private: DECL_LINK(ClickHdl, void *); DECL_LINK( HighlightHdl, MenuBar::MenuBarButtonCallbackArg* ); DECL_LINK(WaitTimeOutHdl, void *); - DECL_LINK(TimeOutHdl, void *); + DECL_LINK_TYPED(TimeOutHdl, Timer *, void); DECL_LINK(UserEventHdl, void *); DECL_LINK( WindowEventHdl, VclWindowEvent* ); DECL_LINK( ApplicationEventHdl, VclSimpleEvent* ); @@ -627,11 +627,9 @@ IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl) } -IMPL_LINK_NOARG(UpdateCheckUI, TimeOutHdl) +IMPL_LINK_NOARG_TYPED(UpdateCheckUI, TimeOutHdl, Timer *, void) { RemoveBubbleWindow( false ); - - return 0; } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index f91ec082aba9..2e325405c20e 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2633,10 +2633,9 @@ void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/) throw( Runt } -IMPL_LINK_NOARG(ODatabaseForm, OnTimeout) +IMPL_LINK_NOARG_TYPED(ODatabaseForm, OnTimeout, Timer *, void) { reload_impl(true); - return 1; } diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index 4e55aef0d1ef..62c9892e6e30 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -537,7 +537,7 @@ private: void impl_construct(); - DECL_LINK( OnTimeout, void* ); + DECL_LINK_TYPED( OnTimeout, Timer*, void ); protected: using OPropertySetHelper::getPropertyValues; }; diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index c88e5269ecd0..ae197c5683cb 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -630,7 +630,7 @@ void SvtFileDialog::Init_Impl // set timer for the filterbox travel _pImp->_aFilterTimer.SetTimeout( TRAVELFILTER_TIMEOUT ); - _pImp->_aFilterTimer.SetTimeoutHdl( LINK( this, SvtFileDialog, FilterSelectHdl_Impl ) ); + _pImp->_aFilterTimer.SetTimeoutHdl( LINK( this, SvtFileDialog, FilterSelectTimerHdl_Impl ) ); if ( WB_SAVEAS & nStyle ) { @@ -1147,18 +1147,8 @@ void SvtFileDialog::EnableAutocompletion( bool _bEnable ) -IMPL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, void*, pInstance ) +IMPL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, void*, EMPTYARG ) { - DBG_ASSERT( pInstance, "SvtFileDialog:keine Instanz" ); - - // was the handler executed by the travel timer? - if ( pInstance == &pThis->_pImp->_aFilterTimer ) - { - // filter the view again - pThis->ExecuteFilter(); - return 0; - } - OUString sSelectedFilterDisplayName; SvtFileDialogFilter_Impl* pSelectedFilter = pThis->_pImp->GetSelectedFilterEntry( sSelectedFilterDisplayName ); if ( !pSelectedFilter ) @@ -1231,7 +1221,12 @@ IMPL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, void*, pInstance ) return 0; } - +IMPL_STATIC_LINK_TYPED( + SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, EMPTYARG, void) +{ + // filter the view again + pThis->ExecuteFilter(); +} IMPL_STATIC_LINK( SvtFileDialog, FileNameGetFocusHdl_Impl, void*, EMPTYARG ) { diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 5c67ad2c3164..b0588c02a9c3 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -113,6 +113,7 @@ private: ::com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_context; DECL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, void* ); + DECL_STATIC_LINK_TYPED( SvtFileDialog, FilterSelectTimerHdl_Impl, Timer*, void ); DECL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton* ); DECL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void* ); DECL_LINK ( CancelHdl_Impl, void* ); diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index ae1f3008d965..078120e520a2 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -182,7 +182,7 @@ namespace framework const css::uno::Reference< css::uno::XComponentContext > &rComponentContext ); protected: - DECL_LINK(AsyncLayoutHdl, void *); + DECL_LINK_TYPED(AsyncLayoutHdl, Timer *, void); private: diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index f985b3601688..62861506b9fb 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -154,7 +154,7 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener DECL_LINK(Highlight, void *); DECL_LINK( Activate, Menu * ); DECL_LINK( Deactivate, Menu * ); - DECL_LINK( AsyncSettingsHdl, Timer * ); + DECL_LINK_TYPED( AsyncSettingsHdl, Timer *, void ); void RemoveListener(); void RequestImages(); diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 95381c3120a4..11163fcb3d79 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -141,7 +141,7 @@ class ToolBarManager : public ToolbarManager_Base DECL_LINK( MenuButton, ToolBox * ); DECL_LINK( MenuSelect, Menu * ); DECL_LINK( MenuDeactivate, Menu * ); - DECL_LINK(AsyncUpdateControllersHdl, void *); + DECL_LINK_TYPED(AsyncUpdateControllersHdl, Timer *, void); DECL_STATIC_LINK( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo* ); virtual bool MenuItemAllowed( sal_uInt16 ) const; diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 753ca212fd28..7bcbccd1d70b 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2677,7 +2677,7 @@ throw( uno::RuntimeException, std::exception ) m_bMustDoLayout = true; if ( !m_aAsyncLayoutTimer.IsActive() ) { - const Link<>& aLink = m_aAsyncLayoutTimer.GetTimeoutHdl(); + const Link<Timer *, void>& aLink = m_aAsyncLayoutTimer.GetTimeoutHdl(); if ( aLink.IsSet() ) aLink.Call( &m_aAsyncLayoutTimer ); } @@ -2749,13 +2749,13 @@ void SAL_CALL LayoutManager::windowHidden( const lang::EventObject& aEvent ) thr } } -IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl) +IMPL_LINK_NOARG_TYPED(LayoutManager, AsyncLayoutHdl, Timer *, void) { SolarMutexClearableGuard aReadLock; m_aAsyncLayoutTimer.Stop(); if( !m_xContainerWindow.is() ) - return 0; + return; awt::Rectangle aDockingArea( m_aDockingArea ); ::Size aStatusBarSize( implts_getStatusBarSize() ); @@ -2766,8 +2766,6 @@ IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl) implts_setDockingAreaWindowSizes( aDockingArea ); implts_doLayout( true, false ); - - return 0; } // XFrameActionListener diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 93679018cc37..8b75271afbac 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -634,7 +634,7 @@ private: /** @short callback of our internal timer. */ - DECL_LINK(implts_timerExpired, void*); + DECL_LINK_TYPED(implts_timerExpired, Timer*, void); /** @short makes our dispatch() method asynchronous! */ @@ -2326,7 +2326,7 @@ void AutoRecovery::implts_stopTimer() m_aTimer.Stop(); } -IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) +IMPL_LINK_NOARG_TYPED(AutoRecovery, implts_timerExpired, Timer *, void) { try { @@ -2346,7 +2346,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) /* SAFE */ { osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex); if ((m_eJob & AutoRecovery::E_DISABLE_AUTORECOVERY) == AutoRecovery::E_DISABLE_AUTORECOVERY) - return 0; + return; } /* SAFE */ // check some "states", where its not allowed (better: not a good idea) to @@ -2360,7 +2360,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) m_eTimerType = AutoRecovery::E_POLL_TILL_AUTOSAVE_IS_ALLOWED; } /* SAFE */ implts_updateTimer(); - return 0; + return; } // analyze timer type. @@ -2375,7 +2375,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) if (!bUserIdle) { implts_updateTimer(); - return 0; + return; } } @@ -2418,8 +2418,6 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired) catch(const css::uno::Exception&) { } - - return 0; } IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index c9eee85bad5e..b06fa6a10751 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -939,7 +939,7 @@ IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu ) return 1; } -IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,) +IMPL_LINK_NOARG_TYPED( MenuBarManager, AsyncSettingsHdl, Timer*, void) { SolarMutexGuard g; Reference< XInterface > xSelfHold( @@ -951,8 +951,6 @@ IMPL_LINK( MenuBarManager, AsyncSettingsHdl, Timer*,) SetItemContainer( m_xDeferedItemContainer ); m_xDeferedItemContainer.clear(); } - - return 0; } IMPL_LINK( MenuBarManager, Select, Menu *, pMenu ) diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 326d55ea8c3e..5a57484d259f 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -2100,7 +2100,7 @@ IMPL_LINK_NOARG(ToolBarManager, MiscOptionsChanged) return 0; } -IMPL_LINK_NOARG(ToolBarManager, AsyncUpdateControllersHdl) +IMPL_LINK_NOARG_TYPED(ToolBarManager, AsyncUpdateControllersHdl, Timer *, void) { // The guard must be in its own context as the we can get destroyed when our // own xInterface reference get destroyed! @@ -2109,13 +2109,11 @@ IMPL_LINK_NOARG(ToolBarManager, AsyncUpdateControllersHdl) SolarMutexGuard g; if ( m_bDisposed ) - return 1; + return; // Request to update our controllers m_aAsyncUpdateControllersTimer.Stop(); UpdateControllers(); - - return 0; } IMPL_STATIC_LINK_NOINSTANCE( ToolBarManager, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo ) diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 69549abf39cb..164c1bd7f34d 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -131,7 +131,8 @@ private: const SfxPoolItem *pItem, SfxItemState eItemState ); SAL_DLLPRIVATE SfxStateCache* GetStateCache( sal_uInt16 nId, sal_uInt16 *pPos); - DECL_DLLPRIVATE_LINK( NextJob_Impl, Timer * ); + DECL_DLLPRIVATE_LINK_TYPED( NextJob, Timer *, void ); + SAL_DLLPRIVATE bool NextJob_Impl(Timer * pTimer); public: SfxBindings(); diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index cc87c68ce50f..f1245fe3e048 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -254,7 +254,7 @@ private: protected: - DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *); + DECL_STATIC_LINK_TYPED( Calendar, ScrollHdl, Timer *, void ); public: Calendar( vcl::Window* pParent, WinBits nWinStyle = 0 ); diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 0c25f90bf587..35d63bc34776 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -315,7 +315,7 @@ private: bool bEnlarge ) const; - DECL_LINK( ImplAutoSwapOutHdl, void* ); + DECL_LINK_TYPED( ImplAutoSwapOutHdl, Timer*, void ); // restart SwapOut timer; this is like touching in a cache to reset to the full timeout value void SVT_DLLPRIVATE restartSwapOutTimer() const; diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 33ae3657c4e2..34c081b64e16 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -56,7 +56,7 @@ private: DECL_DLLPRIVATE_LINK( ImplPropertiesHdl, void* ); DECL_DLLPRIVATE_LINK( ImplOptionsHdl, void* ); DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplStatusHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplStatusHdl, Timer*, void ); public: PrinterSetupDialog( vcl::Window* pWindow ); diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 330db02ec858..b89bc1852cf6 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -268,7 +268,7 @@ private: SVT_DLLPRIVATE void ImplTracking( const Point& rPos, bool bRepeat ); SVT_DLLPRIVATE void ImplEndTracking( const Point& rPos, bool bCancel ); DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* ); - DECL_DLLPRIVATE_LINK( ImplTimerHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void ); ValueSet (const ValueSet &) SAL_DELETED_FUNCTION; ValueSet & operator= (const ValueSet &) SAL_DELETED_FUNCTION; diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx index 363f884d9f57..49f70d4d9752 100644 --- a/include/svx/formatpaintbrushctrl.hxx +++ b/include/svx/formatpaintbrushctrl.hxx @@ -46,7 +46,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; private: - DECL_LINK( WaitDoubleClickHdl, void* ); + DECL_LINK_TYPED( WaitDoubleClickHdl, Timer*, void ); void impl_executePaintBrush(); private: diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 8d2c1bfb6726..7c03abd975d9 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -41,7 +41,7 @@ class SvxLineBox : public LineLB SfxObjectShell* mpSh; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; - DECL_LINK(DelayHdl_Impl, void *); + DECL_LINK_TYPED(DelayHdl_Impl, Timer *, void); void ReleaseFocus_Impl(); diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index ec241902877b..0ad7edb914fe 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -243,7 +243,7 @@ private: DECL_LINK(FormatHdl_Impl, void *); DECL_LINK(NoFormatHdl_Impl, void *); DECL_LINK(AttributeHdl_Impl, void *); - DECL_LINK( TimeoutHdl_Impl, Timer* ); + DECL_LINK_TYPED( TimeoutHdl_Impl, Timer*, void ); void Construct_Impl(); void InitControls_Impl(); diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 16453d8ad16a..47d1dc67660b 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -202,7 +202,7 @@ class OLEObjCache void UnloadOnDemand(); static bool UnloadObj( SdrOle2Obj* pObj ); - DECL_LINK( UnloadCheckHdl, AutoTimer* ); + DECL_LINK_TYPED( UnloadCheckHdl, Timer*, void ); public: OLEObjCache(); diff --git a/include/vcl/animate.hxx b/include/vcl/animate.hxx index 0d89bc9c4f1b..74a527fc5c84 100644 --- a/include/vcl/animate.hxx +++ b/include/vcl/animate.hxx @@ -229,7 +229,7 @@ private: bool mbIsWaiting; SAL_DLLPRIVATE void ImplRestartTimer( sal_uLong nTimeout ); - DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplTimeoutHdl, Timer*, void ); }; diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index eecbd0c0ca8a..c56ef3c4b0d9 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -25,6 +25,7 @@ #include <vcl/dllapi.h> #include <vcl/vclptr.hxx> +class Timer; struct ImplCursorData; namespace vcl { class Window; } @@ -53,7 +54,7 @@ private: public: SAL_DLLPRIVATE void ImplDraw(); SAL_DLLPRIVATE void ImplRestore(); - DECL_DLLPRIVATE_LINK( ImplTimerHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplTimerHdl, Timer*, void ); SAL_DLLPRIVATE void ImplShow( bool bDrawDirect = true ); SAL_DLLPRIVATE void ImplHide( bool bStopTimer ); SAL_DLLPRIVATE void ImplResume( bool bRestore = false ); diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 3eb655ccd09b..8df899a34219 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -99,7 +99,7 @@ private: css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > mxISC; - DECL_DLLPRIVATE_LINK( ImplUpdateDataHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplUpdateDataHdl, Timer*, void ); SAL_DLLPRIVATE bool ImplTruncateToMaxLen( OUString&, sal_Int32 nSelectionLen ) const; SAL_DLLPRIVATE void ImplInitEditData(); diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx index 035e1fc82dc2..b89db354dc9e 100644 --- a/include/vcl/menubtn.hxx +++ b/include/vcl/menubtn.hxx @@ -45,7 +45,7 @@ private: Link<MenuButton *, void> maSelectHdl; SAL_DLLPRIVATE void ImplInitMenuButtonData(); - DECL_DLLPRIVATE_LINK( ImplMenuTimeoutHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplMenuTimeoutHdl, Timer*, void ); MenuButton( const MenuButton & ) SAL_DELETED_FUNCTION; MenuButton& operator=( const MenuButton & ) SAL_DELETED_FUNCTION; diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index 71bda7168c3b..18efc600681c 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -86,7 +86,7 @@ private: SAL_DLLPRIVATE void ImplDragThumb( const Point& rMousePos ); SAL_DLLPRIVATE Size getCurrentCalcSize() const; DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); - DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplAutoTimerHdl, Timer*, void ); public: explicit ScrollBar( vcl::Window* pParent, WinBits nStyle = WB_VERT ); diff --git a/include/vcl/seleng.hxx b/include/vcl/seleng.hxx index 781527157607..d5b9ef572d28 100644 --- a/include/vcl/seleng.hxx +++ b/include/vcl/seleng.hxx @@ -91,7 +91,7 @@ private: sal_uLong nUpdateInterval; sal_uInt16 nLockedMods; SelectionEngineFlags nFlags; - DECL_DLLPRIVATE_LINK( ImpWatchDog, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImpWatchDog, Timer*, void ); inline bool ShouldDeselect( bool bModifierKey1 ) const; // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging diff --git a/include/vcl/spin.hxx b/include/vcl/spin.hxx index 1e40c6d6f017..48c8b4e9463c 100644 --- a/include/vcl/spin.hxx +++ b/include/vcl/spin.hxx @@ -53,7 +53,7 @@ private: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); - DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplTimeout, Timer*, void ); public: explicit SpinButton( vcl::Window* pParent, WinBits nStyle = 0 ); diff --git a/include/vcl/spinfld.hxx b/include/vcl/spinfld.hxx index 8060271d1777..bf4879b52425 100644 --- a/include/vcl/spinfld.hxx +++ b/include/vcl/spinfld.hxx @@ -51,7 +51,7 @@ protected: SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); private: - DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplTimeout, Timer*, void ); SAL_DLLPRIVATE void ImplInitSpinFieldData(); SAL_DLLPRIVATE void ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea ); diff --git a/include/vcl/throbber.hxx b/include/vcl/throbber.hxx index f7cbbedf62e2..2c986adc23f3 100644 --- a/include/vcl/throbber.hxx +++ b/include/vcl/throbber.hxx @@ -86,7 +86,7 @@ private: AutoTimer maWaitTimer; ImageSet meImageSet; - DECL_LINK( TimeOutHdl, void* ); + DECL_LINK_TYPED( TimeOutHdl, Timer*, void ); }; #endif // INCLUDED_VCL_THROBBER_HXX diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index c1779ce04294..458ad4e52bc8 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -26,7 +26,7 @@ class VCL_DLLPUBLIC Timer : public Scheduler { protected: - Link<> maTimeoutHdl; // Callback Link + Link<Timer *, void> maTimeoutHdl; // Callback Link sal_uInt64 mnTimeout; bool mbAuto; @@ -43,8 +43,8 @@ public: /// Make it possible to associate a callback with this timer handler /// of course, you can also sub-class and override 'Invoke' - void SetTimeoutHdl( const Link<>& rLink ) { maTimeoutHdl = rLink; } - const Link<>& GetTimeoutHdl() const { return maTimeoutHdl; } + void SetTimeoutHdl( const Link<Timer *, void>& rLink ) { maTimeoutHdl = rLink; } + const Link<Timer *, void>& GetTimeoutHdl() const { return maTimeoutHdl; } void SetTimeout( sal_uInt64 nTimeoutMs ); sal_uInt64 GetTimeout() const { return mnTimeout; } virtual void Invoke() SAL_OVERRIDE; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 661ea918a641..076f4342f9c3 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -239,7 +239,7 @@ private: DECL_DLLPRIVATE_LINK( ImplUpdateHdl, void* ); DECL_DLLPRIVATE_LINK( ImplResetAutoSizeTriesHdl, void* ); DECL_DLLPRIVATE_LINK( ImplCustomMenuListener, VclMenuEvent* ); - DECL_DLLPRIVATE_LINK( ImplDropdownLongClickHdl, void* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplDropdownLongClickHdl, Timer*, void ); ToolBox (const ToolBox &) SAL_DELETED_FUNCTION; ToolBox& operator= (const ToolBox &) SAL_DELETED_FUNCTION; diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 441edcd45bf4..12d03e14f512 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -43,7 +43,7 @@ private: protected: - DECL_LINK( ImpUpdateDataHdl, void* ); + DECL_LINK_TYPED( ImpUpdateDataHdl, Timer*, void ); void StateChanged( StateChangedType nType ) SAL_OVERRIDE; void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index ccee88b2c20d..a3012e79455f 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -426,7 +426,7 @@ public: DECL_DLLPRIVATE_LINK( ImplHandlePaintHdl, void* ); DECL_DLLPRIVATE_LINK( ImplGenerateMouseMoveHdl, void* ); - DECL_DLLPRIVATE_LINK( ImplTrackTimerHdl, Timer* ); + DECL_DLLPRIVATE_LINK_TYPED( ImplTrackTimerHdl, Timer*, void ); DECL_DLLPRIVATE_LINK( ImplAsyncFocusHdl, void* ); DECL_DLLPRIVATE_LINK( ImplHandleResizeTimerHdl, void* ); DECL_DLLPRIVATE_LINK( ImplHideOwnerDrawWindowsHdl, void* ); diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index dd4185ddab20..d14d6ab08d7d 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -185,7 +185,7 @@ public: virtual void dispose() SAL_OVERRIDE; DECL_LINK(OnEntrySelDesel, NavigatorTree*); - DECL_LINK( OnDropActionTimer, void* ); + DECL_LINK_TYPED( OnDropActionTimer, Timer*, void ); virtual void _selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException) SAL_OVERRIDE; @@ -423,10 +423,10 @@ void NavigatorTree::StartDrag( sal_Int8 /*_nAction*/, const Point& _rPosPixel ) } } -IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer) +IMPL_LINK_NOARG_TYPED(NavigatorTree, OnDropActionTimer, Timer *, void) { if (--m_nTimerCounter > 0) - return 0L; + return; switch ( m_aDropActionType ) { @@ -450,8 +450,6 @@ IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer) break; } - - return 0L; } diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index 8f8938b6f545..32639c87eeda 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -53,7 +53,7 @@ protected: bool m_bUiActive; bool m_bShowPropertyBrowser; - DECL_LINK( ScrollTimeout, Timer * ); + DECL_LINK_TYPED( ScrollTimeout, Timer *, void ); void ForceScroll( const Point& rPos ); /** checks that no other object is overlapped. * diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index a1d2676f971a..6182625745e6 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -62,10 +62,9 @@ using namespace ::com::sun::star; -IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *, ) +IMPL_LINK_NOARG_TYPED( DlgEdFunc, ScrollTimeout, Timer *, void ) { ForceScroll( m_pParent->PixelToLogic( m_pParent->GetPointerPosPixel() ) ); - return 0; } diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index 129e884e4ce8..f55dc972db63 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -74,7 +74,7 @@ public: const OUString& GetSource() const { return aSourceArea; } const ScRange& GetDestArea() const { return aDestArea; } - DECL_LINK( RefreshHdl, void* ); + DECL_LINK_TYPED( RefreshHdl, Timer*, void ); DECL_LINK( AreaEndEditHdl, void* ); }; diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx index c41c537b1f40..1853bc9da09a 100644 --- a/sc/inc/chartlock.hxx +++ b/sc/inc/chartlock.hxx @@ -66,7 +66,7 @@ private: Timer maTimer; std::unique_ptr< ScChartLockGuard > mapScChartLockGuard; - DECL_LINK(TimeoutHdl, void *); + DECL_LINK_TYPED(TimeoutHdl, Timer *, void); ScTemporaryChartLock( const ScTemporaryChartLock& ) SAL_DELETED_FUNCTION; }; diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx index 30c1106669e0..66b0532e404e 100644 --- a/sc/inc/dbdata.hxx +++ b/sc/inc/dbdata.hxx @@ -214,7 +214,7 @@ public: }; private: - Link<> aRefreshHandler; + Link<Timer *, void> aRefreshHandler; ScDocument* pDoc; sal_uInt16 nEntryIndex; ///< counter for unique indices NamedDBs maNamedDBs; @@ -246,9 +246,9 @@ public: sal_uInt16 GetEntryIndex() { return nEntryIndex; } void SetEntryIndex(sal_uInt16 nInd) { nEntryIndex = nInd; } - void SetRefreshHandler( const Link<>& rLink ) + void SetRefreshHandler( const Link<Timer *, void>& rLink ) { aRefreshHandler = rLink; } - const Link<>& GetRefreshHandler() const { return aRefreshHandler; } + const Link<Timer *, void>& GetRefreshHandler() const { return aRefreshHandler; } bool empty() const; bool operator== (const ScDBCollection& r) const; diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 8f680e50d1fc..76e09e47e6e3 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -839,7 +839,7 @@ private: bool mbDocTimerEnabled:1; AutoTimer maSrcDocTimer; - DECL_LINK(TimeOutHdl, AutoTimer*); + DECL_LINK_TYPED(TimeOutHdl, Timer*, void); }; #endif diff --git a/sc/inc/refreshtimer.hxx b/sc/inc/refreshtimer.hxx index 2eed9833d7ee..46c48df1445e 100644 --- a/sc/inc/refreshtimer.hxx +++ b/sc/inc/refreshtimer.hxx @@ -54,7 +54,7 @@ public: bool operator!=( const ScRefreshTimer& r ) const; void SetRefreshControl( ScRefreshTimerControl * const * pp ); - void SetRefreshHandler( const Link<>& rLink ); + void SetRefreshHandler( const Link<Timer *, void>& rLink ); sal_uLong GetRefreshDelay() const; void StopRefreshTimer(); diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index f51949b0596e..82ea4e3edacd 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -131,7 +131,7 @@ public: // moved by the application - DECL_LINK( IdleHandler, void* ); // Timer instead of idle + DECL_LINK_TYPED( IdleHandler, Timer*, void ); // Timer instead of idle DECL_LINK( SpellTimerHdl, void* ); DECL_LINK( CalcFieldValueHdl, EditFieldInfo* ); diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index 3296c76b22a5..823bec4a3b3e 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -66,7 +66,7 @@ public: bool IsUsed() const; - DECL_LINK( RefreshHdl, void* ); + DECL_LINK_TYPED( RefreshHdl, Timer*, void ); DECL_LINK( TableEndEditHdl, ::sfx2::SvBaseLink* ); }; diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx index 9d07d881a218..82b82400b7ae 100644 --- a/sc/source/core/tool/chartlock.cxx +++ b/sc/source/core/tool/chartlock.cxx @@ -174,10 +174,9 @@ void ScTemporaryChartLock::AlsoLockThisChart( const Reference< frame::XModel >& mapScChartLockGuard->AlsoLockThisChart( xModel ); } -IMPL_LINK_NOARG(ScTemporaryChartLock, TimeoutHdl) +IMPL_LINK_NOARG_TYPED(ScTemporaryChartLock, TimeoutHdl, Timer *, void) { mapScChartLockGuard.reset(); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx index 1a4bf179445e..ce73a0edbe72 100644 --- a/sc/source/core/tool/refreshtimer.cxx +++ b/sc/source/core/tool/refreshtimer.cxx @@ -89,7 +89,7 @@ void ScRefreshTimer::SetRefreshControl( ScRefreshTimerControl * const * pp ) ppControl = pp; } -void ScRefreshTimer::SetRefreshHandler( const Link<>& rLink ) +void ScRefreshTimer::SetRefreshHandler( const Link<Timer *, void>& rLink ) { SetTimeoutHdl( rLink ); } diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index caf2c4a98373..fdfe240a0044 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -3605,7 +3605,7 @@ void ScInputHandler::ResetDelayTimer() } } -IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer ) +IMPL_LINK_TYPED( ScInputHandler, DelayTimer, Timer*, pTimer, void ) { if ( pTimer == pDelayTimer ) { @@ -3640,7 +3640,6 @@ IMPL_LINK( ScInputHandler, DelayTimer, Timer*, pTimer ) } } } - return 0; } void ScInputHandler::InputSelection( EditView* pView ) diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index a31b5280faa2..4a5cf93dc110 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1871,12 +1871,12 @@ static void lcl_CheckNeedsRepaint( ScDocShell* pDocShell ) } } -IMPL_LINK_NOARG(ScModule, IdleHandler) +IMPL_LINK_NOARG_TYPED(ScModule, IdleHandler, Timer *, void) { if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD ) ) { aIdleTimer.Start(); // Timeout unchanged - return 0; + return; } bool bMore = false; @@ -1940,7 +1940,6 @@ IMPL_LINK_NOARG(ScModule, IdleHandler) aIdleTimer.Start(); - return 0; } IMPL_LINK_NOARG(ScModule, SpellTimerHdl) diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index c0cce308978e..651008c50bb1 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -64,10 +64,9 @@ void ScMenuFloatingWindow::SubMenuItemData::reset() maTimer.Stop(); } -IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) +IMPL_LINK_NOARG_TYPED(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl, Timer *, void) { mpParent->handleMenuTimeout(this); - return 0; } size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999; diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 8ac10bee2fa3..c6f226689276 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -758,7 +758,7 @@ IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl) return 0; } -IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) +IMPL_LINK_TYPED( ScFilterDlg, TimeOutHdl, Timer*, _pTimer, void ) { // Check if RefInputMode is still true every 50ms @@ -767,8 +767,6 @@ IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) if ( pExpander->get_expanded() ) pTimer->Start(); - - return 0; } IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 9e1fe0af342b..b4c33ef08be6 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -482,10 +482,9 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, return bCanDo; } -IMPL_LINK_NOARG(ScAreaLink, RefreshHdl) +IMPL_LINK_NOARG_TYPED(ScAreaLink, RefreshHdl, Timer *, void) { - return long( - Refresh( aFileName, aFilterName, aSourceArea, GetRefreshDelay() )); + Refresh( aFileName, aFilterName, aSourceArea, GetRefreshDelay() ); } IMPL_LINK_NOARG(ScAreaLink, AreaEndEditHdl) diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 4c2ea196b80a..37f139347c41 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -205,14 +205,12 @@ void ScAutoStyleList::StartTimer( sal_uLong nNow ) // Sekunden nTimerStart = nNow; } -IMPL_LINK_NOARG(ScAutoStyleList, TimerHdl) +IMPL_LINK_NOARG_TYPED(ScAutoStyleList, TimerHdl, Timer *, void) { sal_uLong nNow = TimeNow(); AdjustEntries(aTimer.GetTimeout()); // eingestellte Wartezeit ExecuteEntries(); StartTimer(nNow); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 1aaf8e19eddd..e2ab9701b4a3 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -586,12 +586,10 @@ bool DataStream::ImportData() return mbRunning; } -IMPL_LINK_NOARG(DataStream, ImportTimerHdl) +IMPL_LINK_NOARG_TYPED(DataStream, ImportTimerHdl, Timer *, void) { if (ImportData()) maImportTimer.Start(); - - return 0; } } // namespace sc diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index f95815389e66..8ef2a76112f9 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -976,11 +976,10 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec return true; } -IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer ) +IMPL_LINK_TYPED( ScDocShell, RefreshDBDataHdl, Timer*, pRefreshTimer, void ) { ScDBDocFunc aFunc(*this); - bool bContinue = true; ScDBData* pDBData = static_cast<ScDBData*>(pRefreshTimer); ScImportParam aImportParam; pDBData->GetImportParam( aImportParam ); @@ -988,7 +987,7 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer ) { ScRange aRange; pDBData->GetArea( aRange ); - bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, NULL, true, false ); //! Api-Flag as parameter + bool bContinue = aFunc.DoImport( aRange.aStart.Tab(), aImportParam, NULL, true, false ); //! Api-Flag as parameter // internal operations (sort, query, subtotal) only if no error if (bContinue) { @@ -996,8 +995,6 @@ IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer ) RefreshPivotTables(aRange); } } - - return long(bContinue); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 85bcad965b24..5e8c66e8d96e 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -3036,12 +3036,10 @@ void ScExternalRefManager::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -IMPL_LINK(ScExternalRefManager, TimeOutHdl, AutoTimer*, pTimer) +IMPL_LINK_TYPED(ScExternalRefManager, TimeOutHdl, Timer*, pTimer, void) { if (pTimer == &maSrcDocTimer) purgeStaleSrcDocument(SRCDOC_LIFE_SPAN); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 4b7ff828e66d..742b79a24a0c 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -414,9 +414,9 @@ bool ScTableLink::Refresh(const OUString& rNewFile, const OUString& rNewFilter, return true; } -IMPL_LINK_NOARG(ScTableLink, RefreshHdl) +IMPL_LINK_NOARG_TYPED(ScTableLink, RefreshHdl, Timer *, void) { - return long(Refresh( aFileName, aFilterName, NULL, GetRefreshDelay() )); + Refresh( aFileName, aFilterName, NULL, GetRefreshDelay() ); } IMPL_LINK( ScTableLink, TableEndEditHdl, ::sfx2::SvBaseLink*, pLink ) diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index ac4b97811d3e..7f1a01bd40a5 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -126,15 +126,13 @@ void FuPoor::ForceScroll(const Point& aPixPos) |* \************************************************************************/ -IMPL_LINK_NOARG(FuPoor, ScrollHdl) +IMPL_LINK_NOARG_TYPED(FuPoor, ScrollHdl, Timer *, void) { Point aPosPixel = pWindow->GetPointerPosPixel(); // use remembered MouseButton state to create correct // MouseEvents for this artificial MouseMove. MouseMove(MouseEvent(aPosPixel, 1, MouseEventModifiers::NONE, GetMouseButtonCode())); - - return 0; } // moved from inline to *.cxx @@ -201,7 +199,7 @@ sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt) |* Timer-Handler fuer Drag&Drop |* \************************************************************************/ -IMPL_LINK_NOARG(FuPoor, DragTimerHdl) +IMPL_LINK_NOARG_TYPED(FuPoor, DragTimerHdl, Timer *, void) { // ExecuteDrag (und das damit verbundene Reschedule) direkt aus dem Timer // aufzurufen, bringt die VCL-Timer-Verwaltung durcheinander, wenn dabei @@ -211,7 +209,6 @@ IMPL_LINK_NOARG(FuPoor, DragTimerHdl) // Darum Drag&Drop aus eigenem Event: Application::PostUserEvent( LINK( this, FuPoor, DragHdl ) ); - return 0; } IMPL_LINK_NOARG(FuPoor, DragHdl) diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index edfc6468ffb0..b1659f5b4438 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -44,7 +44,7 @@ private: void ExecuteEntries(); void AdjustEntries(sal_uLong nDiff); void StartTimer(sal_uLong nNow); - DECL_LINK( TimerHdl, void* ); + DECL_LINK_TYPED( TimerHdl, Timer*, void ); DECL_LINK( InitHdl, void* ); public: diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 7b09474462c2..27a297c5cf51 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -162,7 +162,7 @@ private: VclPtr<ScMenuFloatingWindow> mpSubMenu; size_t mnMenuPos; - DECL_LINK( TimeoutHdl, void* ); + DECL_LINK_TYPED( TimeoutHdl, Timer*, void ); SubMenuItemData(ScMenuFloatingWindow* pParent); void reset(); diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index 03baa2fad810..bfe172017326 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -100,7 +100,7 @@ private: void Text2Doc(); void Refresh(); - DECL_LINK( ImportTimerHdl, void* ); + DECL_LINK_TYPED( ImportTimerHdl, Timer*, void ); private: ScDocShell* mpDocShell; diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index f103f12c4de0..8eba21ac633f 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -408,7 +408,7 @@ public: static OUString GetDifFilterName(); static bool HasAutomaticTableName( const OUString& rFilter ); - DECL_LINK( RefreshDBDataHdl, ScRefreshTimer* ); + DECL_LINK_TYPED( RefreshDBDataHdl, Timer*, void ); void BeforeXMLLoading(); void AfterXMLLoading(bool bRet); diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 44d48c228524..e7cdc96ee775 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -155,7 +155,7 @@ private: DECL_LINK( MoreExpandedHdl, void* ); // Hack: RefInput control - DECL_LINK( TimeOutHdl, Timer* ); + DECL_LINK_TYPED( TimeOutHdl, Timer*, void ); }; class ScSpecialFilterDlg : public ScAnyRefDlg diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index d6edc1c4c73b..6ea7f7602a4e 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -50,11 +50,11 @@ protected: VclPtr<Dialog> pDialog; Timer aScrollTimer; // for Autoscrolling - DECL_LINK( ScrollHdl, void * ); + DECL_LINK_TYPED( ScrollHdl, Timer *, void ); void ForceScroll(const Point& aPixPos); Timer aDragTimer; // for Drag&Drop - DECL_LINK( DragTimerHdl, void * ); + DECL_LINK_TYPED( DragTimerHdl, Timer *, void ); DECL_LINK( DragHdl, void * ); bool bIsInDragMode; Point aMDPos; // Position of MouseButtonDown diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index e5820b8ed39d..5b0e83728976 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -136,7 +136,7 @@ private: void UpdateFormulaMode(); static void InvalidateAttribs(); void ImplCreateEditEngine(); - DECL_LINK( DelayTimer, Timer* ); + DECL_LINK_TYPED( DelayTimer, Timer*, void ); void GetColData(); void UseColData(); void NextAutoEntry( bool bBack ); diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 64bc24f5bc17..8655f0d74528 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -96,7 +96,7 @@ private: DECL_LINK(SelectHdl_Impl, void *); DECL_LINK(CountHdl_Impl, void *); DECL_LINK(DoEnterHdl, void *); - DECL_LINK(BrowseTimeoutHdl, void *); + DECL_LINK_TYPED(BrowseTimeoutHdl, Timer *, void); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); }; diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index ee8af56338f0..4daa0d387abd 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -49,7 +49,7 @@ private: SdrObject* pObject; bool bVisible; Point aGridOff; - DECL_LINK( TimeHdl, void* ); + DECL_LINK_TYPED( TimeHdl, Timer*, void ); public: ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight, vcl::Window* pBottom, vcl::Window* pDiagonal, diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 7b00360bcfd1..d7e2a2dbf12e 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -177,7 +177,7 @@ private: void DoHSplit(long nSplitPos); void DoVSplit(long nSplitPos); - DECL_LINK( TimerHdl, void* ); + DECL_LINK_TYPED( TimerHdl, Timer*, void ); void UpdateVarZoom(); diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 27825d3198a9..13e3c3b17387 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -317,11 +317,10 @@ IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl) return 0; } -IMPL_LINK_NOARG(ScInsertTableDlg, BrowseTimeoutHdl) +IMPL_LINK_NOARG_TYPED(ScInsertTableDlg, BrowseTimeoutHdl, Timer *, void) { bMustClose = true; BrowseHdl_Impl(m_pBtnBrowse); - return 0; } IMPL_LINK( ScInsertTableDlg, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg ) diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 12ed0678ce46..d04644eb13ac 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -71,7 +71,7 @@ ScNoteMarker::~ScNoteMarker() delete pModel; } -IMPL_LINK_NOARG(ScNoteMarker, TimeHdl) +IMPL_LINK_NOARG_TYPED(ScNoteMarker, TimeHdl, Timer *, void) { if (!bVisible) { @@ -109,7 +109,6 @@ IMPL_LINK_NOARG(ScNoteMarker, TimeHdl) } Draw(); - return 0; } static void lcl_DrawWin( SdrObject* pObject, vcl::Window* pWindow, const MapMode& rMap ) diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 961cf7f6f050..a6c008ebce49 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -269,12 +269,10 @@ void ScTabView::ResetTimer() pTimerWindow = NULL; } -IMPL_LINK_NOARG(ScTabView, TimerHdl) +IMPL_LINK_NOARG_TYPED(ScTabView, TimerHdl, Timer *, void) { if (pTimerWindow) pTimerWindow->MouseMove( aTimerMEvt ); - - return 0; } // --- Resize --------------------------------------------------------------------- diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index e415989c979f..1250238f1999 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -425,7 +425,7 @@ protected: void lockRebuilds(); void unlockRebuilds(); - DECL_LINK(onTimerHdl, void *); + DECL_LINK_TYPED(onTimerHdl, Timer *, void); virtual void implRebuild() SAL_OVERRIDE; diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index c9acf89c889f..21d0bb5414fd 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -190,7 +190,7 @@ private: SAL_DLLPRIVATE void FillOnlineSpellingList(SdPage* pPage); SAL_DLLPRIVATE void SpellObject(SdrTextObj* pObj); - DECL_DLLPRIVATE_LINK(WorkStartupHdl, void *); + DECL_DLLPRIVATE_LINK_TYPED(WorkStartupHdl, Timer *, void); DECL_DLLPRIVATE_LINK(OnlineSpellingHdl, void *); DECL_DLLPRIVATE_LINK(OnlineSpellEventHdl, EditStatus*); diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 8cbbce000650..4cc6db562871 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -3416,7 +3416,7 @@ bool MainSequence::setTrigger( const CustomAnimationEffectPtr& pEffect, const :: } -IMPL_LINK_NOARG(MainSequence, onTimerHdl) +IMPL_LINK_NOARG_TYPED(MainSequence, onTimerHdl, Timer *, void) { if( mbTimerMode ) { @@ -3427,8 +3427,6 @@ IMPL_LINK_NOARG(MainSequence, onTimerHdl) reset(); createMainSequence(); } - - return 0; } /** starts a timer that recreates the internal structure from the API core after 1 second */ diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 149378b2ba7b..eb83adecc860 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -848,7 +848,7 @@ LanguageType SdDrawDocument::GetLanguage( const sal_uInt16 nId ) const } // Initiate WorkStartup -IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl) +IMPL_LINK_NOARG_TYPED(SdDrawDocument, WorkStartupHdl, Timer *, void) { if( mpDocSh ) mpDocSh->SetWaitCursor( true ); @@ -884,7 +884,6 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl) if( mpDocSh ) mpDocSh->SetWaitCursor( false ); - return 0; } // When the WorkStartupTimer has been created (this only happens in diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 43da01c86479..779cf72c7da2 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -2055,7 +2055,7 @@ IMPL_LINK( CustomAnimationPane, implControlHdl, Control*, pControl ) return 0; } -IMPL_LINK_NOARG(CustomAnimationPane, lateInitCallback) +IMPL_LINK_NOARG_TYPED(CustomAnimationPane, lateInitCallback, Timer *, void) { // Call getPresets() to initiate the (expensive) construction of the // presets list. @@ -2063,8 +2063,6 @@ IMPL_LINK_NOARG(CustomAnimationPane, lateInitCallback) // update selection and control states onSelectionChanged(); - - return 0; } void CustomAnimationPane::moveSelection( bool bUp ) diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx index 5073040ed95a..0a1b87b6d5dc 100644 --- a/sd/source/ui/animations/CustomAnimationPane.hxx +++ b/sd/source/ui/animations/CustomAnimationPane.hxx @@ -119,7 +119,7 @@ private: DECL_LINK( implControlHdl, Control* ); DECL_LINK(implPropertyHdl, void *); DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); - DECL_LINK(lateInitCallback, void *); + DECL_LINK_TYPED(lateInitCallback, Timer *, void); private: ViewShellBase& mrBase; diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 4a0419b08b73..0c41e0905296 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -1067,7 +1067,7 @@ IMPL_LINK_NOARG(SlideTransitionPane, AutoPreviewClicked) return 0; } -IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback) +IMPL_LINK_NOARG_TYPED(SlideTransitionPane, LateInitCallback, Timer *, void) { const TransitionPresetList& rPresetList = TransitionPreset::getTransitionPresetList(); TransitionPresetList::const_iterator aIter( rPresetList.begin() ); @@ -1089,8 +1089,6 @@ IMPL_LINK_NOARG(SlideTransitionPane, LateInitCallback) updateSoundList(); updateControls(); - - return 0; } vcl::Window * createSlideTransitionPanel( vcl::Window* pParent, ViewShellBase& rBase, const css::uno::Reference<css::frame::XFrame>& rxFrame ) diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx index 63e76e3d1242..654ce2e8642e 100644 --- a/sd/source/ui/animations/SlideTransitionPane.hxx +++ b/sd/source/ui/animations/SlideTransitionPane.hxx @@ -99,7 +99,7 @@ private: DECL_LINK( SoundListBoxSelected, void * ); DECL_LINK( LoopSoundBoxChecked, void * ); DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent*); - DECL_LINK(LateInitCallback, void *); + DECL_LINK_TYPED(LateInitCallback, Timer *, void); ViewShellBase & mrBase; SdDrawDocument * mpDrawDoc; diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx index 5cc3a3a2fad8..298924f98a86 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.cxx @@ -365,7 +365,7 @@ void ConfigurationUpdater::SetUpdateBeingProcessed (bool bValue) mbUpdateBeingProcessed = bValue; } -IMPL_LINK_NOARG(ConfigurationUpdater, TimeoutHandler) +IMPL_LINK_NOARG_TYPED(ConfigurationUpdater, TimeoutHandler, Timer *, void) { OSL_TRACE("configuration update timer"); if ( ! mbUpdateBeingProcessed @@ -378,7 +378,6 @@ IMPL_LINK_NOARG(ConfigurationUpdater, TimeoutHandler) RequestUpdate(mxRequestedConfiguration); } } - return 0; } } } // end of namespace sd::framework diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx index 8c25b7575387..07f34c4b75c7 100644 --- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx +++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx @@ -197,7 +197,7 @@ private: */ void UnlockUpdates(); - DECL_LINK(TimeoutHandler, void *); + DECL_LINK_TYPED(TimeoutHandler, Timer *, void); }; } } // end of namespace sd::framework diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index d8da1447212b..e0ced626668a 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -177,15 +177,13 @@ void FuPoor::ForceScroll(const Point& aPixPos) /** * timer handler for window scrolling */ -IMPL_LINK_NOARG(FuPoor, ScrollHdl) +IMPL_LINK_NOARG_TYPED(FuPoor, ScrollHdl, Timer *, void) { Point aPnt(mpWindow->GetPointerPosPixel()); // use remembered MouseButton state to create correct // MouseEvents for this artificial MouseMove. MouseMove(MouseEvent(aPnt, 1, MouseEventModifiers::NONE, GetMouseButtonCode())); - - return 0; } /** @@ -956,7 +954,7 @@ void FuPoor::DoPasteUnformatted() /** * Timer handler for Drag&Drop */ -IMPL_LINK_NOARG(FuPoor, DragHdl) +IMPL_LINK_NOARG_TYPED(FuPoor, DragHdl, Timer *, void) { if( mpView ) { @@ -971,7 +969,6 @@ IMPL_LINK_NOARG(FuPoor, DragHdl) mpView->StartDrag( aMDPos, mpWindow ); } } - return 0; } bool FuPoor::Command(const CommandEvent& rCEvt) @@ -982,7 +979,7 @@ bool FuPoor::Command(const CommandEvent& rCEvt) /** * Timer handler for window scrolling */ -IMPL_LINK_NOARG(FuPoor, DelayHdl) +IMPL_LINK_NOARG_TYPED(FuPoor, DelayHdl, Timer *, void) { aDelayToScrollTimer.Stop (); bScrollable = true; @@ -992,8 +989,6 @@ IMPL_LINK_NOARG(FuPoor, DelayHdl) // use remembered MouseButton state to create correct // MouseEvents for this artificial MouseMove. MouseMove(MouseEvent(aPnt, 1, MouseEventModifiers::NONE, GetMouseButtonCode())); - - return 0; } bool FuPoor::MouseButtonUp (const MouseEvent& rMEvt) diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index ad604e01bf88..e4a7d26a64b4 100644 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -74,7 +74,7 @@ public: when IsUICaptured() returns <TRUE/>. */ void Release (bool bForce = false); - DECL_LINK(TimeoutCallback, void *); + DECL_LINK_TYPED(TimeoutCallback, Timer *, void); private: ::std::unique_ptr<ToolBarManager::UpdateLock> mpLock; /** The timer is used both as a safe guard to unlock the update lock diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index e40c36cbd587..72e88fd19b93 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -126,7 +126,7 @@ protected: SfxRequest& rReq); virtual ~FuPoor(); - DECL_LINK( DelayHdl, void * ); + DECL_LINK_TYPED( DelayHdl, Timer *, void ); static void ImpForceQuadratic(Rectangle& rRect); @@ -160,11 +160,11 @@ protected: VclPtr<Dialog> pDialog; Timer aScrollTimer; ///< for auto-scrolling - DECL_LINK( ScrollHdl, void * ); + DECL_LINK_TYPED( ScrollHdl, Timer *, void ); void ForceScroll(const Point& aPixPos); Timer aDragTimer; ///< for Drag&Drop - DECL_LINK(DragHdl, void *); + DECL_LINK_TYPED(DragHdl, Timer *, void); bool bIsInDragMode; Point aMDPos; ///< position of MouseButtonDown diff --git a/sd/source/ui/inc/tools/AsynchronousCall.hxx b/sd/source/ui/inc/tools/AsynchronousCall.hxx index 52bbb3ad8093..a95ad7f58ffd 100644 --- a/sd/source/ui/inc/tools/AsynchronousCall.hxx +++ b/sd/source/ui/inc/tools/AsynchronousCall.hxx @@ -74,7 +74,7 @@ private: function is called the next time. This pointer may be NULL. */ ::std::unique_ptr<AsynchronousFunction> mpFunction; - DECL_LINK(TimerCallback,Timer*); + DECL_LINK_TYPED(TimerCallback,Timer*,void); }; } } // end of namespace ::sd::tools diff --git a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx index 1bf5ec72cf14..7880bd7ecde1 100644 --- a/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx +++ b/sd/source/ui/inc/tools/TimerBasedTaskExecution.hxx @@ -83,7 +83,7 @@ private: class Deleter; friend class Deleter; - DECL_LINK(TimerCallback, void *); + DECL_LINK_TYPED(TimerCallback, Timer *, void); }; } } // end of namespace ::sd::tools diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx index 4d6b78204928..d23c9f21246a 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx @@ -109,7 +109,7 @@ void MasterPageContainerQueue::LateInit() { // Set up the timer for the delayed creation of preview bitmaps. maDelayedPreviewCreationTimer.SetTimeout (snDelayedCreationTimeout); - Link<> aLink (LINK(this,MasterPageContainerQueue,DelayedPreviewCreation)); + Link<Timer *, void> aLink (LINK(this,MasterPageContainerQueue,DelayedPreviewCreation)); maDelayedPreviewCreationTimer.SetTimeoutHdl(aLink); } @@ -176,7 +176,7 @@ sal_Int32 MasterPageContainerQueue::CalculatePriority ( return nPriority; } -IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer) +IMPL_LINK_TYPED(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer, void) { bool bIsShowingFullScreenShow (false); bool bWaitForMoreRequests (false); @@ -235,8 +235,6 @@ IMPL_LINK(MasterPageContainerQueue, DelayedPreviewCreation, Timer*, pTimer) maDelayedPreviewCreationTimer.SetTimeout(nTimeout); pTimer->Start(); } - - return 0; } bool MasterPageContainerQueue::HasRequest (MasterPageContainer::Token aToken) const diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx index 150115b141bf..b60d2c03147c 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx @@ -123,7 +123,7 @@ private: */ static sal_Int32 CalculatePriority (const SharedMasterPageDescriptor& rDescriptor); - DECL_LINK(DelayedPreviewCreation, Timer *); + DECL_LINK_TYPED(DelayedPreviewCreation, Timer *, void); }; } } // end of namespace sd::sidebar diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 601009602e85..fbf685fbfda2 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -556,7 +556,7 @@ void ShowWindow::DrawEndScene() SetFont( aOldFont ); } -IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer ) +IMPL_LINK_TYPED( ShowWindow, PauseTimeoutHdl, Timer*, pTimer, void ) { if( !( --mnPauseTimeout ) ) RestartShow(); @@ -565,11 +565,9 @@ IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer ) DrawPauseScene( true ); pTimer->Start(); } - - return 0L; } -IMPL_LINK_NOARG(ShowWindow, MouseTimeoutHdl) +IMPL_LINK_NOARG_TYPED(ShowWindow, MouseTimeoutHdl, Timer *, void) { if( mbMouseCursorHidden ) { @@ -583,7 +581,6 @@ IMPL_LINK_NOARG(ShowWindow, MouseTimeoutHdl) ShowPointer( false ); mbMouseCursorHidden = true; } - return 0L; } IMPL_LINK( ShowWindow, EventHdl, VclWindowEvent*, pEvent ) diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index ce524c867e3b..a9a5eabae831 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -107,8 +107,8 @@ private: bool mbMouseCursorHidden; sal_uInt64 mnFirstMouseMove; - DECL_LINK( PauseTimeoutHdl, Timer* pTimer ); - DECL_LINK(MouseTimeoutHdl, void *); + DECL_LINK_TYPED( PauseTimeoutHdl, Timer*, void ); + DECL_LINK_TYPED(MouseTimeoutHdl, Timer *, void); DECL_LINK( EventHdl, VclWindowEvent* pEvent ); ::rtl::Reference< SlideshowImpl > mxController; diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 075d16e2db1a..f03a0e34fe32 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1775,19 +1775,18 @@ void SlideshowImpl::startUpdateTimer() This is used to unfreeze user input that was disabled after slide change to skip input that was buffered during slide transition preparation */ -IMPL_LINK_NOARG(SlideshowImpl, ReadyForNextInputHdl) +IMPL_LINK_NOARG_TYPED(SlideshowImpl, ReadyForNextInputHdl, Timer *, void) { mbInputFreeze = false; - return 0; } /** if I catch someone someday who calls this method by hand and not by using the timer, I will personaly punish this person seriously, even if this person is me. */ -IMPL_LINK_NOARG(SlideshowImpl, updateHdl) +IMPL_LINK_NOARG_TYPED(SlideshowImpl, updateHdl, Timer *, void) { - return updateSlideShow(); + updateSlideShow(); } IMPL_LINK_NOARG(SlideshowImpl, PostYieldListener) @@ -2676,7 +2675,7 @@ void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException, std::exceptio } } -IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) +IMPL_LINK_NOARG_TYPED(SlideshowImpl, deactivateHdl, Timer *, void) { if( mbActive && mxShow.is() ) { @@ -2695,7 +2694,6 @@ IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl) } } } - return 0; } sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException, std::exception) diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 2840465d6ae1..41270adc8028 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -274,13 +274,13 @@ private: void setActiveXToolbarsVisible( bool bVisible ); - DECL_LINK(updateHdl, void *); + DECL_LINK_TYPED(updateHdl, Timer *, void); DECL_LINK( PostYieldListener, void* ); - DECL_LINK(ReadyForNextInputHdl, void *); + DECL_LINK_TYPED(ReadyForNextInputHdl, Timer *, void); DECL_LINK( endPresentationHdl, void* ); DECL_LINK( ContextMenuSelectHdl, Menu * ); DECL_LINK( ContextMenuHdl, void* ); - DECL_LINK(deactivateHdl, void *); + DECL_LINK_TYPED(deactivateHdl, Timer *, void); DECL_LINK( EventListenerHdl, VclSimpleEvent* ); // helper diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 55595e165bbd..ea0dc48d9264 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -132,7 +132,7 @@ CacheCompactor::CacheCompactor( } -IMPL_LINK_NOARG(CacheCompactor, CompactionCallback) +IMPL_LINK_NOARG_TYPED(CacheCompactor, CompactionCallback, Timer *, void) { mbIsCompactionRunning = true; @@ -148,7 +148,6 @@ IMPL_LINK_NOARG(CacheCompactor, CompactionCallback) } mbIsCompactionRunning = false; - return 1; } } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx index 481a92165cf2..783afecba1a0 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.hxx @@ -80,7 +80,7 @@ private: */ Timer maCompactionTimer; bool mbIsCompactionRunning; - DECL_LINK(CompactionCallback, void *); + DECL_LINK_TYPED(CompactionCallback, Timer *, void); }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 6baa2ef9b122..876dfcf738f9 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -137,12 +137,11 @@ Any CacheConfiguration::GetValue (const OUString& rName) return aResult; } -IMPL_LINK_NOARG(CacheConfiguration, TimerCallback) +IMPL_LINK_NOARG_TYPED(CacheConfiguration, TimerCallback, Timer *, void) { CacheConfigSharedPtr &rInstancePtr = theInstance::get(); // Release out reference to the instance. rInstancePtr.reset(); - return 0; } } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx index ff6cc9d2ee32..2ae271145510 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.hxx @@ -57,7 +57,7 @@ private: CacheConfiguration(); - DECL_LINK(TimerCallback, void *); + DECL_LINK_TYPED(TimerCallback, Timer *, void); }; } } } // end of namespace ::sd::slidesorter::cache diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index 61a662f92982..212734e3df0b 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -106,10 +106,9 @@ void QueueProcessor::SetPreviewSize ( mbDoSuperSampling = bDoSuperSampling; } -IMPL_LINK_NOARG(QueueProcessor, ProcessRequestHdl) +IMPL_LINK_NOARG_TYPED(QueueProcessor, ProcessRequestHdl, Timer *, void) { ProcessRequests(); - return 1; } void QueueProcessor::ProcessRequests() diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx index c472383def83..253bc11b2005 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx @@ -91,7 +91,7 @@ private: ::osl::Mutex maMutex; Timer maTimer; - DECL_LINK(ProcessRequestHdl, void *); + DECL_LINK_TYPED(ProcessRequestHdl, Timer *, void); sal_uInt32 mnTimeBetweenHighPriorityRequests; sal_uInt32 mnTimeBetweenLowPriorityRequests; sal_uInt32 mnTimeBetweenRequestsWhenNotIdle; diff --git a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx index 61973a7e3d71..b14c36caff4b 100644 --- a/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsCurrentSlideManager.cxx @@ -239,7 +239,7 @@ void CurrentSlideManager::HandleModelChange() } } -IMPL_LINK_NOARG(CurrentSlideManager, SwitchPageCallback) +IMPL_LINK_NOARG_TYPED(CurrentSlideManager, SwitchPageCallback, Timer *, void) { if (mpCurrentSlide) { @@ -253,8 +253,6 @@ IMPL_LINK_NOARG(CurrentSlideManager, SwitchPageCallback) SetCurrentSlideAtViewShellBase(mpCurrentSlide); SetCurrentSlideAtXController(mpCurrentSlide); } - - return 1; } } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index eaa64571cf63..8c85255985b8 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -549,11 +549,9 @@ void ScrollBarManager::clearAutoScrollFunctor() maAutoScrollFunctor = ::boost::function<void()>(); } -IMPL_LINK_NOARG(ScrollBarManager, AutoScrollTimeoutHandler) +IMPL_LINK_NOARG_TYPED(ScrollBarManager, AutoScrollTimeoutHandler, Timer *, void) { RepeatAutoScroll(); - - return 0; } void ScrollBarManager::Scroll( diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx index 87651fcf3f8a..cb3f2b42771a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx @@ -110,7 +110,7 @@ private: */ void AcquireCurrentSlide (const sal_Int32 nSlideIndex); - DECL_LINK(SwitchPageCallback,void*); + DECL_LINK_TYPED(SwitchPageCallback, Timer*, void); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 58899c8627d5..3c0761d33f96 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -246,7 +246,7 @@ private: DECL_LINK(HorizontalScrollBarHandler, ScrollBar*); DECL_LINK(VerticalScrollBarHandler, ScrollBar*); - DECL_LINK(AutoScrollTimeoutHandler, void *); + DECL_LINK_TYPED(AutoScrollTimeoutHandler, Timer *, void); void PlaceHorizontalScrollBar (const Rectangle& aArea); void PlaceVerticalScrollBar (const Rectangle& aArea); diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx index c24484b0c3cd..de1086c2755b 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx @@ -68,7 +68,7 @@ private: void Show (const bool bForce); void DoShow(); - DECL_LINK(DelayTrigger, void*); + DECL_LINK_TYPED(DelayTrigger, Timer*, void); }; } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 97fa698bb7f7..d5c00c8b8177 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -154,11 +154,9 @@ bool ToolTip::Hide() return false; } -IMPL_LINK_NOARG(ToolTip, DelayTrigger) +IMPL_LINK_NOARG_TYPED(ToolTip, DelayTrigger, Timer *, void) { DoShow(); - - return 0; } } } } // end of namespace ::sd::slidesorter::view diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx index f5bd0a1128e9..e3d6b0630156 100644 --- a/sd/source/ui/tools/AsynchronousCall.cxx +++ b/sd/source/ui/tools/AsynchronousCall.cxx @@ -27,7 +27,7 @@ AsynchronousCall::AsynchronousCall() : maTimer(), mpFunction() { - Link<> aCallback (LINK(this,AsynchronousCall,TimerCallback)); + Link<Timer *, void> aCallback (LINK(this,AsynchronousCall,TimerCallback)); maTimer.SetTimeoutHdl(aCallback); } @@ -46,7 +46,7 @@ void AsynchronousCall::Post ( maTimer.Start(); } -IMPL_LINK(AsynchronousCall,TimerCallback,Timer*,pTimer) +IMPL_LINK_TYPED(AsynchronousCall,TimerCallback,Timer*,pTimer,void) { if (pTimer == &maTimer) { @@ -54,7 +54,6 @@ IMPL_LINK(AsynchronousCall,TimerCallback,Timer*,pTimer) pFunction.swap(mpFunction); (*pFunction)(); } - return 0; } } } // end of namespace ::sd::tools diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx index 10f46a019fa6..a6b1299834ce 100644 --- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx +++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx @@ -88,7 +88,7 @@ TimerBasedTaskExecution::TimerBasedTaskExecution ( mpSelf(), mnMaxTimePerStep(nMaxTimePerStep) { - Link<> aLink(LINK(this,TimerBasedTaskExecution,TimerCallback)); + Link<Timer *, void> aLink(LINK(this,TimerBasedTaskExecution,TimerCallback)); maTimer.SetTimeoutHdl(aLink); maTimer.SetTimeout(nMillisecondsBetweenSteps); maTimer.Start(); @@ -106,7 +106,7 @@ void TimerBasedTaskExecution::SetSelf ( mpSelf = rpSelf; } -IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback) +IMPL_LINK_NOARG_TYPED(TimerBasedTaskExecution, TimerCallback, Timer *, void) { if (mpTask.get() != NULL) { @@ -132,8 +132,6 @@ IMPL_LINK_NOARG(TimerBasedTaskExecution, TimerCallback) else mpSelf.reset(); } - - return 0; } } } // end of namespace ::sd::tools diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 727b7c7b801b..73ea44f8e388 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -351,7 +351,7 @@ ViewShell::Implementation::ToolBarManagerLock::ToolBarManagerLock ( maTimer.Start(); } -IMPL_LINK_NOARG(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback) +IMPL_LINK_NOARG_TYPED(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback, Timer *, void) { // If possible then release the lock now. Otherwise start the timer // and try again later. @@ -363,7 +363,6 @@ IMPL_LINK_NOARG(ViewShell::Implementation::ToolBarManagerLock, TimeoutCallback) { mpSelf.reset(); } - return 0; } void ViewShell::Implementation::ToolBarManagerLock::Release (bool bForce) diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index a1e8f4ccdb1e..488d0cc26e44 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -565,7 +565,7 @@ IndexTabPage_Impl::IndexTabPage_Impl(vcl::Window* pParent, SfxHelpIndexWindow_Im get(m_pOpenBtn, "display"); m_pOpenBtn->SetClickHdl( LINK( this, IndexTabPage_Impl, OpenHdl ) ); - Link<> aTimeoutLink = LINK( this, IndexTabPage_Impl, TimeoutHdl ); + Link<Timer *, void> aTimeoutLink = LINK( this, IndexTabPage_Impl, TimeoutHdl ); aFactoryIdle.SetIdleHdl( LINK(this, IndexTabPage_Impl, IdleHdl )); aFactoryIdle.SetPriority(SchedulerPriority::LOWER); aKeywordTimer.SetTimeoutHdl( aTimeoutLink ); @@ -750,11 +750,10 @@ IMPL_LINK( IndexTabPage_Impl, IdleHdl, Idle*, pIdle ) return 0; } -IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer) +IMPL_LINK_TYPED( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer, void) { if(&aKeywordTimer == pTimer && !sKeyword.isEmpty()) aKeywordLink.Call(this); - return 0; } void IndexTabPage_Impl::ActivatePage() diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index bf87d9226c96..f72cdd1048a6 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -140,7 +140,7 @@ private: DECL_LINK(OpenHdl, void *); DECL_LINK(IdleHdl, Idle* ); - DECL_LINK(TimeoutHdl, Timer*); + DECL_LINK_TYPED(TimeoutHdl, Timer*, void); public: IndexTabPage_Impl( vcl::Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 3e72e8d6178b..3d696cb23cdd 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -179,10 +179,10 @@ public: aTimer.Start(); } - DECL_LINK( TimerHdl, Timer*); + DECL_LINK_TYPED( TimerHdl, Timer*, void); }; -IMPL_LINK(SfxAsyncExec_Impl, TimerHdl, Timer*, pTimer) +IMPL_LINK_TYPED(SfxAsyncExec_Impl, TimerHdl, Timer*, pTimer, void) { (void)pTimer; // unused aTimer.Stop(); @@ -191,7 +191,6 @@ IMPL_LINK(SfxAsyncExec_Impl, TimerHdl, Timer*, pTimer) xDisp->dispatch( aCommand, aSeq ); delete this; - return 0L; } enum class SfxPopupAction @@ -257,7 +256,7 @@ SfxBindings::SfxBindings() // all caches are valid (no pending invalidate-job) // create the list of caches pImp->pCaches = new SfxStateCacheArr_Impl; - pImp->aTimer.SetTimeoutHdl( LINK(this, SfxBindings, NextJob_Impl) ); + pImp->aTimer.SetTimeoutHdl( LINK(this, SfxBindings, NextJob) ); } @@ -1554,10 +1553,12 @@ void SfxBindings::UpdateControllers_Impl } } +IMPL_LINK_TYPED( SfxBindings, NextJob, Timer *, pTimer, void ) +{ + NextJob_Impl(pTimer); +} - - -IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) +bool SfxBindings::NextJob_Impl(Timer * pTimer) { #ifdef DBG_UTIL // on Windows very often C++ Exceptions (GPF etc.) are caught by MSVCRT @@ -1572,7 +1573,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) if ( Application::GetLastInputInterval() < MAX_INPUT_DELAY && pTimer ) { pImp->aTimer.SetTimeout(TIMEOUT_UPDATING); - return sal_True; + return true; } SfxApplication *pSfxApp = SfxGetpApp(); @@ -1584,18 +1585,18 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) SfxViewFrame* pFrame = pDispatcher ? pDispatcher->GetFrame() : NULL; if ( (pFrame && !pFrame->GetObjectShell()->AcceptStateUpdate()) || pSfxApp->IsDowning() || pImp->pCaches->empty() ) { - return sal_True; + return true; } if ( !pDispatcher || !pDispatcher->IsFlushed() ) { - return sal_True; + return true; } // if possible Update all server / happens in its own time slice if ( pImp->bMsgDirty ) { UpdateSlotServer_Impl(); - return sal_False; + return false; } pImp->bAllDirty = false; @@ -1640,7 +1641,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) if ( bWasDirty && !bJobDone && bPreEmptive && (--nLoops == 0) ) { pImp->bInNextJob = false; - return sal_False; + return false; } } } @@ -1668,7 +1669,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) // Update round is finished pImp->bInNextJob = false; Broadcast(SfxSimpleHint(SFX_HINT_UPDATEDONE)); - return sal_True; + return true; #ifdef DBG_UTIL } catch (...) @@ -1677,7 +1678,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) pImp->bInNextJob = false; } - return sal_False; + return false; #endif } diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index a3bcb853134c..fb56c2891897 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -962,7 +962,7 @@ void SfxSplitWindow::Command( const CommandEvent& rCEvt ) -IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer) +IMPL_LINK_TYPED( SfxSplitWindow, TimerHdl, Timer*, pTimer, void) { if ( pTimer ) pTimer->Stop(); @@ -986,7 +986,7 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer) // do nothing pEmptyWin->aLastPos = GetPointerPosPixel(); pEmptyWin->aTimer.Start(); - return 0L; + return; } // Especially for TF_AUTOSHOW_ON_MOUSEMOVE : @@ -1029,8 +1029,6 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer) } } } - - return 0L; } diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index 177bd769c70c..bc21c05853a9 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -58,7 +58,7 @@ private: sal_uInt16 nPos, bool bNewLine=false ); - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK_TYPED( TimerHdl, Timer*, void ); bool CursorIsOverRect( bool bForceAdding = false ) const; void SetPinned_Impl( bool ); void SetFadeIn_Impl( bool ); diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 05cce6e5c097..5a30bbab54c2 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -123,7 +123,7 @@ public: virtual ~SfxInPlaceClient_Impl(); void SizeHasChanged(); - DECL_LINK(TimerHdl, void *); + DECL_LINK_TYPED(TimerHdl, Timer *, void); uno::Reference < frame::XFrame > GetFrame() const; // XEmbeddedClient @@ -591,11 +591,10 @@ void SfxInPlaceClient_Impl::SizeHasChanged() } -IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl) +IMPL_LINK_NOARG_TYPED(SfxInPlaceClient_Impl, TimerHdl, Timer *, void) { if ( m_pClient && m_xObject.is() ) m_pClient->GetViewShell()->CheckIPClient_Impl( m_pClient, m_pClient->GetViewShell()->GetObjectShell()->GetVisArea() ); - return 0; } diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 29d093721d4e..ddb59154f51d 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -88,7 +88,7 @@ protected: private: void RepaintViewShellDoc(); - DECL_LINK(CaretBlinkTimerHdl, void *); + DECL_LINK_TYPED(CaretBlinkTimerHdl, Timer *, void); void CaretBlinkInit(); void CaretBlinkStart(); void CaretBlinkStop(); @@ -166,7 +166,7 @@ class SmCmdBoxWindow : public SfxDockingWindow Timer aInitialFocusTimer; - DECL_LINK(InitialFocusTimerHdl, Timer *); + DECL_LINK_TYPED(InitialFocusTimerHdl, Timer *, void); protected : diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 304327be8f3b..a9ae7e1fa116 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -273,7 +273,7 @@ void SmGraphicWindow::RepaintViewShellDoc() pDoc->Repaint(); } -IMPL_LINK_NOARG(SmGraphicWindow, CaretBlinkTimerHdl) +IMPL_LINK_NOARG_TYPED(SmGraphicWindow, CaretBlinkTimerHdl, Timer *, void) { if (IsCursorVisible()) SetIsCursorVisible(false); @@ -281,8 +281,6 @@ IMPL_LINK_NOARG(SmGraphicWindow, CaretBlinkTimerHdl) SetIsCursorVisible(true); RepaintViewShellDoc(); - - return 0; } void SmGraphicWindow::CaretBlinkInit() @@ -820,7 +818,7 @@ void SmCmdBoxWindow::StateChanged( StateChangedType nStateChange ) } -IMPL_LINK( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, EMPTYARG /*pTimer*/ ) +IMPL_LINK_NOARG_TYPED( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, void ) { // We want to have the focus in the edit window once Math has been opened // to allow for immediate typing. @@ -857,7 +855,6 @@ IMPL_LINK( SmCmdBoxWindow, InitialFocusTimerHdl, Timer *, EMPTYARG /*pTimer*/ ) { SAL_WARN( "starmath", "failed to properly set initial focus to edit window" ); } - return 0; } diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index be2222c2ef3a..0fa73d6f184f 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -520,10 +520,9 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt ) -IMPL_LINK_NOARG(BrowserDataWin, RepeatedMouseMove) +IMPL_LINK_NOARG_TYPED(BrowserDataWin, RepeatedMouseMove, Timer *, void) { GetParent()->MouseMove( BrowserMouseEvent( this, aRepeatEvt ) ); - return 0; } void BrowserDataWin::MouseButtonUp( const MouseEvent& rEvt ) diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 27b1eb10a218..8374e5e50b53 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -146,7 +146,7 @@ public: virtual void Command( const CommandEvent& rEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rEvt ) SAL_OVERRIDE; - DECL_LINK( RepeatedMouseMove, void * ); + DECL_LINK_TYPED( RepeatedMouseMove, Timer *, void ); virtual void MouseButtonUp( const MouseEvent& rEvt ) SAL_OVERRIDE; virtual void KeyInput( const KeyEvent& rEvt ) SAL_OVERRIDE; diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 9a3b13b239ae..4d1ba9f0ad05 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -221,7 +221,7 @@ public: Reference< XCommandEnvironment > GetCommandEnvironment() const { return mxCmdEnv; } - DECL_LINK(ResetQuickSearch_Impl, void *); + DECL_LINK_TYPED(ResetQuickSearch_Impl, Timer *, void); virtual PopupMenu* CreateContextMenu() SAL_OVERRIDE; virtual void ExcecuteContextMenuAction( sal_uInt16 nSelectedPopentry ) SAL_OVERRIDE; @@ -662,14 +662,12 @@ void ViewTabListBox_Impl::dispose() -IMPL_LINK_NOARG(ViewTabListBox_Impl, ResetQuickSearch_Impl) +IMPL_LINK_NOARG_TYPED(ViewTabListBox_Impl, ResetQuickSearch_Impl, Timer *, void) { ::osl::MutexGuard aGuard( maMutex ); maQuickSearchText.clear(); mnSearchIndex = 0; - - return 0; } diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index ba2eac4b0959..051c71db7320 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -1404,7 +1404,7 @@ void Calendar::ImplEndTracking( bool bCancel ) -IMPL_STATIC_LINK( Calendar, ScrollHdl, Timer*, EMPTYARG ) +IMPL_STATIC_LINK_TYPED( Calendar, ScrollHdl, Timer*, EMPTYARG, void ) { bool bPrevIn = (pThis->mnDragScrollHitTest & CALENDAR_HITTEST_PREV) != 0; bool bNextIn = (pThis->mnDragScrollHitTest & CALENDAR_HITTEST_NEXT) != 0; @@ -1414,7 +1414,6 @@ IMPL_STATIC_LINK( Calendar, ScrollHdl, Timer*, EMPTYARG ) pThis->ImplScroll( bPrevIn ); pThis->mbScrollDateRange = false; } - return 0; } diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 26021bb2760a..bf0b654639df 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1114,10 +1114,9 @@ IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar ) return 0; } -IMPL_LINK_NOARG(ValueSet, ImplTimerHdl) +IMPL_LINK_NOARG_TYPED(ValueSet, ImplTimerHdl, Timer *, void) { ImplTracking( GetPointerPosPixel(), true ); - return 0; } void ValueSet::ImplTracking( const Point& rPos, bool bRepeat ) diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index b83adb372489..957c64e39d9a 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -292,13 +292,11 @@ void PrinterSetupDialog::ImplSetInfo() -IMPL_LINK_NOARG(PrinterSetupDialog, ImplStatusHdl) +IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplStatusHdl, Timer *, void) { QueueInfo aInfo; ImplPrnDlgUpdateQueueInfo(m_pLbName, aInfo); m_pFiStatus->SetText( ImplPrnDlgGetStatusText( aInfo ) ); - - return 0; } diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 2faf23e4f401..80a39809f039 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -1236,7 +1236,7 @@ GraphicCacheEntry* GraphicCache::ImplGetCacheEntry( const GraphicObject& rObj ) return pRet; } -IMPL_LINK( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer ) +IMPL_LINK_TYPED( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer, void ) { pTimer->Stop(); @@ -1261,8 +1261,6 @@ IMPL_LINK( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer ) } pTimer->Start(); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx index a1c990c08ea7..6164cb2b0085 100644 --- a/svtools/source/graphic/grfcache.hxx +++ b/svtools/source/graphic/grfcache.hxx @@ -51,7 +51,7 @@ private: GraphicCacheEntry* ImplGetCacheEntry( const GraphicObject& rObj ); - DECL_LINK( ReleaseTimeoutHdl, Timer* pTimer ); + DECL_LINK_TYPED( ReleaseTimeoutHdl, Timer* pTimer, void ); public: diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 29fe3424b7ab..4d60d73ddcaf 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1055,7 +1055,7 @@ void GraphicObject::SetSwapState() } } -IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl) +IMPL_LINK_NOARG_TYPED(GraphicObject, ImplAutoSwapOutHdl, Timer *, void) { if( !IsSwappedOut() ) { @@ -1084,8 +1084,6 @@ IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl) if( mpSwapOutTimer ) mpSwapOutTimer->Start(); - - return 0L; } SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj ) diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 6b66941b9219..415c14020e1a 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2035,7 +2035,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl) -IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer ) +IMPL_LINK_TYPED( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer, void ) { SfxViewShell* pViewShell = SfxViewShell::Current(); @@ -2051,7 +2051,6 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer ) } pTimer->Start(); - return 0; } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 9799222dc063..3a95687d1563 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1816,10 +1816,9 @@ namespace svxform return 0; } - IMPL_LINK_NOARG(DataNavigatorWindow, UpdateHdl) + IMPL_LINK_NOARG_TYPED(DataNavigatorWindow, UpdateHdl, Timer *, void) { ModelSelectHdl( NULL ); - return 0; } XFormsPage* DataNavigatorWindow::GetCurrentPage( sal_uInt16& rCurId ) diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 7378a231f0c4..b255e72a84d9 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1251,10 +1251,10 @@ IMPL_LINK( FmFilterNavigator, OnRemove, SvTreeListEntry*, pEntry ) } -IMPL_LINK_NOARG(FmFilterNavigator, OnDropActionTimer) +IMPL_LINK_NOARG_TYPED(FmFilterNavigator, OnDropActionTimer, Timer *, void) { if (--m_aTimerCounter > 0) - return 0L; + return; switch (m_aDropActionType) { @@ -1275,7 +1275,6 @@ IMPL_LINK_NOARG(FmFilterNavigator, OnDropActionTimer) } break; } - return 0L; } diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index f8e818239a13..638f141cb468 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -2689,15 +2689,13 @@ void FmXFormShell::selectionChanged(const lang::EventObject& rEvent) throw(::com } -IMPL_LINK(FmXFormShell, OnTimeOut, void*, /*EMPTYTAG*/) +IMPL_LINK_NOARG_TYPED(FmXFormShell, OnTimeOut, Timer*, void) { if ( impl_checkDisposed() ) - return 0; + return; if (m_pShell->IsDesignMode() && m_pShell->GetFormView()) SetSelection(m_pShell->GetFormView()->GetMarkedObjectList()); - - return 0; } diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 44493395bb0f..917ce8589cb8 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -548,7 +548,7 @@ namespace svx } - IMPL_LINK( FmTextControlShell, OnInvalidateClipboard, void*, /*_pNotInterestedIn*/ ) + IMPL_LINK_NOARG_TYPED( FmTextControlShell, OnInvalidateClipboard, Timer*, void ) { if ( m_bNeedClipboardInvalidation ) { @@ -558,7 +558,6 @@ namespace svx m_rBindings.Invalidate( SID_PASTE ); m_bNeedClipboardInvalidation = false; } - return 0L; } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 30f3278ca726..aadfc17d10e6 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -513,7 +513,7 @@ struct UpdateAllListeners : public ::std::unary_function< Reference< XDispatch > } }; -IMPL_LINK( FormController, OnInvalidateFeatures, void*, /*_pNotInterestedInThisParam*/ ) +IMPL_LINK_NOARG_TYPED( FormController, OnInvalidateFeatures, Timer*, void ) { ::osl::MutexGuard aGuard( m_aMutex ); for ( ::std::set< sal_Int16 >::const_iterator aLoop = m_aInvalidFeatures.begin(); @@ -529,7 +529,6 @@ IMPL_LINK( FormController, OnInvalidateFeatures, void*, /*_pNotInterestedInThisP UpdateAllListeners( )( aDispatcherPos->second ); } } - return 1; } FormController::FormController(const Reference< css::uno::XComponentContext > & _rxORB ) diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index b82b82bb1288..7da894363cbf 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1489,10 +1489,10 @@ namespace svxform } - IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer) + IMPL_LINK_NOARG_TYPED(NavigatorTree, OnDropActionTimer, Timer *, void) { if (--m_aTimerCounter > 0) - return 0L; + return; switch ( m_aDropActionType ) { @@ -1521,8 +1521,6 @@ namespace svxform break; } - - return 0L; } @@ -1543,10 +1541,9 @@ namespace svxform } - IMPL_LINK_NOARG(NavigatorTree, OnSynchronizeTimer) + IMPL_LINK_NOARG_TYPED(NavigatorTree, OnSynchronizeTimer, Timer *, void) { SynchronizeMarkList(); - return 0L; } diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 2232b6ad50c5..378137464780 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -354,7 +354,7 @@ namespace svxform DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); DECL_LINK( MenuActivateHdl, MenuButton * ); DECL_LINK(ActivatePageHdl, void *); - DECL_LINK(UpdateHdl, void *); + DECL_LINK_TYPED(UpdateHdl, Timer *, void); XFormsPage* GetCurrentPage( sal_uInt16& rCurId ); void LoadModels(); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 947aad93b902..63c4426c89b2 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -284,7 +284,7 @@ protected: DECL_LINK(OnRemove, SvTreeListEntry*); DECL_LINK(OnEdited, SvTreeListEntry*); - DECL_LINK(OnDropActionTimer, void*); + DECL_LINK_TYPED(OnDropActionTimer, Timer*, void); private: /** returns the first form item and the selected FilterItems in the vector diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 8d7140e73451..a10c207feafa 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -484,10 +484,10 @@ namespace svxform static bool IsHiddenControl(FmEntryData* pEntryData); DECL_LINK( OnEdit, void* ); - DECL_LINK( OnDropActionTimer, void* ); + DECL_LINK_TYPED( OnDropActionTimer, Timer*, void ); DECL_LINK(OnEntrySelDesel, NavigatorTree*); - DECL_LINK(OnSynchronizeTimer, void*); + DECL_LINK_TYPED(OnSynchronizeTimer, Timer*, void); DECL_LINK( OnClipboardAction, void* ); diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index c6d7404e190e..e7308fd76d46 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -460,7 +460,7 @@ private: DECL_DLLPRIVATE_LINK(OnFoundData, FmFoundRecordInformation*); DECL_DLLPRIVATE_LINK(OnCanceledNotFound, FmFoundRecordInformation*); DECL_DLLPRIVATE_LINK(OnSearchContextRequest, FmSearchContext*); - DECL_DLLPRIVATE_LINK(OnTimeOut, void*); + DECL_DLLPRIVATE_LINK_TYPED(OnTimeOut, Timer*, void); DECL_DLLPRIVATE_LINK(OnFirstTimeActivation, void*); DECL_DLLPRIVATE_LINK(OnFormsCreated, FmFormPage*); diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index fc679e30156d..b1765ab0cc6a 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -199,7 +199,7 @@ namespace svx */ void impl_parseURL_nothrow( ::com::sun::star::util::URL& _rURL ); - DECL_LINK( OnInvalidateClipboard, void* ); + DECL_LINK_TYPED( OnInvalidateClipboard, Timer*, void ); }; diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 0cd8dc66e40c..4ed59e08533b 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -563,7 +563,7 @@ namespace svxform ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl> isInList(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer>& xPeer) const; DECL_LINK( OnActivateTabOrder, void* ); - DECL_LINK( OnInvalidateFeatures, void* ); + DECL_LINK_TYPED( OnInvalidateFeatures, Timer*, void ); DECL_LINK( OnLoad, void* ); DECL_LINK( OnToggleAutoFields, void* ); DECL_LINK( OnActivated, void* ); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 4afabbe9b7d8..8e5a830d6177 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -97,7 +97,7 @@ OLEObjCache::OLEObjCache() { nSize = officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get(); pTimer = new AutoTimer(); - Link<> aLink = LINK(this, OLEObjCache, UnloadCheckHdl); + Link<Timer *, void> aLink = LINK(this, OLEObjCache, UnloadCheckHdl); pTimer->SetTimeoutHdl(aLink); pTimer->SetTimeout(20000); @@ -234,10 +234,9 @@ bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj) return bUnloaded; } -IMPL_LINK(OLEObjCache, UnloadCheckHdl, AutoTimer*, /*pTim*/) +IMPL_LINK_NOARG_TYPED(OLEObjCache, UnloadCheckHdl, Timer*, void) { UnloadOnDemand(); - return 0; } diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 4bea14d66947..410398432d8b 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -80,11 +80,10 @@ void FormatPaintBrushToolBoxControl::Click() } -IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) +IMPL_LINK_NOARG_TYPED(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, Timer *, void) { //there was no second click during waiting this->impl_executePaintBrush(); - return 0; } diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index c212d634234f..02f38d5b10b0 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -69,14 +69,13 @@ SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame, -IMPL_LINK_NOARG(SvxLineBox, DelayHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxLineBox, DelayHdl_Impl, Timer *, void) { if ( GetEntryCount() == 0 ) { mpSh = SfxObjectShell::Current(); FillControl(); } - return 0; } diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index 2df8af397dbf..94038132f123 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -246,7 +246,7 @@ class SwHTMLTableLayout void _Resize( sal_uInt16 nAbsAvail, bool bRecalc=false ); - DECL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void* ); + DECL_STATIC_LINK_TYPED( SwHTMLTableLayout, DelayedResize_Impl, Timer*, void ); static sal_uInt16 GetBrowseWidthByVisArea( const SwDoc& rDoc ); public: diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 60282bf0ce52..8f135031bb52 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -72,7 +72,7 @@ class SwChartLockController_Helper { SwDoc *pDoc; - DECL_LINK( DoUnlockAllCharts, Timer * ); + DECL_LINK_TYPED( DoUnlockAllCharts, Timer *, void ); Timer aUnlockTimer; // timer to unlock chart controllers bool bIsLocked; diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx index 8677456f9da2..5f231eca35fd 100644 --- a/sw/source/core/doc/DocumentStatisticsManager.cxx +++ b/sw/source/core/doc/DocumentStatisticsManager.cxx @@ -225,7 +225,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF return nChars < 0; } -IMPL_LINK( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, pTimer ) +IMPL_LINK_TYPED( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, pTimer, void ) { (void)pTimer; if (IncrementalDocStatCalculate(32000)) @@ -234,7 +234,6 @@ IMPL_LINK( DocumentStatisticsManager, DoIdleStatsUpdate, Timer *, pTimer ) SwView* pView = m_rDoc.GetDocShell() ? m_rDoc.GetDocShell()->GetView() : NULL; if( pView ) pView->UpdateDocStats(); - return 0; } DocumentStatisticsManager::~DocumentStatisticsManager() diff --git a/sw/source/core/doc/htmltbl.cxx b/sw/source/core/doc/htmltbl.cxx index 3f2412de76a6..e9169755b77f 100644 --- a/sw/source/core/doc/htmltbl.cxx +++ b/sw/source/core/doc/htmltbl.cxx @@ -1744,13 +1744,11 @@ void SwHTMLTableLayout::_Resize( sal_uInt16 nAbsAvail, bool bRecalc ) pRoot->EndAllAction( true ); //True per VirDev (browsing is calmer) } -IMPL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void*, EMPTYARG ) +IMPL_STATIC_LINK_TYPED( SwHTMLTableLayout, DelayedResize_Impl, Timer*, EMPTYARG, void ) { pThis->aResizeTimer.Stop(); pThis->_Resize( pThis->nDelayedResizeAbsAvail, pThis->bDelayedResizeRecalc ); - - return 0; } bool SwHTMLTableLayout::Resize( sal_uInt16 nAbsAvail, bool bRecalc, diff --git a/sw/source/core/inc/DocumentStatisticsManager.hxx b/sw/source/core/inc/DocumentStatisticsManager.hxx index 45915c77ecde..be1e78a84b35 100644 --- a/sw/source/core/inc/DocumentStatisticsManager.hxx +++ b/sw/source/core/inc/DocumentStatisticsManager.hxx @@ -60,7 +60,7 @@ private: bool IncrementalDocStatCalculate(long nChars, bool bFields = true); // Our own 'StatsUpdateTimer' calls the following method - DECL_LINK( DoIdleStatsUpdate, Timer * ); + DECL_LINK_TYPED( DoIdleStatsUpdate, Timer *, void ); SwDocStat *mpDocStat; //< Statistics information. diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx index eb2914ea8887..95316316ba1f 100644 --- a/sw/source/core/inc/blink.hxx +++ b/sw/source/core/inc/blink.hxx @@ -73,7 +73,7 @@ public: SwBlink(); ~SwBlink(); - DECL_LINK( Blinker, void * ); + DECL_LINK_TYPED( Blinker, Timer *, void ); void Insert( const Point& rPoint, const SwLinePortion* pPor, const SwTxtFrm *pTxtFrm, sal_uInt16 nDir ); diff --git a/sw/source/core/text/blink.cxx b/sw/source/core/text/blink.cxx index 52c720ae0e8f..8bdd175f98d7 100644 --- a/sw/source/core/text/blink.cxx +++ b/sw/source/core/text/blink.cxx @@ -55,7 +55,7 @@ SwBlink::~SwBlink( ) * Toggle visibility flag * Determine the repaint rectangle and invalidate them in their OleShells. */ -IMPL_LINK_NOARG(SwBlink, Blinker) +IMPL_LINK_NOARG_TYPED(SwBlink, Blinker, Timer *, void) { bVisible = !bVisible; if( bVisible ) @@ -113,7 +113,6 @@ IMPL_LINK_NOARG(SwBlink, Blinker) } else // If the list is empty, the timer can be stopped aTimer.Stop(); - return 1; } void SwBlink::Insert( const Point& rPoint, const SwLinePortion* pPor, diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index 6c3c3dcbd6a9..caa60485b010 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -44,7 +44,7 @@ class SwGrammarContact : public IGrammarContact, public SwClient SwGrammarMarkUp *mpProxyList; bool mbFinished; SwTxtNode* getMyTxtNode() { return static_cast<SwTxtNode*>(GetRegisteredIn()); } - DECL_LINK( TimerRepaint, Timer * ); + DECL_LINK_TYPED( TimerRepaint, Timer *, void ); public: SwGrammarContact(); @@ -65,7 +65,7 @@ SwGrammarContact::SwGrammarContact() : mpProxyList(0), mbFinished( false ) aTimer.SetTimeoutHdl( LINK(this, SwGrammarContact, TimerRepaint) ); } -IMPL_LINK( SwGrammarContact, TimerRepaint, Timer *, pTimer ) +IMPL_LINK_TYPED( SwGrammarContact, TimerRepaint, Timer *, pTimer, void ) { if( pTimer ) { @@ -77,7 +77,6 @@ IMPL_LINK( SwGrammarContact, TimerRepaint, Timer *, pTimer ) SwTxtFrm::repaintTextFrames( *getMyTxtNode() ); } } - return 0; } /* I'm always a client of the current paragraph */ diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index deaa196bf449..ba53b5ecd7cb 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -160,10 +160,9 @@ void SwChartLockController_Helper::LockUnlockAllCharts( bool bLock ) bIsLocked = bLock; } -IMPL_LINK( SwChartLockController_Helper, DoUnlockAllCharts, Timer *, /*pTimer*/ ) +IMPL_LINK_NOARG_TYPED( SwChartLockController_Helper, DoUnlockAllCharts, Timer *, void ) { UnlockAllCharts(); - return 0; } static osl::Mutex & GetChartMutex() diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 78d24ba09cb7..3f8b5686b08a 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -510,7 +510,7 @@ void SwHeaderFooterWin::Select( ) ExecuteCommand( GetCurItemId() ); } -IMPL_LINK_NOARG(SwHeaderFooterWin, FadeHandler) +IMPL_LINK_NOARG_TYPED(SwHeaderFooterWin, FadeHandler, Timer *, void) { if ( m_bIsAppearing && m_nFadeRate > 0 ) m_nFadeRate -= 25; @@ -532,8 +532,6 @@ IMPL_LINK_NOARG(SwHeaderFooterWin, FadeHandler) if ( IsVisible( ) && m_nFadeRate > 0 && m_nFadeRate < 100 ) m_aFadeTimer.Start(); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 23b5902bc906..0840c825261c 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -441,14 +441,14 @@ IMPL_LINK_NOARG(SwPageBreakWin, HideHandler) return 0; } -IMPL_LINK_NOARG(SwPageBreakWin, FadeHandler) +IMPL_LINK_NOARG_TYPED(SwPageBreakWin, FadeHandler, Timer *, void) { const int TICKS_BEFORE_WE_APPEAR = 10; if ( m_bIsAppearing && m_nDelayAppearing < TICKS_BEFORE_WE_APPEAR ) { ++m_nDelayAppearing; m_aFadeTimer.Start(); - return 0; + return; } if ( m_bIsAppearing && m_nFadeRate > 0 ) @@ -468,8 +468,6 @@ IMPL_LINK_NOARG(SwPageBreakWin, FadeHandler) if ( IsVisible( ) && m_nFadeRate > 0 && m_nFadeRate < 100 ) m_aFadeTimer.Start(); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx index e3d86869daac..72dea948881c 100644 --- a/sw/source/uibase/docvw/edtdd.cxx +++ b/sw/source/uibase/docvw/edtdd.cxx @@ -475,7 +475,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt ) return DND_ACTION_NONE; } -IMPL_LINK_NOARG(SwEditWin, DDHandler) +IMPL_LINK_NOARG_TYPED(SwEditWin, DDHandler, Timer *, void) { g_bDDTimerStarted = false; m_aTimer.Stop(); @@ -489,7 +489,6 @@ IMPL_LINK_NOARG(SwEditWin, DDHandler) g_bExecuteDrag = true; StartExecuteDrag(); } - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 4a8d91b7e401..58957e2aeede 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -593,7 +593,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier ) /** * Increase timer for selection */ -IMPL_LINK_NOARG(SwEditWin, TimerHandler) +IMPL_LINK_NOARG_TYPED(SwEditWin, TimerHandler, Timer *, void) { SwWrtShell &rSh = m_rView.GetWrtShell(); Point aModPt( m_aMovePos ); @@ -642,7 +642,6 @@ IMPL_LINK_NOARG(SwEditWin, TimerHandler) m_aMovePos += rSh.VisArea().Pos() - aOldVis.Pos(); JustifyAreaTimer(); - return 0; } void SwEditWin::JustifyAreaTimer() @@ -5729,16 +5728,14 @@ static SfxShell* lcl_GetShellFromDispatcher( SwView& rView, TypeId nType ) return pShell; } -IMPL_LINK_NOARG(SwEditWin, KeyInputFlushHandler) +IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputFlushHandler, Timer *, void) { FlushInBuffer(); - return 0; } -IMPL_LINK_NOARG(SwEditWin, KeyInputTimerHandler) +IMPL_LINK_NOARG_TYPED(SwEditWin, KeyInputTimerHandler, Timer *, void) { m_bTblInsDelMode = false; - return 0; } void SwEditWin::_InitStaticData() diff --git a/sw/source/uibase/fldui/fldwrap.cxx b/sw/source/uibase/fldui/fldwrap.cxx index 8e90321f1979..a027814fa755 100644 --- a/sw/source/uibase/fldui/fldwrap.cxx +++ b/sw/source/uibase/fldui/fldwrap.cxx @@ -46,11 +46,9 @@ SwChildWinWrapper::SwChildWinWrapper(vcl::Window *pParentWindow, sal_uInt16 nId) m_aUpdateTimer.SetTimeoutHdl(LINK(this, SwChildWinWrapper, UpdateHdl)); } -IMPL_LINK_NOARG(SwChildWinWrapper, UpdateHdl) +IMPL_LINK_NOARG_TYPED(SwChildWinWrapper, UpdateHdl, Timer *, void) { GetWindow()->Activate(); // update dialog - - return 0; } // newly initialise dialog after Doc switch diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index 76241f648c98..b9fa86e4a5c6 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -51,7 +51,7 @@ public: void SetReadonly( bool bReadonly ) SAL_OVERRIDE; private: - DECL_LINK( FadeHandler, void * ); + DECL_LINK_TYPED( FadeHandler, Timer *, void ); }; #endif diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index ab18dd86c4d9..d2c165e043b1 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -56,7 +56,7 @@ public: private: /// Hide the button (used when the popup menu is closed by clicking outside) DECL_LINK( HideHandler, void * ); - DECL_LINK( FadeHandler, void * ); + DECL_LINK_TYPED( FadeHandler, Timer *, void ); }; #endif diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx index d9b6574b099c..ac457f1f8a31 100644 --- a/sw/source/uibase/inc/chldwrap.hxx +++ b/sw/source/uibase/inc/chldwrap.hxx @@ -29,7 +29,7 @@ class SwChildWinWrapper : public SfxChildWindow Timer m_aUpdateTimer; SwDocShell* m_pDocSh; - DECL_LINK( UpdateHdl, void* ); + DECL_LINK_TYPED( UpdateHdl, Timer*, void ); // Implementation in fldtdlg.cxx protected: diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index ee23a095d861..faf669d7136a 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -191,7 +191,7 @@ public: SwWrtShell* GetHiddenWrtShell() {return pHiddenShell;} DECL_LINK( ContentDoubleClickHdl, void * ); - DECL_LINK( TimerUpdate, void * ); + DECL_LINK_TYPED( TimerUpdate, Timer *, void ); virtual sal_IntPtr GetTabPos( SvTreeListEntry*, SvLBoxTab* ) SAL_OVERRIDE; virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; @@ -294,7 +294,7 @@ protected: void Clear(); DECL_LINK( PopupHdl, Menu* ); - DECL_LINK( Timeout, void* ); + DECL_LINK_TYPED( Timeout, Timer*, void ); DECL_LINK( DoubleClickHdl, void* ); bool IsInternalDrag() const {return bIsInternalDrag;} diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index aa9e84873dfd..a0365836c4e7 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -165,16 +165,16 @@ friend void PageNumNotify( SwViewShell* pVwSh, * The selection is regularly increased towards the mouse * position. */ - DECL_LINK( TimerHandler, void * ); + DECL_LINK_TYPED( TimerHandler, Timer *, void ); void StartDDTimer(); void StopDDTimer(SwWrtShell *, const Point &); - DECL_LINK( DDHandler, void * ); + DECL_LINK_TYPED( DDHandler, Timer *, void ); // timer for ANY-KeyInut question without a following KeyInputEvent - DECL_LINK( KeyInputFlushHandler, void * ); + DECL_LINK_TYPED( KeyInputFlushHandler, Timer *, void ); // timer for overlapping KeyInputs (e.g. for tables) - DECL_LINK( KeyInputTimerHandler, void * ); + DECL_LINK_TYPED( KeyInputTimerHandler, Timer *, void ); // timer for ApplyTemplates via mouse (in disguise Drag&Drop) DECL_LINK( TemplateTimerHdl, void * ); diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx index 7fb471182a7d..6c5aabb1465c 100644 --- a/sw/source/uibase/inc/redlndlg.hxx +++ b/sw/source/uibase/inc/redlndlg.hxx @@ -100,7 +100,8 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg SAL_DLLPRIVATE DECL_LINK( UndoHdl, void* ); SAL_DLLPRIVATE DECL_LINK( DeselectHdl, void* ); SAL_DLLPRIVATE DECL_LINK( SelectHdl, void* ); - SAL_DLLPRIVATE DECL_LINK( GotoHdl, void* ); + SAL_DLLPRIVATE DECL_LINK_TYPED( SelectTimerHdl, Timer*, void ); + SAL_DLLPRIVATE DECL_LINK_TYPED( GotoHdl, Timer*, void ); SAL_DLLPRIVATE DECL_LINK( CommandHdl, void* ); SAL_DLLPRIVATE sal_uInt16 CalcDiff(sal_uInt16 nStart, bool bChild); diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index 94c23771b8da..8f5fb4659af8 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -115,7 +115,7 @@ protected: Color GetFadedColor(const Color &rHighColor, const Color &rLowColor); /// Fade timer callback. - DECL_LINK(FadeHandler, void *); + DECL_LINK_TYPED(FadeHandler, Timer *, void); }; #endif diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx index 2eafa89c0461..0f5eb6cd9e6e 100644 --- a/sw/source/uibase/inc/view.hxx +++ b/sw/source/uibase/inc/view.hxx @@ -281,7 +281,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell SAL_DLLPRIVATE void CreateBtns(); SAL_DLLPRIVATE DECL_LINK( BtnPage, Button * ); - SAL_DLLPRIVATE DECL_LINK( TimeoutHdl, void* ); + SAL_DLLPRIVATE DECL_LINK_TYPED( TimeoutHdl, Timer*, void ); SAL_DLLPRIVATE DECL_LINK( UpdatePercentHdl, GraphicFilter* ); SAL_DLLPRIVATE DECL_LINK( FieldPopupModeEndHdl, void* ); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 411febaeaae1..b8cac8b31b33 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -212,7 +212,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer // avoid flickering of buttons: aDeselectTimer.SetTimeout(100); - aDeselectTimer.SetTimeoutHdl(LINK(this, SwRedlineAcceptDlg, SelectHdl)); + aDeselectTimer.SetTimeoutHdl(LINK(this, SwRedlineAcceptDlg, SelectTimerHdl)); // avoid multiple selection of the same texts: aSelectTimer.SetTimeout(100); @@ -943,13 +943,17 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, DeselectHdl) IMPL_LINK_NOARG(SwRedlineAcceptDlg, SelectHdl) { + SelectTimerHdl(nullptr); + return 0; +} + +IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, SelectTimerHdl, Timer *, void) +{ aDeselectTimer.Stop(); aSelectTimer.Start(); - - return 0; } -IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl) +IMPL_LINK_NOARG_TYPED(SwRedlineAcceptDlg, GotoHdl, Timer *, void) { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); aSelectTimer.Stop(); @@ -1014,8 +1018,6 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl) pTPView->EnableAccept( bEnable && bSel /*&& !bReadonlySel*/ ); pTPView->EnableReject( bEnable && bSel && bIsNotFormated /*&& !bReadonlySel*/ ); pTPView->EnableRejectAll( bEnable && !bOnlyFormatedRedlines && !bHasReadonlySel ); - - return 0; } IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx index 748aa9ceccb6..b462d36cb2b1 100644 --- a/sw/source/uibase/misc/swruler.cxx +++ b/sw/source/uibase/misc/swruler.cxx @@ -289,7 +289,7 @@ Color SwCommentRuler::GetFadedColor(const Color &rHighColor, const Color &rLowCo return aColor; } -IMPL_LINK_NOARG(SwCommentRuler, FadeHandler) +IMPL_LINK_NOARG_TYPED(SwCommentRuler, FadeHandler, Timer *, void) { const int nStep = 25; if ( mbIsHighlighted && mnFadeRate < 100 ) @@ -297,13 +297,12 @@ IMPL_LINK_NOARG(SwCommentRuler, FadeHandler) else if ( !mbIsHighlighted && mnFadeRate > 0 ) mnFadeRate -= nStep; else - return 0; + return; Invalidate(); if ( mnFadeRate != 0 && mnFadeRate != 100) maFadeTimer.Start(); - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 085157fdf961..5a158033a097 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -517,12 +517,12 @@ IMPL_LINK_NOARG(SwView, AttrChangedNotify) return 0; } -IMPL_LINK_NOARG(SwView, TimeoutHdl) +IMPL_LINK_NOARG_TYPED(SwView, TimeoutHdl, Timer *, void) { if( m_pWrtShell->BasicActionPend() || g_bNoInterrupt ) { m_aTimer.Start(); - return 0; + return; } if ( m_bAttrChgNotifiedWithRegistrations ) @@ -540,8 +540,6 @@ IMPL_LINK_NOARG(SwView, TimeoutHdl) m_pWrtShell->DoUndo( bOldUndo ); m_bAttrChgNotified = false; GetViewImpl()->GetUNOObject_Impl()->NotifySelChanged(); - - return 0; } void SwView::_CheckReadonlyState() diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx index 65d78e54fed0..d744d24c2630 100644 --- a/sw/source/uibase/uno/unomailmerge.cxx +++ b/sw/source/uibase/uno/unomailmerge.cxx @@ -211,7 +211,7 @@ namespace private: void implTakeOwnership( ); - DECL_LINK( OnTryDeleteFile, void* ); + DECL_LINK_TYPED( OnTryDeleteFile, Timer*, void ); }; DelayedFileDeletion::DelayedFileDeletion( const Reference< XModel >& _rxModel, const OUString& _rTemporaryFile ) @@ -240,7 +240,7 @@ namespace osl_atomic_decrement( &m_refCount ); } - IMPL_LINK_NOARG(DelayedFileDeletion, OnTryDeleteFile) + IMPL_LINK_NOARG_TYPED(DelayedFileDeletion, OnTryDeleteFile, Timer *, void) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -278,7 +278,6 @@ namespace aGuard.clear(); release(); // this should be our last reference, we should be dead after this } - return 0L; } void DelayedFileDeletion::implTakeOwnership( ) diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index f5a63c3dcab1..36ab74aa71a4 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -2446,10 +2446,10 @@ void SwContentTree::HideTree() // No idle with focus or while dragging. -IMPL_LINK_NOARG(SwContentTree, TimerUpdate) +IMPL_LINK_NOARG_TYPED(SwContentTree, TimerUpdate, Timer *, void) { if (IsDisposed()) - return 0; + return; // No update while drag and drop. // Query view because the Navigator is cleared too late. @@ -2490,7 +2490,6 @@ IMPL_LINK_NOARG(SwContentTree, TimerUpdate) Clear(); bIsIdleClear = true; } - return 0; } DragDropMode SwContentTree::NotifyStartDrag( diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index a3fc721718d9..012a6fd02a6f 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -1009,11 +1009,10 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry delete pContCopy; } -IMPL_LINK_NOARG(SwGlobalTree, Timeout) +IMPL_LINK_NOARG_TYPED(SwGlobalTree, Timeout, Timer *, void) { if(!IsDisposed() && !HasFocus() && Update( false )) Display(); - return 0; } void SwGlobalTree::GotoContent(const SwGlblDocContent* pCont) diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 57f62684b581..ef9063ec670f 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -107,10 +107,10 @@ public: m_aTimer.Start(); } - DECL_LINK( MacroCallHdl, void* ); + DECL_LINK_TYPED( MacroCallHdl, Timer*, void ); }; -IMPL_LINK_NOARG(VbaTimer, MacroCallHdl) +IMPL_LINK_NOARG_TYPED(VbaTimer, MacroCallHdl, Timer *, void) { if ( m_aTimerInfo.second.second == 0 || GetNow() < m_aTimerInfo.second.second ) { @@ -129,8 +129,6 @@ IMPL_LINK_NOARG(VbaTimer, MacroCallHdl) m_xBase->OnTime( uno::makeAny( m_aTimerInfo.second.first ), m_aTimerInfo.first, uno::makeAny( m_aTimerInfo.second.second ), uno::makeAny( sal_False ) ); } catch( uno::Exception& ) {} - - return 0; } // ====VbaTimerInfoHash================================== diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 0804791d1650..fe978cdc24ad 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -885,13 +885,13 @@ namespace #endif } -IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport) +IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void) { #if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) guint xid = get_xid_for_dbus(); if (!xid) - return -1; + return; GError *error = NULL; /* get the DBUS session connection */ @@ -900,7 +900,7 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport) { g_debug ("DBUS cannot connect : %s", error->message); g_error_free (error); - return -1; + return; } /* get the proxy with gnome-session-manager */ @@ -911,7 +911,7 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport) if (proxy == NULL) { g_debug("Could not get DBUS proxy: org.freedesktop.PackageKit"); - return -1; + return; } gchar **fonts = static_cast<gchar**>(g_malloc((m_aCurrentRequests.size() + 1) * sizeof(gchar*))); @@ -940,7 +940,6 @@ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport) g_object_unref(G_OBJECT (proxy)); m_aCurrentRequests.clear(); #endif - return 0; } bool PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissingCodes ) diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx index 8c08b4ae6b5a..13bd05fd1622 100644 --- a/vcl/inc/fontmanager.hxx +++ b/vcl/inc/fontmanager.hxx @@ -327,7 +327,7 @@ class VCL_PLUGIN_PUBLIC PrintFontManager std::vector<OString> m_aCurrentRequests; Timer m_aFontInstallerTimer; - DECL_LINK( autoInstallFontLangSupport, void* ); + DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void ); PrintFontManager(); ~PrintFontManager(); diff --git a/vcl/inc/helpwin.hxx b/vcl/inc/helpwin.hxx index bcdb80ba152a..60ecb61c9362 100644 --- a/vcl/inc/helpwin.hxx +++ b/vcl/inc/helpwin.hxx @@ -42,7 +42,7 @@ private: sal_uInt16 mnStyle; protected: - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK_TYPED( TimerHdl, Timer*, void ); virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; virtual OUString GetText() const SAL_OVERRIDE; diff --git a/vcl/inc/idlemgr.hxx b/vcl/inc/idlemgr.hxx index d993e836a535..e83b9ef99f8c 100644 --- a/vcl/inc/idlemgr.hxx +++ b/vcl/inc/idlemgr.hxx @@ -44,7 +44,7 @@ public: { if ( maTimer.IsActive() ) maTimer.Start(); } // Timer* kann auch NULL sein - DECL_LINK(TimeoutHdl, void *); + DECL_LINK_TYPED(TimeoutHdl, Timer *, void); }; #endif // INCLUDED_VCL_INC_IDLEMGR_HXX diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index f0132e66ffe9..9ead2aed89e1 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -151,7 +151,7 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public X11WindowProvider long HandleReparentEvent ( XReparentEvent *pEvent ); long HandleClientMessage ( XClientMessageEvent*pEvent ); - DECL_LINK( HandleAlwaysOnTopRaise, void* ); + DECL_LINK_TYPED( HandleAlwaysOnTopRaise, Timer*, void ); void createNewWindow( ::Window aParent, SalX11Screen nXScreen = SalX11Screen( -1 ) ); void updateScreenNumber(); diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 68bb91ed5c7b..1180100ba9a4 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -424,7 +424,7 @@ void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode ) maShowTimer.Start(); } -IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer) +IMPL_LINK_TYPED( HelpTextWindow, TimerHdl, Timer*, pTimer, void) { if ( pTimer == &maShowTimer ) { @@ -442,8 +442,6 @@ IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer) DBG_ASSERT( pTimer == &maHideTimer, "HelpTextWindow::TimerHdl with bad Timer" ); ImplDestroyHelpWindow( true ); } - - return 1; } Size HelpTextWindow::CalcOutSize() const diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx index 5fa5bef1c340..9463acd5b021 100644 --- a/vcl/source/app/idlemgr.cxx +++ b/vcl/source/app/idlemgr.cxx @@ -104,7 +104,7 @@ void ImplIdleMgr::RemoveIdleHdl( const Link<>& rLink ) maTimer.Stop(); } -IMPL_LINK_NOARG(ImplIdleMgr, TimeoutHdl) +IMPL_LINK_NOARG_TYPED(ImplIdleMgr, TimeoutHdl, Timer *, void) { for ( size_t i = 0; i < mpIdleList->size(); ++i ) { ImplIdleData* pIdleData = (*mpIdleList)[ i ]; @@ -120,8 +120,6 @@ IMPL_LINK_NOARG(ImplIdleMgr, TimeoutHdl) } } } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 6b89146dd231..0e2dba38ead4 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -2419,10 +2419,9 @@ void Edit::UpdateData() maUpdateDataHdl.Call( this ); } -IMPL_LINK_NOARG(Edit, ImplUpdateDataHdl) +IMPL_LINK_NOARG_TYPED(Edit, ImplUpdateDataHdl, Timer *, void) { UpdateData(); - return 0; } void Edit::EnableUpdateData( sal_uLong nTimeout ) diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 314c41ab7f9f..74c94c23f550 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -92,7 +92,7 @@ void MenuButton::dispose() PushButton::dispose(); } -IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl) +IMPL_LINK_NOARG_TYPED(MenuButton, ImplMenuTimeoutHdl, Timer *, void) { // See if Button Tracking is still active, as it could've been cancelled earler if ( IsTracking() ) @@ -101,8 +101,6 @@ IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl) GrabFocus(); ExecuteMenu(); } - - return 0; } void MenuButton::MouseButtonDown( const MouseEvent& rMEvt ) diff --git a/vcl/source/control/quickselectionengine.cxx b/vcl/source/control/quickselectionengine.cxx index 0d24683137f2..f9acf5bab956 100644 --- a/vcl/source/control/quickselectionengine.cxx +++ b/vcl/source/control/quickselectionengine.cxx @@ -51,7 +51,7 @@ namespace vcl aSearchTimeout.Stop(); } - DECL_LINK( SearchStringTimeout, Timer* ); + DECL_LINK_TYPED( SearchStringTimeout, Timer*, void ); }; namespace @@ -64,10 +64,9 @@ namespace vcl } } - IMPL_LINK( QuickSelectionEngine_Data, SearchStringTimeout, Timer*, /*EMPTYARG*/ ) + IMPL_LINK_NOARG_TYPED( QuickSelectionEngine_Data, SearchStringTimeout, Timer*, void ) { lcl_reset( *this ); - return 1; } static StringEntryIdentifier findMatchingEntry( const OUString& _searchString, QuickSelectionEngine_Data& _engineData ) diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 0d717833c3fb..0f4e8316f56e 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1134,12 +1134,11 @@ void ScrollBar::Resize() Invalidate(); } -IMPL_LINK_NOARG(ScrollBar, ImplAutoTimerHdl) +IMPL_LINK_NOARG_TYPED(ScrollBar, ImplAutoTimerHdl, Timer *, void) { if( mpData && mpData->mbHide ) - return 0; + return; ImplInvert(); - return 0; } void ScrollBar::ImplInvert() diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index 4689ee84e7e8..509b520c66f3 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -55,7 +55,7 @@ SpinButton::SpinButton( vcl::Window* pParent, WinBits nStyle ) ImplInit( pParent, nStyle ); } -IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer ) +IMPL_LINK_TYPED( SpinButton, ImplTimeout, Timer*, pTimer, void ) { if ( pTimer->GetTimeout() == GetSettings().GetMouseSettings().GetButtonStartRepeat() ) { @@ -69,8 +69,6 @@ IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer ) else Down(); } - - return 0; } void SpinButton::Up() diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index c9131b71c6d6..d73eb50786c1 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -970,7 +970,7 @@ Size SpinField::CalcSize(sal_Int32 nChars) const return aSz; } -IMPL_LINK( SpinField, ImplTimeout, Timer*, pTimer ) +IMPL_LINK_TYPED( SpinField, ImplTimeout, Timer*, pTimer, void ) { if ( pTimer->GetTimeout() == GetSettings().GetMouseSettings().GetButtonStartRepeat() ) { @@ -984,7 +984,6 @@ IMPL_LINK( SpinField, ImplTimeout, Timer*, pTimer ) else Down(); } - return 0; } void SpinField::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index eedadc4e5637..f71aee55361f 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -239,11 +239,11 @@ void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList return aImageURLs; } -IMPL_LINK_NOARG(Throbber, TimeOutHdl) +IMPL_LINK_NOARG_TYPED(Throbber, TimeOutHdl, Timer *, void) { SolarMutexGuard aGuard; if ( maImageList.empty() ) - return 0; + return; if ( mnCurStep < mnStepCount - 1 ) mnCurStep += 1; @@ -261,8 +261,6 @@ IMPL_LINK_NOARG(Throbber, TimeOutHdl) } SetImage( maImageList[ mnCurStep ] ); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index faf72fb04a67..1ac2ee5ce0ea 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -1046,10 +1046,9 @@ void VclMultiLineEdit::CaretChanged() CallEventListeners(VCLEVENT_EDIT_CARETCHANGED); } -IMPL_LINK_NOARG(VclMultiLineEdit, ImpUpdateDataHdl) +IMPL_LINK_NOARG_TYPED(VclMultiLineEdit, ImpUpdateDataHdl, Timer *, void) { UpdateData(); - return 0; } void VclMultiLineEdit::UpdateData() diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index e0ce99a20959..6371d660ce08 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -353,7 +353,7 @@ void Animation::ImplRestartTimer( sal_uLong nTimeout ) typedef ::std::vector< AInfo* > AInfoList_impl; -IMPL_LINK_NOARG(Animation, ImplTimeoutHdl) +IMPL_LINK_NOARG_TYPED(Animation, ImplTimeoutHdl, Timer *, void) { const size_t nAnimCount = maList.size(); AInfoList_impl aAInfoList; @@ -432,7 +432,7 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl) mbLoopTerminated = true; mnPos = nAnimCount - 1UL; maBitmapEx = maList[ mnPos ]->aBmpEx; - return 0L; + return; } else { @@ -471,8 +471,6 @@ IMPL_LINK_NOARG(Animation, ImplTimeoutHdl) } else Stop(); - - return 0L; } bool Animation::Insert( const AnimationBitmap& rStepBmp ) diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index e61d82b1b5d6..c313001aec9b 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -246,13 +246,12 @@ void vcl::Cursor::ImplNew() } } -IMPL_LINK_NOARG(vcl::Cursor, ImplTimerHdl) +IMPL_LINK_NOARG_TYPED(vcl::Cursor, ImplTimerHdl, Timer *, void) { if ( mpData->mbCurVisible ) ImplRestore(); else ImplDraw(); - return 0; } vcl::Cursor::Cursor() diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index a48152eeffc7..e28cfff00c7a 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -267,16 +267,15 @@ IMPL_LINK_NOARG(MenuFloatingWindow, PopupEnd) return 0; } -IMPL_LINK_NOARG(MenuFloatingWindow, AutoScroll) +IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, AutoScroll, Timer *, void) { ImplScroll( GetPointerPosPixel() ); - return 1; } -IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer ) +IMPL_LINK_TYPED( MenuFloatingWindow, HighlightChanged, Timer*, pTimer, void ) { if( ! pMenu ) - return 0; + return; MenuItemData* pItemData = pMenu->pItemList->GetDataFromPos( nHighlightedItem ); if ( pItemData ) @@ -332,11 +331,9 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer ) pActivePopup->ImplGetFloatingWindow()->AddPopupModeWindow( this ); } } - - return 0; } -IMPL_LINK_NOARG(MenuFloatingWindow, SubmenuClose) +IMPL_LINK_NOARG_TYPED(MenuFloatingWindow, SubmenuClose, Timer *, void) { if( pMenu && pMenu->pStartedFrom ) { @@ -344,7 +341,6 @@ IMPL_LINK_NOARG(MenuFloatingWindow, SubmenuClose) if( pWin ) pWin->KillActivePopup(); } - return 0; } IMPL_LINK( MenuFloatingWindow, ShowHideListener, VclWindowEvent*, pEvent ) diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx index 021247af51a5..030fde0ba427 100644 --- a/vcl/source/window/menufloatingwindow.hxx +++ b/vcl/source/window/menufloatingwindow.hxx @@ -57,9 +57,9 @@ private: bool bKeyInput; DECL_LINK(PopupEnd, void *); - DECL_LINK( HighlightChanged, Timer* ); - DECL_LINK(SubmenuClose, void *); - DECL_LINK(AutoScroll, void *); + DECL_LINK_TYPED( HighlightChanged, Timer*, void ); + DECL_LINK_TYPED(SubmenuClose, Timer *, void); + DECL_LINK_TYPED(AutoScroll, Timer *, void); DECL_LINK( ShowHideListener, VclWindowEvent* ); virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 009dc14422bc..972e1fd4d1d3 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -345,7 +345,7 @@ void ImplWheelWindow::MouseButtonUp( const MouseEvent& rMEvt ) FloatingWindow::MouseButtonUp( rMEvt ); } -IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl) +IMPL_LINK_NOARG_TYPED(ImplWheelWindow, ImplScrollHdl, Timer *, void) { if ( mnActDeltaX || mnActDeltaY ) { @@ -362,7 +362,7 @@ IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl) ImplDelData aDel( this ); pWindow->Command( aCEvt ); if( aDel.IsDead() ) - return 0; + return; mnRepaintTime = std::max( tools::Time::GetSystemTicks() - nTime, (sal_uInt64)1 ); ImplRecalcScrollValues(); } @@ -371,8 +371,6 @@ IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl) if ( mnTimeout != mpTimer->GetTimeout() ) mpTimer->SetTimeout( mnTimeout ); mpTimer->Start(); - - return 0L; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx index 82ba04f29e51..65e0b7e3ab9b 100644 --- a/vcl/source/window/scrwnd.hxx +++ b/vcl/source/window/scrwnd.hxx @@ -59,7 +59,7 @@ private: void ImplDrawWheel(); void ImplRecalcScrollValues(); - DECL_LINK(ImplScrollHdl, void *); + DECL_LINK_TYPED(ImplScrollHdl, Timer *, void); protected: diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx index 60567209e81f..5ed8c960715e 100644 --- a/vcl/source/window/seleng.cxx +++ b/vcl/source/window/seleng.cxx @@ -51,11 +51,10 @@ SelectionEngine::~SelectionEngine() aWTimer.Stop(); } -IMPL_LINK_NOARG(SelectionEngine, ImpWatchDog) +IMPL_LINK_NOARG_TYPED(SelectionEngine, ImpWatchDog, Timer *, void) { if ( !aArea.IsInside( aLastMove.GetPosPixel() ) ) SelMouseMove( aLastMove ); - return 0; } void SelectionEngine::SetSelectionMode( SelectionMode eMode ) diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index bffd15ae8f2f..28806d8bb6ff 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -2632,7 +2632,7 @@ void ToolBox::ImplFormat( bool bResize ) mbFormat = false; } -IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) +IMPL_LINK_NOARG_TYPED(ToolBox, ImplDropdownLongClickHdl, Timer *, void) { if( mnCurPos != TOOLBOX_ITEM_NOTFOUND && (mpData->m_aItems[ mnCurPos ].mnBits & ToolBoxItemBits::DROPDOWN) @@ -2657,8 +2657,6 @@ IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl) mnHighItemId = 0; } } - - return 0; } IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index e10eb93f504b..3e14d44ad657 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -345,7 +345,7 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags ) pGraphics->Invert( nPoints, pPtAry, SAL_INVERT_TRACKFRAME, this ); } -IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer ) +IMPL_LINK_TYPED( Window, ImplTrackTimerHdl, Timer*, pTimer, void ) { ImplSVData* pSVData = ImplGetSVData(); @@ -367,8 +367,6 @@ IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer ) mpWindowImpl->mpFrameData->mnMouseCode ); TrackingEvent aTEvt( aMEvt, TRACKING_REPEAT ); Tracking( aTEvt ); - - return 0; } void Window::StartTracking( sal_uInt16 nFlags ) diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index f93883a82b51..e16074b15b04 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -3732,11 +3732,10 @@ long X11SalFrame::HandleSizeEvent( XConfigureEvent *pEvent ) return 1; } -IMPL_LINK_NOARG(X11SalFrame, HandleAlwaysOnTopRaise) +IMPL_LINK_NOARG_TYPED(X11SalFrame, HandleAlwaysOnTopRaise, Timer *, void) { if( bMapped_ ) ToTop( 0 ); - return 0; } long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) |