summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2015-09-24 13:53:17 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-09-24 16:19:37 +0000
commite85b2333bce7b1dcae73861df6d90b48b9f4efe5 (patch)
tree21d066cecfbfda9ace96b26953ddcc3ae1764001 /sd
parentff6462e6307e6924dc6c8178043ae9032f4b4152 (diff)
convert Link<> to typed
Change-Id: I59d325c3b051690303a5841907317122fa1ec98b Reviewed-on: https://gerrit.libreoffice.org/18825 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/dlg/tpaction.cxx8
-rw-r--r--sd/source/ui/inc/tpaction.hxx2
2 files changed, 4 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 7ed705198b6f..2ca2a22a256c 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -467,7 +467,7 @@ void SdTPAction::OpenFileDialog()
SetEditText( aFile );
}
if( bDocument )
- CheckFileHdl( NULL );
+ CheckFileHdl( *m_pEdtDocument );
}
}
}
@@ -621,7 +621,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
m_pFtTree->SetText( SD_RESSTR( STR_EFFECTDLG_JUMP ) );
m_pFrame->set_label( SD_RESSTR( STR_EFFECTDLG_DOCUMENT ) );
- CheckFileHdl( NULL );
+ CheckFileHdl( *m_pEdtDocument );
break;
case presentation::ClickAction_VERB:
@@ -656,7 +656,7 @@ IMPL_LINK_NOARG_TYPED(SdTPAction, SelectTreeHdl, SvTreeListBox*, void)
m_pEdtBookmark->SetText( m_pLbTree->GetSelectEntry() );
}
-IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
+IMPL_LINK_NOARG_TYPED(SdTPAction, CheckFileHdl, Control&, void)
{
OUString aFile( GetEditText() );
@@ -700,8 +700,6 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
else
m_pLbTreeDocument->Hide();
}
-
- return 0L;
}
presentation::ClickAction SdTPAction::GetActualClickAction()
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 72eec7ece054..05b504e6ea60 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -82,7 +82,7 @@ private:
DECL_LINK_TYPED( ClickSearchHdl, Button*, void );
DECL_LINK( ClickActionHdl, void * );
DECL_LINK_TYPED( SelectTreeHdl, SvTreeListBox*, void );
- DECL_LINK( CheckFileHdl, void * );
+ DECL_LINK_TYPED( CheckFileHdl, Control&, void );
void UpdateTree();
void OpenFileDialog();