diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 09:59:27 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 12:05:38 +0200 |
commit | c9b4c5681194a1cd3297a36d4a1f4e4cc3aac55a (patch) | |
tree | 2cb864a67b556f807ba175507296f7dfc5254944 /cui | |
parent | 8c4a1663f5d93380268365d35a5581d8065df897 (diff) |
Use typed Idle::SetIdleHdl Link
Change-Id: I189937950325dc4ef663f7f49cb45f38f8537de9
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/linkdlg.cxx | 5 | ||||
-rw-r--r-- | cui/source/dialogs/thesdlg.cxx | 3 | ||||
-rw-r--r-- | cui/source/inc/backgrnd.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/chardlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/cuigaldlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/linkdlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/macroass.hxx | 2 | ||||
-rw-r--r-- | cui/source/inc/thesdlg.hxx | 2 | ||||
-rw-r--r-- | cui/source/options/optjava.cxx | 3 | ||||
-rw-r--r-- | cui/source/options/optjava.hxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 3 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 3 | ||||
-rw-r--r-- | cui/source/tabpages/macroass.cxx | 3 |
14 files changed, 14 insertions, 24 deletions
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 3a2ebf328db1..7f4abcbddefc 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -507,7 +507,7 @@ IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn) -IMPL_LINK( ActualizeProgress, TimeoutHdl, Timer*, _pTimer ) +IMPL_LINK_TYPED( ActualizeProgress, TimeoutHdl, Idle*, _pTimer, void) { if ( _pTimer ) { @@ -517,8 +517,6 @@ IMPL_LINK( ActualizeProgress, TimeoutHdl, Timer*, _pTimer ) pTheme->Actualize( LINK( this, ActualizeProgress, ActualizeHdl ), &aStatusProgress ); ClickCancelBtn( NULL ); - - return 0; } diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index c947538640f1..b3a9c76c96b7 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -520,10 +520,8 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) return 0; } -IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer ) +IMPL_LINK_NOARG_TYPED( SvBaseLinksDlg, UpdateWaitingHdl, Idle*, void ) { - (void)pTimer; - m_pTbLinks->SetUpdateMode(false); for( sal_uLong nPos = m_pTbLinks->GetEntryCount(); nPos; ) { @@ -538,7 +536,6 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer ) } } m_pTbLinks->SetUpdateMode(true); - return 0; } IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink ) diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index a12e68c7fe21..a71456e33b75 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -92,11 +92,10 @@ void LookUpComboBox::Modify() m_aModifyIdle.Start(); } -IMPL_LINK( LookUpComboBox, ModifyTimer_Hdl, Timer *, EMPTYARG /*pTimer*/ ) +IMPL_LINK_NOARG_TYPED( LookUpComboBox, ModifyTimer_Hdl, Idle *, void ) { m_pDialog->LookUp( GetText() ); m_aModifyIdle.Stop(); - return 0; } // class ReplaceEdit -------------------------------------------------- diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 70d01e9b87ff..89af13d6f0a9 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -140,7 +140,7 @@ private: bool FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot); void ResetFromWallpaperItem( const SfxItemSet& rSet ); - DECL_LINK( LoadIdleHdl_Impl, Idle* ); + DECL_LINK_TYPED( LoadIdleHdl_Impl, Idle*, void ); DECL_LINK(SelectHdl_Impl, void *); DECL_LINK(BrowseHdl_Impl, void *); DECL_LINK( RadioClickHdl_Impl, RadioButton* ); diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index fad03f168fe4..4431ef6a3ce6 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -141,7 +141,7 @@ private: void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ); bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); - DECL_LINK(UpdateHdl_Impl, void *); + DECL_LINK_TYPED(UpdateHdl_Impl, Idle *, void); DECL_LINK( FontModifyHdl_Impl, void* ); public: diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 644cf4a6d767..a2384403a36e 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -159,7 +159,7 @@ private: GalleryProgress aStatusProgress; DECL_LINK( ClickCancelBtn, void* ); - DECL_LINK( TimeoutHdl, Timer* ); + DECL_LINK_TYPED( TimeoutHdl, Idle*, void ); DECL_LINK( ActualizeHdl, INetURLObject* pURL ); public: diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 7e953fcd747e..fb5baa9668b0 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -74,7 +74,7 @@ class SvBaseLinksDlg : public ModalDialog DECL_LINK( OpenSourceClickHdl, PushButton * ); DECL_LINK( ChangeSourceClickHdl, PushButton * ); DECL_LINK( BreakLinkClickHdl, PushButton * ); - DECL_LINK( UpdateWaitingHdl, Timer * ); + DECL_LINK_TYPED( UpdateWaitingHdl, Idle *, void ); DECL_LINK( EndEditHdl, sfx2::SvBaseLink* ); sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos ); OUString ImplGetStateStr( const sfx2::SvBaseLink& ); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 696c8bf55711..76193c19a7d2 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -42,7 +42,7 @@ class _SfxMacroTabPage : public SfxTabPage DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, DoubleClickHdl_Impl, Control* ); DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton * ); - DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* ); + DECL_DLLPRIVATE_STATIC_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*, void ); protected: _SfxMacroTabPage_Impl* mpImpl; diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 61084cf902d7..4f1ebe01e4eb 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -45,7 +45,7 @@ public: virtual ~LookUpComboBox(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK( ModifyTimer_Hdl, Timer * ); + DECL_LINK_TYPED( ModifyTimer_Hdl, Idle *, void ); void init(SvxThesaurusDialog *pDialog); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 95471d1121c5..80c6819f7f5b 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -394,10 +394,9 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl) -IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxJavaOptionsPage, ResetHdl_Impl, Idle *, void) { LoadJREs(); - return 0; } diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index ffe299b7c628..b73e2c308bb9 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -90,7 +90,7 @@ private: DECL_LINK(AddHdl_Impl, void *); DECL_LINK(ParameterHdl_Impl, void *); DECL_LINK(ClassPathHdl_Impl, void *); - DECL_LINK(ResetHdl_Impl, void *); + DECL_LINK_TYPED(ResetHdl_Impl, Idle *, void); DECL_LINK( StartFolderPickerHdl, void * ); DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* ); diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 4e49e59e95e1..85dbdbc69456 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1482,7 +1482,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl) -IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle ) +IMPL_LINK_TYPED( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle, void ) /* [Description] @@ -1538,7 +1538,6 @@ IMPL_LINK( SvxBackgroundTabPage, LoadIdleHdl_Impl, Idle* , pIdle ) DELETEZ( pImportDlg ); } } - return 0; } diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index c2a24866e812..412c6d5efb28 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1179,10 +1179,9 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp -IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxCharNamePage, UpdateHdl_Impl, Idle *, void) { UpdatePreview_Impl(); - return 0; } diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 0cb8a54cd527..ecde19457844 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -346,7 +346,7 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton*, pBtn ) return 0; } -IMPL_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer*, EMPTYARG ) +IMPL_STATIC_LINK_TYPED( _SfxMacroTabPage, TimeOut_Impl, Idle*, EMPTYARG, void ) { // FillMacroList() can take a long time -> show wait cursor and disable input SfxTabDialog* pTabDlg = pThis->GetTabDialog(); @@ -362,7 +362,6 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer*, EMPTYARG ) pTabDlg->EnableInput( true ); pTabDlg->LeaveWait(); } - return 0; } void _SfxMacroTabPage::InitAndSetHandler() |