diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-30 10:20:00 +0200 |
| commit | 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed (patch) | |
| tree | bdfd28afe5a452060e3d985c5f01b45f4b7bc2cd /uui | |
| parent | 57d254d42b6e1d836bd21e6fb2e968af2b511c7d (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 'uui')
| -rw-r--r-- | uui/source/iahndl.cxx | 4 | ||||
| -rw-r--r-- | uui/source/nameclashdlg.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index e0ea07c1b85f..1f20c31ccafc 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -176,7 +176,7 @@ UUIInteractionHelper::handleRequest( ) { // we are not in the main thread, let it handle that stuff HandleData aHD(rRequest); - Link aLink(&aHD,handlerequest); + Link<> aLink(&aHD,handlerequest); Application::PostUserEvent(aLink,this); SolarMutexReleaser aReleaser; aHD.wait(); @@ -232,7 +232,7 @@ UUIInteractionHelper::getStringFromRequest( ) { // we are not in the main thread, let it handle that stuff HandleData aHD(rRequest); - Link aLink(&aHD,getstringfromrequest); + Link<> aLink(&aHD,getstringfromrequest); Application::PostUserEvent(aLink,this); SolarMutexReleaser aReleaser; aHD.wait(); diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx index 06ff359bf3ca..0911605a7863 100644 --- a/uui/source/nameclashdlg.cxx +++ b/uui/source/nameclashdlg.cxx @@ -63,7 +63,7 @@ NameClashDialog::NameClashDialog( vcl::Window* pParent, ResMgr* pResMgr, get(m_pBtnRename, "rename"); get(m_pBtnCancel, "cancel"); - Link aLink( LINK( this, NameClashDialog, ButtonHdl_Impl ) ); + Link<> aLink( LINK( this, NameClashDialog, ButtonHdl_Impl ) ); m_pBtnOverwrite->SetClickHdl( aLink ); m_pBtnRename->SetClickHdl( aLink ); m_pBtnCancel->SetClickHdl( aLink ); |