diff options
Diffstat (limited to 'svtools/source/control')
| -rw-r--r-- | svtools/source/control/asynclink.cxx | 3 | ||||
| -rw-r--r-- | svtools/source/control/tabbar.cxx | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 6c079e0fc71c..5b4d6a9936ac 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -85,10 +85,9 @@ IMPL_LINK_NOARG_TYPED( AsynchronLink, HandleCall_Idle, Idle*, void ) Call_Impl( _pArg ); } -IMPL_LINK_NOARG( AsynchronLink, HandleCall_PostUserEvent ) +IMPL_LINK_NOARG_TYPED( AsynchronLink, HandleCall_PostUserEvent, void*, void ) { HandleCall_Idle(nullptr); - return 0; } void AsynchronLink::ClearPendingCall() diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 6cb9fe4919ef..68637b63f84d 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -395,7 +395,7 @@ private: Idle maLoseFocusIdle; bool mbPostEvt; - DECL_LINK( ImplEndEditHdl, void* ); + DECL_LINK_TYPED( ImplEndEditHdl, void*, void ); DECL_LINK_TYPED( ImplEndTimerHdl, Idle*, void ); public: @@ -458,7 +458,7 @@ void TabBarEdit::LoseFocus() Edit::LoseFocus(); } -IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel ) +IMPL_LINK_TYPED( TabBarEdit, ImplEndEditHdl, void*, pCancel, void ) { ResetPostEvent(); maLoseFocusIdle.Stop(); @@ -473,8 +473,6 @@ IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel ) } else GetParent()->EndEditMode( pCancel != 0 ); - - return 0; } IMPL_LINK_NOARG_TYPED(TabBarEdit, ImplEndTimerHdl, Idle *, void) |