summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2015-10-04 15:05:38 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-12 10:48:13 +0000
commit3c99f8500f657ed84b316390d5175a6f5e56bc69 (patch)
tree749f16652560a50d409b12a23bf1a5d93b3cd2d5 /basctl
parentbbadb38539eb233ac45b267034066a7274181c65 (diff)
convert Link<> to typed
Change-Id: Iec15042138e0715459b2c9e872a7464d75a6b1eb Reviewed-on: https://gerrit.libreoffice.org/19305 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/basicide/baside2.hxx2
-rw-r--r--basctl/source/basicide/baside2b.cxx3
-rw-r--r--basctl/source/basicide/moduldl2.cxx3
-rw-r--r--basctl/source/basicide/moduldlg.hxx2
-rw-r--r--basctl/source/dlged/managelang.cxx10
-rw-r--r--basctl/source/inc/managelang.hxx2
6 files changed, 9 insertions, 13 deletions
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 23a7863cbce5..ca6aa2dfaf8a 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -496,7 +496,7 @@ public:
void InsertSelectedEntry(); //insert the selected entry
DECL_LINK_TYPED(ImplDoubleClickHdl, ListBox&, void);
- DECL_LINK(ImplSelectHdl, void*);
+ DECL_LINK_TYPED(ImplSelectHdl, ListBox&, void);
protected:
virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE;
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index b060c6248998..4580924d08ab 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2647,10 +2647,9 @@ IMPL_LINK_NOARG_TYPED(CodeCompleteListBox, ImplDoubleClickHdl, ListBox&, void)
InsertSelectedEntry();
}
-IMPL_LINK_NOARG(CodeCompleteListBox, ImplSelectHdl)
+IMPL_LINK_NOARG_TYPED(CodeCompleteListBox, ImplSelectHdl, ListBox&, void)
{//give back the focus to the parent
pCodeCompleteWindow->pParent->GrabFocus();
- return 0;
}
ExtTextView* CodeCompleteListBox::GetParentEditView()
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 5d5cecdd96a8..1ddf3d735e89 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -611,11 +611,10 @@ IMPL_LINK_TYPED( LibPage, TreeListHighlightHdl, SvTreeListBox *, pBox, void )
CheckButtons();
}
-IMPL_LINK( LibPage, BasicSelectHdl, ListBox *, /*pBox*/ )
+IMPL_LINK_NOARG_TYPED( LibPage, BasicSelectHdl, ListBox&, void )
{
SetCurLib();
CheckButtons();
- return 0;
}
IMPL_LINK_TYPED( LibPage, ButtonHdl, Button *, pButton, void )
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index d7e16514ad86..e23e6c4f810f 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -230,7 +230,7 @@ protected:
LibraryLocation m_eCurLocation;
DECL_LINK_TYPED( TreeListHighlightHdl, SvTreeListBox *, void );
- DECL_LINK( BasicSelectHdl, ListBox * );
+ DECL_LINK_TYPED( BasicSelectHdl, ListBox&, void );
DECL_LINK_TYPED( ButtonHdl, Button *, void );
DECL_LINK_TYPED( CheckPasswordHdl, SvxPasswordDialog *, bool );
void CheckButtons();
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index fcc515ac3692..3d4fb1f4f19b 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -70,7 +70,7 @@ ManageLanguageDialog::ManageLanguageDialog(vcl::Window* pParent, std::shared_ptr
Init();
FillLanguageBox();
- SelectHdl( NULL );
+ SelectHdl( *m_pLanguageLB );
}
ManageLanguageDialog::~ManageLanguageDialog()
@@ -193,7 +193,7 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, DeleteHdl, Button*, void)
if ( nCount <= nPos )
nPos = nCount - 1;
m_pLanguageLB->SelectEntryPos( nPos );
- SelectHdl( NULL );
+ SelectHdl( *m_pLanguageLB );
}
}
@@ -210,11 +210,11 @@ IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, MakeDefHdl, Button*, void)
FillLanguageBox();
// reset selection
m_pLanguageLB->SelectEntryPos( nPos );
- SelectHdl( NULL );
+ SelectHdl( *m_pLanguageLB );
}
}
-IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl)
+IMPL_LINK_NOARG_TYPED(ManageLanguageDialog, SelectHdl, ListBox&, void)
{
const sal_Int32 nCount = m_pLanguageLB->GetEntryCount();
bool bEmpty = ( !nCount ||
@@ -224,8 +224,6 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl)
m_pDeletePB->Enable(bEnable);
m_pMakeDefPB->Enable(bEnable && nCount > 1 && m_pLanguageLB->GetSelectEntryCount() == 1);
-
- return 1;
}
// class SetDefaultLanguageDialog -----------------------------------------------
diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx
index 469ee685f5ff..c6017299d7f5 100644
--- a/basctl/source/inc/managelang.hxx
+++ b/basctl/source/inc/managelang.hxx
@@ -69,7 +69,7 @@ private:
DECL_LINK_TYPED(AddHdl, Button*, void);
DECL_LINK_TYPED(DeleteHdl, Button*, void);
DECL_LINK_TYPED(MakeDefHdl, Button*, void);
- DECL_LINK(SelectHdl, void *);
+ DECL_LINK_TYPED(SelectHdl, ListBox&, void);
public:
ManageLanguageDialog( vcl::Window* pParent, std::shared_ptr<LocalizationMgr> _pLMgr );