summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-16 16:10:05 +0200
committerNoel Grandin <noel@peralex.com>2015-09-17 08:19:34 +0200
commit1e2119fd0211b671cad7ba7005a99a1da1a0caf5 (patch)
treec4298af25e9a082066ad98a69c5c6c281a360ac5 /cui
parentf4f05ab199101b9f11718ddc82e139815c1fc521 (diff)
convert Link<> to typed
Change-Id: I3d35a0bb75b6989dd13371543d1bdf3ef5f47641
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/SpellDialog.cxx3
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx3
-rw-r--r--cui/source/dialogs/insdlg.cxx3
-rw-r--r--cui/source/dialogs/pastedlg.cxx5
-rw-r--r--cui/source/inc/SpellDialog.hxx2
-rw-r--r--cui/source/inc/cuigaldlg.hxx2
-rw-r--r--cui/source/inc/insdlg.hxx2
-rw-r--r--cui/source/inc/pastedlg.hxx2
-rw-r--r--cui/source/options/optjava.cxx3
-rw-r--r--cui/source/options/optjava.hxx2
10 files changed, 10 insertions, 17 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 0312c9683fc2..2d3df7d7c14b 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -569,10 +569,9 @@ OUString SpellDialog::getReplacementString() const
-IMPL_LINK_NOARG(SpellDialog, DoubleClickChangeHdl)
+IMPL_LINK_NOARG_TYPED(SpellDialog, DoubleClickChangeHdl, ListBox&, void)
{
ChangeHdl(NULL);
- return 0;
}
IMPL_LINK_NOARG_TYPED(SpellDialog, ChangeHdl, Button*, void)
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index d89872e2fc4e..1a5d0fd91b69 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -1210,7 +1210,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl)
-IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl)
+IMPL_LINK_NOARG_TYPED(TPGalleryThemeProperties, DClickFoundHdl, ListBox&, void)
{
if( bInputAllowed )
{
@@ -1219,7 +1219,6 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl)
if (m_pLbxFound->GetSelectEntryCount() == 1 && bEntriesFound)
ClickTakeHdl(NULL);
}
- return 0;
}
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index eb59e4594af5..8e5bc95953a6 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -101,10 +101,9 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl(vcl::Window * pParent, const OU
-IMPL_LINK_NOARG(SvInsertOleDlg, DoubleClickHdl)
+IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, DoubleClickHdl, ListBox&, void)
{
EndDialog( RET_OK );
- return 0;
}
IMPL_LINK_NOARG_TYPED(SvInsertOleDlg, BrowseHdl, Button*, void)
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 8aac59a7e2d3..afec285c61f6 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -82,12 +82,9 @@ IMPL_LINK( SvPasteObjectDialog, SelectHdl, ListBox *, pListBox )
return 0;
}
-IMPL_LINK( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox )
+IMPL_LINK_NOARG_TYPED( SvPasteObjectDialog, DoubleClickHdl, ListBox&, void )
{
- (void)pListBox;
-
EndDialog( RET_OK );
- return 0;
}
/*************************************************************************
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index c33921c9e26f..83495df9db56 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -172,7 +172,7 @@ private:
css::linguistic2::XSpellChecker1 > xSpell;
DECL_LINK_TYPED(ChangeHdl, Button*, void);
- DECL_LINK(DoubleClickChangeHdl, void*);
+ DECL_LINK_TYPED(DoubleClickChangeHdl, ListBox&, void);
DECL_LINK_TYPED(ChangeAllHdl, Button*, void);
DECL_LINK_TYPED( IgnoreAllHdl, Button*, void );
DECL_LINK_TYPED(IgnoreHdl, Button*, void);
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 30036c718da5..43f073719acf 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -284,7 +284,7 @@ class TPGalleryThemeProperties : public SfxTabPage
DECL_LINK_TYPED( ClickTakeAllHdl, Button*, void );
DECL_LINK( SelectFoundHdl, void* );
DECL_LINK( SelectFileTypeHdl, void* );
- DECL_LINK( DClickFoundHdl, void* );
+ DECL_LINK_TYPED( DClickFoundHdl, ListBox&, void );
DECL_LINK_TYPED( PreviewTimerHdl, Timer*, void );
DECL_LINK(EndSearchProgressHdl, void *);
DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void );
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 29ac1132220a..128339158496 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -69,7 +69,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
css::uno::Sequence< sal_Int8 > m_aIconMetaFile;
OUString m_aIconMediaType;
- DECL_LINK(DoubleClickHdl, void*);
+ DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void);
DECL_LINK_TYPED(BrowseHdl, Button*, void);
DECL_LINK_TYPED(RadioHdl, Button*, void);
void SelectDefault();
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index c634dc715a6b..26a439f80402 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -51,7 +51,7 @@ class SvPasteObjectDialog : public ModalDialog
void SelectObject();
DECL_LINK( SelectHdl, ListBox * );
- DECL_LINK( DoubleClickHdl, ListBox * );
+ DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void );
public:
SvPasteObjectDialog( vcl::Window* pParent );
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 8c805b8f6871..552bd17f2a49 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -869,12 +869,11 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl)
-IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxJavaParameterDlg, DblClickHdl_Impl, ListBox&, void)
{
sal_Int32 nPos = m_pAssignedList->GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
m_pParameterEdit->SetText( m_pAssignedList->GetEntry( nPos ) );
- return 0;
}
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index c4f9602ca428..a139fa27da17 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -130,7 +130,7 @@ private:
DECL_LINK(ModifyHdl_Impl, void *);
DECL_LINK_TYPED(AssignHdl_Impl, Button*, void);
DECL_LINK(SelectHdl_Impl, void *);
- DECL_LINK(DblClickHdl_Impl, void *);
+ DECL_LINK_TYPED(DblClickHdl_Impl, ListBox&, void);
DECL_LINK_TYPED(RemoveHdl_Impl, Button*, void);
inline void EnableRemoveButton()