summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-16 12:35:30 +0200
committerNoel Grandin <noel@peralex.com>2015-10-16 12:35:54 +0200
commit8d44385bf64c1ea9bdb9100fc7ed005ac7071968 (patch)
tree4d0897a98757d40ff212f2328a9a8bd433aeaf61 /cui/source
parente324766d54ef67625b4ca9ba727a95316c2a1dc5 (diff)
convert Link<> to typed
Change-Id: I48893ac7130ad671864faa5eb55409b21cdda77e
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/dialogs/SpellDialog.cxx8
-rw-r--r--cui/source/inc/SpellDialog.hxx2
-rw-r--r--cui/source/inc/optlingu.hxx12
-rw-r--r--cui/source/options/optlingu.cxx6
4 files changed, 12 insertions, 16 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index c263b7e9a2f0..9134302d55c1 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -2016,13 +2016,13 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet)
pSpellDialog->m_pChangePB->Enable();
}
-IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink*, pHyperlink )
+IMPL_LINK_TYPED( SpellDialog, HandleHyperlink, FixedHyperlink&, rHyperlink, void )
{
- OUString sURL=pHyperlink->GetURL();
+ OUString sURL=rHyperlink.GetURL();
OUString sTitle=GetText();
if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty
- return 1;
+ return;
try
{
uno::Reference< css::system::XSystemShellExecute > xSystemShellExecute(
@@ -2038,8 +2038,6 @@ IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink*, pHyperlink )
aErrorBox->SetText(sTitle);
aErrorBox->Execute();
}
-
- return 1;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 40497fbd3fff..449271d5b2fd 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -185,7 +185,7 @@ private:
DECL_LINK_TYPED( AddToDictClickHdl, Button*, void );
DECL_LINK_TYPED( LanguageSelectHdl, ListBox&, void );
DECL_LINK_TYPED( DialogUndoHdl, SpellUndoAction_Impl&, void );
- DECL_LINK( HandleHyperlink, FixedHyperlink * );
+ DECL_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void );
DECL_LINK_TYPED( InitHdl, void*, void );
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 3653b927d837..dd0730f6bb7e 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -74,14 +74,14 @@ class SvxEditModulesDlg : public ModalDialog
SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol);
- DECL_LINK_TYPED(SelectHdl_Impl, SvTreeListBox*, void);
- DECL_LINK_TYPED(UpDownHdl_Impl, Button*, void);
- DECL_LINK_TYPED(ClickHdl_Impl, Button*, void);
- DECL_LINK_TYPED(BackHdl_Impl, Button*, void);
+ DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void );
+ DECL_LINK_TYPED( UpDownHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( ClickHdl_Impl, Button*, void );
+ DECL_LINK_TYPED( BackHdl_Impl, Button*, void );
DECL_LINK_TYPED( LangSelectListBoxHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void );
DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void );
- DECL_LINK(OpenURLHdl_Impl, void *);
+ DECL_LINK_TYPED( OpenURLHdl_Impl, FixedHyperlink&, void );
void LangSelectHdl_Impl(ListBox*);
public:
@@ -143,7 +143,7 @@ private:
DECL_LINK_TYPED( BoxDoubleClickHdl_Impl, SvTreeListBox*, bool );
DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void );
DECL_LINK_TYPED( PostDblClickHdl_Impl, void *, void);
- DECL_LINK( OpenURLHdl_Impl, void *);
+ DECL_LINK_TYPED( OpenURLHdl_Impl, FixedHyperlink&, void );
void UpdateModulesBox_Impl();
void UpdateDicBox_Impl();
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 4010e37cb941..41c142222b15 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1540,11 +1540,10 @@ IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, PostDblClickHdl_Impl, void*, void)
-IMPL_LINK_NOARG(SvxLinguTabPage, OpenURLHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxLinguTabPage, OpenURLHdl_Impl, FixedHyperlink&, void)
{
OUString sURL( m_pMoreDictsLink->GetURL() );
lcl_OpenURL( sURL );
- return 0;
}
@@ -2312,11 +2311,10 @@ IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, BackHdl_Impl, Button*, void)
-IMPL_LINK_NOARG(SvxEditModulesDlg, OpenURLHdl_Impl)
+IMPL_LINK_NOARG_TYPED(SvxEditModulesDlg, OpenURLHdl_Impl, FixedHyperlink&, void)
{
OUString sURL( m_pMoreDictsLink->GetURL() );
lcl_OpenURL( sURL );
- return 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */