diff options
Diffstat (limited to 'dbaccess/source/ui')
33 files changed, 61 insertions, 94 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index e2ac9570173d..52e99495efae 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -1897,11 +1897,10 @@ IMPL_LINK( OApplicationController, OnSelectContainer, void*, _pType ) return 0L; } -IMPL_LINK( OApplicationController, OnCreateWithPilot, void*, _pType ) +IMPL_LINK_TYPED( OApplicationController, OnCreateWithPilot, void*, _pType, void ) { ElementType eType = (ElementType)reinterpret_cast< sal_IntPtr >( _pType ); newElementWithPilot( eType ); - return 0L; } void OApplicationController::newElementWithPilot( ElementType _eType ) diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index fda9a6a5576e..034a69aec8c4 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -525,8 +525,8 @@ namespace dbaui void OnInvalidateClipboard(); DECL_LINK_TYPED( OnClipboardChanged, TransferableDataHelper*, void ); - DECL_LINK( OnAsyncDrop, void* ); - DECL_LINK( OnCreateWithPilot, void* ); + DECL_LINK_TYPED( OnAsyncDrop, void*, void ); + DECL_LINK_TYPED( OnCreateWithPilot, void*, void ); DECL_LINK( OnSelectContainer, void* ); void OnFirstControllerConnected(); diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index f2943256c0a1..484acf870e8d 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -796,7 +796,7 @@ bool OApplicationController::isTableFormat() const return OTableCopyHelper::isTableFormat(getViewClipboard()); } -IMPL_LINK_NOARG( OApplicationController, OnAsyncDrop ) +IMPL_LINK_NOARG_TYPED( OApplicationController, OnAsyncDrop, void*, void ) { m_nAsyncDrop = 0; SolarMutexGuard aSolarGuard; @@ -828,8 +828,6 @@ IMPL_LINK_NOARG( OApplicationController, OnAsyncDrop ) } m_aAsyncDrop.aDroppedData.clear(); - - return 0L; } } // namespace dbaui diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index d7723afd2c58..c935867d9ddc 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -127,7 +127,7 @@ namespace // class OPreviewWindow class OTablePreviewWindow : public vcl::Window { - DECL_LINK(OnDisableInput, void*); + DECL_LINK_TYPED(OnDisableInput, void*, void); void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; @@ -146,10 +146,9 @@ namespace PostUserEvent( LINK( this, OTablePreviewWindow, OnDisableInput), NULL, true ); return nRet; } - IMPL_LINK_NOARG(OTablePreviewWindow, OnDisableInput) + IMPL_LINK_NOARG_TYPED(OTablePreviewWindow, OnDisableInput, void*, void) { EnableInput(false); - return 0L; } void OTablePreviewWindow::DataChanged( const DataChangedEvent& rDCEvt ) { diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index b7ddc1500474..f8c57cef4695 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -170,10 +170,9 @@ IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pCo return 1L; } -IMPL_LINK_NOARG(OApplicationSwapWindow, ChangeToLastSelected) +IMPL_LINK_NOARG_TYPED(OApplicationSwapWindow, ChangeToLastSelected, void*, void) { selectContainer(m_eLastType); - return 0L; } void OApplicationSwapWindow::selectContainer(ElementType _eType) diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index 11f04fc9aef8..dba8d5f9db5b 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -38,7 +38,7 @@ namespace dbaui void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* ); - DECL_LINK( ChangeToLastSelected, void* ); + DECL_LINK_TYPED( ChangeToLastSelected, void*, void ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; public: diff --git a/dbaccess/source/ui/browser/AsynchronousLink.cxx b/dbaccess/source/ui/browser/AsynchronousLink.cxx index 8dd872f30ca8..6b2dbe43cbce 100644 --- a/dbaccess/source/ui/browser/AsynchronousLink.cxx +++ b/dbaccess/source/ui/browser/AsynchronousLink.cxx @@ -65,7 +65,7 @@ void OAsynchronousLink::CancelCall() m_nEventId = 0; } -IMPL_LINK(OAsynchronousLink, OnAsyncCall, void*, _pArg) +IMPL_LINK_TYPED(OAsynchronousLink, OnAsyncCall, void*, _pArg, void) { { ::osl::MutexGuard aDestructionGuard( m_aDestructionSafety ); @@ -74,14 +74,12 @@ IMPL_LINK(OAsynchronousLink, OnAsyncCall, void*, _pArg) if (!m_nEventId) // our destructor deleted the event just while we are waiting for m_aEventSafety // -> get outta here - return 0; + return; m_nEventId = 0; } } if (m_aHandler.IsSet()) - return m_aHandler.Call(_pArg); - - return 0L; + m_aHandler.Call(_pArg); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index dbec28796059..2f514739eefa 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -215,7 +215,7 @@ namespace dbaui if (pTransfer) pTransfer->CopyToClipboard(getView()); } - IMPL_LINK_NOARG( SbaTableQueryBrowser, OnAsyncDrop ) + IMPL_LINK_NOARG_TYPED( SbaTableQueryBrowser, OnAsyncDrop, void*, void ) { m_nAsyncDrop = 0; SolarMutexGuard aSolarGuard; @@ -232,8 +232,6 @@ namespace dbaui } m_aAsyncDrop.aDroppedData.clear(); - - return 0L; } void SbaTableQueryBrowser::clearTreeModel() { diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 29ca432949cc..a1f1b707d75a 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -361,7 +361,7 @@ Reference< css::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDispatch(const c return FmXGridPeer::queryDispatch(aURL, aTargetFrameName, nSearchFlags); } -IMPL_LINK_NOARG( SbaXGridPeer, OnDispatchEvent ) +IMPL_LINK_NOARG_TYPED( SbaXGridPeer, OnDispatchEvent, void*, void ) { VclPtr< SbaGridControl > pGrid = GetAs< SbaGridControl >(); if ( pGrid ) // if this fails, we were disposing before arriving here @@ -380,8 +380,6 @@ IMPL_LINK_NOARG( SbaXGridPeer, OnDispatchEvent ) SbaXGridPeer::dispatch( aArgs.aURL, aArgs.aArgs ); } } - - return 0; } SbaXGridPeer::DispatchType SbaXGridPeer::classifyDispatchURL( const URL& _rURL ) @@ -1444,7 +1442,7 @@ Reference< XPropertySet > SbaGridControl::getDataSource() const return xReturn; } -IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent) +IMPL_LINK_NOARG_TYPED(SbaGridControl, AsynchDropEvent, void*, void) { m_nAsyncDropEvent = 0; @@ -1487,8 +1485,6 @@ IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent) setDataSource(Reference< XRowSet >(xDataSource,UNO_QUERY)); } m_aDataDescriptor.clear(); - - return 0L; } OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 0ba230eb9138..d1603a2a1628 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -120,10 +120,10 @@ namespace dbaui virtual void CellModified() SAL_OVERRIDE; - DECL_LINK( AsynchDeactivate, void* ); + DECL_LINK_TYPED( AsynchDeactivate, void*, void ); private: - DECL_LINK( AsynchActivate, void* ); + DECL_LINK_TYPED( AsynchActivate, void*, void ); }; @@ -200,16 +200,14 @@ namespace dbaui return EditBrowseBox::PreNotify(rNEvt); } - IMPL_LINK_NOARG(ORelationControl, AsynchActivate) + IMPL_LINK_NOARG_TYPED(ORelationControl, AsynchActivate, void*, void) { ActivateCell(); - return 0L; } - IMPL_LINK_NOARG(ORelationControl, AsynchDeactivate) + IMPL_LINK_NOARG_TYPED(ORelationControl, AsynchDeactivate, void*, void) { DeactivateCell(); - return 0L; } bool ORelationControl::IsTabAllowed(bool bForward) const diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 801dcd38ac1b..5316ef088533 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -167,18 +167,16 @@ bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt) return EditBrowseBox::PreNotify(rNEvt); } -IMPL_LINK_NOARG(OTableGrantControl, AsynchActivate) +IMPL_LINK_NOARG_TYPED(OTableGrantControl, AsynchActivate, void*, void) { m_nDeactivateEvent = 0; ActivateCell(); - return 0L; } -IMPL_LINK_NOARG(OTableGrantControl, AsynchDeactivate) +IMPL_LINK_NOARG_TYPED(OTableGrantControl, AsynchDeactivate, void*, void) { m_nDeactivateEvent = 0; DeactivateCell(); - return 0L; } bool OTableGrantControl::IsTabAllowed(bool bForward) const diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 77edc1fbd907..4e264008184d 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -181,13 +181,13 @@ void DBTreeListBox::MouseButtonDown( const MouseEvent& rMEvt ) SvTreeListBox::MouseButtonDown(rMEvt); } -IMPL_LINK(DBTreeListBox, OnResetEntry, SvTreeListEntry*, pEntry) +IMPL_LINK_TYPED(DBTreeListBox, OnResetEntry, void*, p, void) { + SvTreeListEntry* pEntry = static_cast<SvTreeListEntry*>(p); // set the flag which allows if the entry can be expanded pEntry->SetFlags( (pEntry->GetFlags() & ~SvTLEntryFlags(SvTLEntryFlags::NO_NODEBMP | SvTLEntryFlags::HAD_CHILDREN)) | SvTLEntryFlags::CHILDREN_ON_DEMAND ); // redraw the entry GetModel()->InvalidateEntry( pEntry ); - return 0L; } void DBTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* _pEntry ) diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index b97d8ed546cc..30885ab5cc5f 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -318,10 +318,9 @@ namespace dbaui { EndDialog( RET_OK ); } - IMPL_LINK_NOARG( DirectSQLDialog, OnClose ) + IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnClose, void*, void ) { EndDialog( RET_OK ); - return 0L; } IMPL_LINK_NOARG_TYPED( DirectSQLDialog, OnExecute, Button*, void ) diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index baa9047c6c45..ac120a40723c 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -123,7 +123,7 @@ IMPL_LINK_NOARG_TYPED(ODatasourceSelectDialog, ManageClickHdl, Button*, void) SAL_WARN_IF( !m_pODBCManagement->isRunning(), "dbaccess.ui", "ODatasourceSelectDialog::ManageClickHdl: success, but not running - you were *fast*!" ); } -IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished ) +IMPL_LINK_NOARG_TYPED( ODatasourceSelectDialog, ManageProcessFinished, void*, void ) { StringBag aOdbcDatasources; OOdbcEnumeration aEnumeration; @@ -134,8 +134,6 @@ IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished ) m_pOk->Enable(); m_pCancel->Enable(); m_pManageDatasources->Enable(); - - return 0L; } #endif diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 31c8116ba9e9..842047f8c76e 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -64,7 +64,7 @@ protected: DECL_LINK( ListDblClickHdl, ListBox * ); #ifdef HAVE_ODBC_ADMINISTRATION DECL_LINK_TYPED(ManageClickHdl, Button*, void); - DECL_LINK( ManageProcessFinished, void* ); + DECL_LINK_TYPED( ManageProcessFinished, void*, void ); #endif void fillListBox(const StringBag& _rDatasources); }; diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 6fff7c236cd1..8f5df59ef519 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -603,11 +603,11 @@ namespace dbaui EndDialog(RET_OK); } - IMPL_LINK( DbaIndexDialog, OnEditIndexAgain, SvTreeListEntry*, _pEntry ) + IMPL_LINK_TYPED( DbaIndexDialog, OnEditIndexAgain, void*, p, void ) { + SvTreeListEntry* _pEntry = static_cast<SvTreeListEntry*>(p); m_bEditAgain = false; m_pIndexList->EditEntry(_pEntry); - return 0L; } IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvTreeListEntry*, _pEntry ) diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index ace45b3f3875..b04aa698db60 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -240,11 +240,11 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames) // ProcessTerminationWait class ProcessTerminationWait : public ::osl::Thread { - oslProcess m_hProcessHandle; - Link<> m_aFinishHdl; + oslProcess m_hProcessHandle; + Link<void*,void> m_aFinishHdl; public: - ProcessTerminationWait( oslProcess _hProcessHandle, const Link<>& _rFinishHdl ) + ProcessTerminationWait( oslProcess _hProcessHandle, const Link<void*,void>& _rFinishHdl ) :m_hProcessHandle( _hProcessHandle ) ,m_aFinishHdl( _rFinishHdl ) { @@ -262,7 +262,7 @@ protected: }; // OOdbcManagement -OOdbcManagement::OOdbcManagement(const Link<>& rAsyncFinishCallback) +OOdbcManagement::OOdbcManagement(const Link<void*,void>& rAsyncFinishCallback) : m_aAsyncFinishCallback(rAsyncFinishCallback) { } diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index 3da0b739f575..3059b1dcf06b 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -105,10 +105,10 @@ class ProcessTerminationWait; class OOdbcManagement { ::std::unique_ptr< ProcessTerminationWait > m_pProcessWait; - Link<> m_aAsyncFinishCallback; + Link<void*,void> m_aAsyncFinishCallback; public: - explicit OOdbcManagement( const Link<>& _rAsyncFinishCallback ); + explicit OOdbcManagement( const Link<void*,void>& _rAsyncFinishCallback ); ~OOdbcManagement(); bool manageDataSources_async(); diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 75b99d31761f..1d7c81be9df7 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -77,7 +77,7 @@ namespace dbaui virtual void reset() SAL_OVERRIDE; virtual void impl_initialize() SAL_OVERRIDE; virtual OUString getPrivateTitle( ) const SAL_OVERRIDE; - DECL_LINK( OnThreadFinished, void* ); + DECL_LINK_TYPED( OnThreadFinished, void*, void ); }; } #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONCONTROLLER_HXX diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 9d73ff7e3919..d7886860482a 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -96,8 +96,8 @@ protected: virtual void CellModified() SAL_OVERRIDE; private: - DECL_LINK( AsynchActivate, void* ); - DECL_LINK( AsynchDeactivate, void* ); + DECL_LINK_TYPED( AsynchActivate, void*, void ); + DECL_LINK_TYPED( AsynchDeactivate, void*, void ); static bool isAllowed(sal_uInt16 _nColumnId,sal_Int32 _nPrivilege); void fillPrivilege(sal_Int32 _nRow) const; diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index c6199d3c087f..7b590cf38270 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -50,8 +50,8 @@ namespace dbaui DECL_LINK( OnDoubleClick, SvTreeListBox* ); DECL_LINK_TYPED( ScrollUpHdl, Timer*, void ); DECL_LINK_TYPED( ScrollDownHdl, Timer*, void ); - DECL_LINK( DropHdl, void* ); - DECL_LINK( LookForUiHdl, void* ); + DECL_LINK_TYPED( DropHdl, void*, void ); + DECL_LINK_TYPED( LookForUiHdl, void*, void ); Timer m_aScrollTimer; Point m_aMousePos; diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 437bdd88b283..5875f795f7eb 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -75,7 +75,7 @@ namespace dbaui private: void init(); DECL_LINK_TYPED( OnTimeOut, Timer*, void ); - DECL_LINK( OnResetEntry, SvTreeListEntry* ); + DECL_LINK_TYPED( OnResetEntry, void*, void ); DECL_LINK( ScrollUpHdl, SvTreeListBox* ); DECL_LINK( ScrollDownHdl, SvTreeListBox* ); diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index df80ad6b8b31..972261f59822 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -86,7 +86,7 @@ namespace dbaui protected: DECL_LINK_TYPED( OnExecute, Button*, void ); - DECL_LINK( OnClose, void* ); + DECL_LINK_TYPED( OnClose, void*, void ); DECL_LINK_TYPED( OnCloseClick, Button*, void ); DECL_LINK( OnListEntrySelected, void* ); DECL_LINK( OnStatementModified, void* ); diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 50f46556e974..3bcdc37a6465 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -137,7 +137,7 @@ namespace dbaui DECL_LINK( OnModified, void* ); DECL_LINK_TYPED( OnCloseDialog, Button*, void ); - DECL_LINK( OnEditIndexAgain, SvTreeListEntry* ); + DECL_LINK_TYPED( OnEditIndexAgain, void*, void ); private: sal_uInt16 mnNewCmdId; diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 5266a0ab4665..cdf2ac3d71f0 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -236,7 +236,7 @@ namespace dbaui virtual bool allowQueries() const SAL_OVERRIDE; private: - DECL_LINK( OnExecuteAddTable, void* ); + DECL_LINK_TYPED( OnExecuteAddTable, void*, void ); private: using OQueryController_PBase::getFastPropertyValue; diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 0ffd2f12910d..22b63a3cef2d 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -144,7 +144,7 @@ namespace dbaui css::uno::Sequence< css::beans::PropertyValue > aArgs; }; ::std::queue< DispatchArgs > m_aDispatchArgs; - DECL_LINK( OnDispatchEvent, void* ); + DECL_LINK_TYPED( OnDispatchEvent, void*, void ); // for dynamic states of our 4 dispatchable URLs enum DispatchType @@ -304,7 +304,7 @@ namespace dbaui SvNumberFormatter* GetDatasourceFormatter(); - DECL_LINK(AsynchDropEvent, void*); + DECL_LINK_TYPED(AsynchDropEvent, void*, void); private: bool IsReadOnlyDB() const; diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 8aad618d0e57..ccd7b5c3fb86 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -354,7 +354,7 @@ namespace dbaui DECL_LINK( OnTreeEntryCompare, const SvSortData* ); - DECL_LINK( OnAsyncDrop, void* ); + DECL_LINK_TYPED( OnAsyncDrop, void*, void ); void implRemoveStatusListeners(); diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx index 684347a49e6b..a03b51239b46 100644 --- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx +++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx @@ -54,10 +54,10 @@ namespace dbaui } private: - DECL_LINK( onExecute, void* ); + DECL_LINK_TYPED( onExecute, void*, void ); }; - IMPL_LINK_NOARG( DialogExecutor_Impl, onExecute ) + IMPL_LINK_NOARG_TYPED( DialogExecutor_Impl, onExecute, void*, void ) { try { @@ -69,7 +69,6 @@ namespace dbaui } delete this; - return 0L; } // AsyncDialogExecutor diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 47eaeb320758..b56469e24d4b 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -275,14 +275,13 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) return nDND_Action; } -IMPL_LINK_NOARG( OTableWindowListBox, LookForUiHdl ) +IMPL_LINK_NOARG_TYPED( OTableWindowListBox, LookForUiHdl, void*, void ) { m_nUiEvent = 0; m_pTabWin->getTableView()->lookForUiActivities(); - return 0L; } -IMPL_LINK_NOARG( OTableWindowListBox, DropHdl ) +IMPL_LINK_NOARG_TYPED( OTableWindowListBox, DropHdl, void*, void ) { // create the connection m_nDropEvent = 0; @@ -298,7 +297,6 @@ IMPL_LINK_NOARG( OTableWindowListBox, DropHdl ) // remember the exception so that we can show them later when d&d is finished m_pTabWin->getDesignView()->getController().setErrorOccurred(::dbtools::SQLExceptionInfo(e)); } - return 0L; } sal_Int8 OTableWindowListBox::ExecuteDrop( const ExecuteDropEvent& _rEvt ) diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 37976f0aa3f7..9a21da5e71ad 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1967,10 +1967,9 @@ void OQueryController::setEscapeProcessing_fireEvent( const bool _bEscapeProcess fire( &nHandle, &aNewValue, &aOldValue, 1, sal_False ); } -IMPL_LINK_NOARG( OQueryController, OnExecuteAddTable ) +IMPL_LINK_NOARG_TYPED( OQueryController, OnExecuteAddTable, void*, void ) { Execute( ID_BROWSER_ADDTABLE,Sequence<PropertyValue>() ); - return 0L; } bool OQueryController::allowViews() const diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 46a6c38c8ba3..3cb529731169 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -467,7 +467,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData } } -IMPL_LINK_NOARG( ORelationController, OnThreadFinished ) +IMPL_LINK_NOARG_TYPED( ORelationController, OnThreadFinished, void*, void ) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -486,7 +486,6 @@ IMPL_LINK_NOARG( ORelationController, OnThreadFinished ) DBG_UNHANDLED_EXCEPTION(); } m_pWaitObject.reset(); - return 0L; } void ORelationController::loadData() diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index f2ab8c30864c..3cc5fd5e1130 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -630,12 +630,10 @@ bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) return true; } -IMPL_LINK_NOARG( OTableEditorCtrl, InvalidateFieldType ) +IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, InvalidateFieldType, void*, void ) { nInvalidateTypeEvent = 0; Invalidate( GetFieldRectPixel(nOldDataPos, FIELD_TYPE) ); - - return 0; } void OTableEditorCtrl::CellModified( long nRow, sal_uInt16 nColId ) @@ -1462,14 +1460,13 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) } -IMPL_LINK_NOARG( OTableEditorCtrl, DelayedCut ) +IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedCut, void*, void ) { nCutEvent = 0; OTableRowView::cut(); - return 0; } -IMPL_LINK_NOARG( OTableEditorCtrl, DelayedPaste ) +IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedPaste, void*, void ) { nPasteEvent = 0; @@ -1493,18 +1490,15 @@ IMPL_LINK_NOARG( OTableEditorCtrl, DelayedPaste ) OTableRowView::Paste( nPastePosition ); SetNoSelection(); GoToRow( nPastePosition ); - - return 0; } -IMPL_LINK_NOARG( OTableEditorCtrl, DelayedDelete ) +IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedDelete, void*, void ) { nDeleteEvent = 0; DeleteRows(); - return 0; } -IMPL_LINK_NOARG( OTableEditorCtrl, DelayedInsNewRows ) +IMPL_LINK_NOARG_TYPED( OTableEditorCtrl, DelayedInsNewRows, void*, void ) { nInsNewRowsEvent = 0; sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition(); @@ -1514,8 +1508,6 @@ IMPL_LINK_NOARG( OTableEditorCtrl, DelayedInsNewRows ) InsertNewRows( nPastePosition ); SetNoSelection(); GoToRow( nPastePosition ); - - return 0; } void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc, diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index c85cb511df22..686270e1ad3c 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -176,11 +176,11 @@ namespace dbaui private: DECL_LINK( StartIndexing, void* ); - DECL_LINK( DelayedCut, void* ); - DECL_LINK( DelayedPaste, void* ); - DECL_LINK( DelayedDelete, void* ); - DECL_LINK( DelayedInsNewRows, void* ); - DECL_LINK( InvalidateFieldType, void* ); + DECL_LINK_TYPED( DelayedCut, void*, void ); + DECL_LINK_TYPED( DelayedPaste, void*, void ); + DECL_LINK_TYPED( DelayedDelete, void*, void ); + DECL_LINK_TYPED( DelayedInsNewRows, void*, void ); + DECL_LINK_TYPED( InvalidateFieldType, void*, void ); void InitCellController(); sal_Int32 HasFieldName( const OUString& rFieldName ); |