diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2015-07-18 17:23:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-20 08:01:58 +0000 |
| commit | 91b1f300cf7f357c3a39d0d5810326cc78d78f16 (patch) | |
| tree | a89ef37ce86d8fe5babde77a43a098001ca3c164 /cui | |
| parent | bca4d6f896fb12ceff37476c43ea8892898dd385 (diff) | |
convert to typed Link<> in sfx2
Change-Id: Ifa42bd14d7329ff1043fa736513c468dda30485e
Reviewed-on: https://gerrit.libreoffice.org/17195
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/acccfg.cxx | 14 | ||||
| -rw-r--r-- | cui/source/inc/acccfg.hxx | 4 |
2 files changed, 7 insertions, 11 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 6bf6282e6eb8..6db36dc1bb29 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1231,7 +1231,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl) } -IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl) +IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, void) { assert(m_pFileDlg); @@ -1240,7 +1240,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl) sCfgName = m_pFileDlg->GetPath(); if ( sCfgName.isEmpty() ) - return 0; + return; GetTabDialog()->EnterWait(); @@ -1312,12 +1312,10 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl) {} GetTabDialog()->LeaveWait(); - - return 0; } -IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl) +IMPL_LINK_NOARG_TYPED(SfxAcceleratorConfigPage, SaveHdl, sfx2::FileDialogHelper*, void) { assert(m_pFileDlg); @@ -1326,7 +1324,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl) sCfgName = m_pFileDlg->GetPath(); if ( sCfgName.isEmpty() ) - return 0; + return; GetTabDialog()->EnterWait(); @@ -1415,8 +1413,6 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl) {} GetTabDialog()->LeaveWait(); - - return 0; } @@ -1433,7 +1429,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& r m_pFileDlg->AddFilter( aFilterCfgStr, OUString("*.cfg") ); m_pFileDlg->SetCurrentFilter( aFilterCfgStr ); - Link<> aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl ) + Link<sfx2::FileDialogHelper*,void> aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl ) : LINK( this, SfxAcceleratorConfigPage, LoadHdl ); m_pFileDlg->StartExecuteModal( aDlgClosedLink ); } diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index 4a31d77156cd..9f05168476d0 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -155,8 +155,8 @@ private: DECL_LINK(Default, void *); DECL_LINK(RadioHdl, void *); - DECL_LINK(LoadHdl, void *); - DECL_LINK(SaveHdl, void *); + DECL_LINK_TYPED(LoadHdl, sfx2::FileDialogHelper *, void); + DECL_LINK_TYPED(SaveHdl, sfx2::FileDialogHelper *, void); OUString GetLabel4Command(const OUString& rCommand); void InitAccCfg(); |