Kaydet (Commit) e5c8436c authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: Ie743ceadd23d57bce827a759ca89fa7d31cc4c26
Reviewed-on: https://gerrit.libreoffice.org/18857Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst f8a7c031
......@@ -2534,14 +2534,9 @@ IMPL_LINK_TYPED( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton, void
}
}
IMPL_LINK( SvxMenuConfigPage, AddFunctionHdl,
SvxScriptSelectorDialog *, pDialog )
IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, AddFunctionHdl, SvxScriptSelectorDialog&, void )
{
(void)pDialog;
AddFunction();
return 0;
}
IMPL_LINK_NOARG_TYPED( SvxMenuConfigPage, NewMenuHdl, Button *, void )
......@@ -4476,14 +4471,9 @@ IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddCommandsHdl, Button *, void )
m_pSelectorDlg->Show();
}
IMPL_LINK( SvxToolbarConfigPage, AddFunctionHdl,
SvxScriptSelectorDialog *, pDialog )
IMPL_LINK_NOARG_TYPED( SvxToolbarConfigPage, AddFunctionHdl, SvxScriptSelectorDialog&, void )
{
(void)pDialog;
AddFunction();
return 0;
}
SvTreeListEntry* SvxToolbarConfigPage::AddFunction(
......
......@@ -994,7 +994,7 @@ IMPL_LINK_TYPED( SvxScriptSelectorDialog, ClickHdl, Button *, pButton, void )
}
else if (pButton == m_pOKButton)
{
GetAddHdl().Call( this );
GetAddHdl().Call( *this );
// If we are displaying Slot API commands then this the dialog is being
// run from Tools/Configure and we should not close it
......
......@@ -446,7 +446,7 @@ private:
DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void );
DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void );
DECL_LINK_TYPED( AddCommandsHdl, Button *, void );
DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * );
DECL_LINK_TYPED( AddFunctionHdl, SvxScriptSelectorDialog&, void );
void Init() SAL_OVERRIDE;
void UpdateButtonStates() SAL_OVERRIDE;
......@@ -538,7 +538,7 @@ private:
DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void );
DECL_LINK_TYPED( NewToolbarHdl, Button *, void );
DECL_LINK_TYPED( AddCommandsHdl, Button *, void );
DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * );
DECL_LINK_TYPED( AddFunctionHdl, SvxScriptSelectorDialog&, void );
DECL_LINK_TYPED( MoveHdl, Button *, void );
void UpdateButtonStates() SAL_OVERRIDE;
......
......@@ -180,9 +180,9 @@ class SvxScriptSelectorDialog : public ModelessDialog
VclPtr<PushButton> m_pOKButton;
VclPtr<PushButton> m_pCancelButton;
VclPtr<VclMultiLineEdit> m_pDescriptionText;
OUString m_sDefaultDesc;
bool m_bShowSlots;
Link<> m_aAddHdl;
OUString m_sDefaultDesc;
bool m_bShowSlots;
Link<SvxScriptSelectorDialog&,void> m_aAddHdl;
DECL_LINK_TYPED( ClickHdl, Button *, void );
DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void );
......@@ -200,8 +200,8 @@ public:
virtual ~SvxScriptSelectorDialog();
virtual void dispose() SAL_OVERRIDE;
void SetAddHdl( const Link<>& rLink ) { m_aAddHdl = rLink; }
const Link<>& GetAddHdl() const { return m_aAddHdl; }
void SetAddHdl( const Link<SvxScriptSelectorDialog&,void>& rLink ) { m_aAddHdl = rLink; }
const Link<SvxScriptSelectorDialog&,void>& GetAddHdl() const { return m_aAddHdl; }
void SetImageProvider(SaveInData* provider)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment