diff options
author | Noel Grandin <noel@peralex.com> | 2015-08-27 13:08:02 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-08-28 09:49:56 +0200 |
commit | bd8b93fdff93ff7b2b7e493a7bcef6a59f299dae (patch) | |
tree | f05be9665737f0667faf95702d96fbf3f0a103c5 /sw/source/uibase/shells | |
parent | 1b9c3a17e8496aedfb80528c5275e6658154789d (diff) |
make PostUserEvent Link<> typed
Change-Id: I13f10bda985d55d419a5bff481130a456ae2db8a
Diffstat (limited to 'sw/source/uibase/shells')
-rw-r--r-- | sw/source/uibase/shells/textsh2.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sw/source/uibase/shells/textsh2.cxx b/sw/source/uibase/shells/textsh2.cxx index cf95548cb6b9..925d2af5c0cc 100644 --- a/sw/source/uibase/shells/textsh2.cxx +++ b/sw/source/uibase/shells/textsh2.cxx @@ -154,8 +154,7 @@ void SwTextShell::ExecDB(SfxRequest &rReq) pNew->xCursor = xCursor; pNew->xConnection = xConnection; - Application::PostUserEvent( LINK( this, SwBaseShell, - InsertDBTextHdl ), pNew ); + Application::PostUserEvent( LINK( this, SwBaseShell, InsertDBTextHdl ), pNew ); // the pNew will be removed in InsertDBTextHdl !! } } @@ -234,8 +233,9 @@ void SwTextShell::ExecDB(SfxRequest &rReq) } } -IMPL_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct ) +IMPL_LINK_TYPED( SwBaseShell, InsertDBTextHdl, void*, p, void ) { + DBTextStruct_Impl* pDBStruct = static_cast<DBTextStruct_Impl*>(p); if( pDBStruct ) { bool bDispose = false; @@ -243,7 +243,7 @@ IMPL_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct ) Reference<XDataSource> xSource = SwDBManager::getDataSourceAsParent(xConnection,pDBStruct->aDBData.sDataSource); // #111987# the connection is disposed an so no parent has been found if(xConnection.is() && !xSource.is()) - return 0; + return; if ( !xConnection.is() ) { @@ -278,7 +278,6 @@ IMPL_LINK( SwBaseShell, InsertDBTextHdl, DBTextStruct_Impl*, pDBStruct ) } delete pDBStruct; - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |