summaryrefslogtreecommitdiff
path: root/cui/source/customize/acccfg.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-30 10:20:00 +0200
commit3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch)
treebdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /cui/source/customize/acccfg.cxx
parent57d254d42b6e1d836bd21e6fb2e968af2b511c7d (diff)
Gradually typed Link
Turn the Link class into a template abstracting over the link's argument and return types, but provide default template arguments that keep the generic, unsafe "void* in, sal_IntPtr out" behvior. That way, individual uses of the Link class can be updated over time. All the related macros are duplicated with ..._TYPED counterparts, that additionally take the RetType (except for LINK_TYPED, which manages to infer the relevant types from the supplied Member). (It would have been attractive to change the "untyped" LinkStubs from taking a void* to a properly typed ArgType parameter, too, but that would cause -fsanitize=function to flag uses of "untyped" Link::Call.) Change-Id: I3b0140378bad99abbf240140ebb4a46a05d2d2f8
Diffstat (limited to 'cui/source/customize/acccfg.cxx')
-rw-r--r--cui/source/customize/acccfg.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 40360a67a398..9fbd9516a908 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1094,7 +1094,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl)
sal_uInt16 nCol = m_pEntriesBox->TabCount() - 1;
m_pEntriesBox->SetEntryText(sLabel, nPos, nCol);
- ((Link &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
+ ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
return 0;
}
@@ -1109,7 +1109,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
m_pEntriesBox->SetEntryText( OUString(), nPos, nCol );
(pEntry->m_sCommand).clear();
- ((Link &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
+ ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
return 0;
}
@@ -1230,7 +1230,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl)
if ( pEntry )
m_pGroupLBox->Select( pEntry );
- ((Link &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
+ ((Link<> &) m_pFunctionBox->GetSelectHdl()).Call( m_pFunctionBox );
return 1L;
}
@@ -1438,7 +1438,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<> aDlgClosedLink = bSave ? LINK( this, SfxAcceleratorConfigPage, SaveHdl )
: LINK( this, SfxAcceleratorConfigPage, LoadHdl );
m_pFileDlg->StartExecuteModal( aDlgClosedLink );
}