diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-10 11:24:40 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-10 12:06:16 +0200 |
commit | 6dc42c82bade7ed1cf2cf142ab9137ad8f98e188 (patch) | |
tree | 489b02b29518b64bd0476da720045a6aa1610969 /dbaccess | |
parent | 892cb24be673e8441a75bdde950c2087a24bdf74 (diff) |
Use IMPL_LINK_NOARG[_TYPED] where applicable
Change-Id: I70598072c1d492e360ef46dd7b5ef5a2fa4be495
Diffstat (limited to 'dbaccess')
23 files changed, 41 insertions, 41 deletions
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 011a1c66d4eb..4264b785ab22 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -278,7 +278,7 @@ namespace dbmm return MacroMigrationDialog_Base::onFinish(); } - IMPL_LINK( MacroMigrationDialog, OnStartMigration, void*, /*_pNotInterestedIn*/ ) + IMPL_LINK_NOARG( MacroMigrationDialog, OnStartMigration ) { // prevent closing m_pData->bMigrationIsRunning = true; diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 3c5d7507cd72..93cf4c0b748d 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -562,7 +562,7 @@ void DBContentLoader::cancel() throw(std::exception) { } -IMPL_LINK( DBContentLoader, OnStartTableWizard, void*, /*NOTINTERESTEDIN*/ ) +IMPL_LINK_NOARG( DBContentLoader, OnStartTableWizard ) { m_nStartWizard = 0; try diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 90e44b7c6f5f..f2943256c0a1 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( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ ) +IMPL_LINK_NOARG( OApplicationController, OnAsyncDrop ) { m_nAsyncDrop = 0; SolarMutexGuard aSolarGuard; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 0928d17ba755..4e95d77abfe3 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -911,31 +911,31 @@ IMPL_LINK(OAppDetailPageHelper, OnEntryDoubleClick, SvTreeListBox*, _pTree) return bHandled ? 1L : 0L; } -IMPL_LINK(OAppDetailPageHelper, OnEntrySelChange, void*, /*NOINTERESTEDIN*/) +IMPL_LINK_NOARG(OAppDetailPageHelper, OnEntrySelChange) { getBorderWin().getView()->getAppController().onSelectionChanged(); return 1L; } -IMPL_LINK( OAppDetailPageHelper, OnCutEntry, void*, /*NOINTERESTEDIN*/ ) +IMPL_LINK_NOARG( OAppDetailPageHelper, OnCutEntry ) { getBorderWin().getView()->getAppController().onCutEntry(); return 1L; } -IMPL_LINK( OAppDetailPageHelper, OnCopyEntry, void*, /*NOINTERESTEDIN*/ ) +IMPL_LINK_NOARG( OAppDetailPageHelper, OnCopyEntry ) { getBorderWin().getView()->getAppController().onCopyEntry(); return 1L; } -IMPL_LINK( OAppDetailPageHelper, OnPasteEntry, void*, /*NOINTERESTEDIN*/ ) +IMPL_LINK_NOARG( OAppDetailPageHelper, OnPasteEntry ) { getBorderWin().getView()->getAppController().onPasteEntry(); return 1L; } -IMPL_LINK( OAppDetailPageHelper, OnDeleteEntry, void*, /*NOINTERESTEDIN*/ ) +IMPL_LINK_NOARG( OAppDetailPageHelper, OnDeleteEntry ) { getBorderWin().getView()->getAppController().onDeleteEntry(); return 1L; diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 189117d2a90a..484e941648c7 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1267,7 +1267,7 @@ void SbaXDataBrowserController::frameAction(const ::com::sun::star::frame::Frame } } -IMPL_LINK( SbaXDataBrowserController, OnAsyncDisplayError, void*, /* _pNotInterestedIn */ ) +IMPL_LINK_NOARG( SbaXDataBrowserController, OnAsyncDisplayError ) { if ( m_aCurrentError.isValid() ) { diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index fe0ad003ab79..c49f99f502da 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -139,7 +139,7 @@ void UnoDataBrowserView::dispose() ODataView::dispose(); } -IMPL_LINK( UnoDataBrowserView, SplitHdl, void*, /*NOINTERESTEDIN*/ ) +IMPL_LINK_NOARG( UnoDataBrowserView, SplitHdl ) { long nYPos = m_pSplitter->GetPosPixel().Y(); m_pSplitter->SetPosPixel( Point( m_pSplitter->GetSplitPosPixel(), nYPos ) ); diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index 5aadaaf0b6c1..dbec28796059 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -193,7 +193,7 @@ namespace dbaui return NULL != pTransfer; } - IMPL_LINK(SbaTableQueryBrowser, OnCopyEntry, void*, /*NOTINTERESIN*/) + IMPL_LINK_NOARG(SbaTableQueryBrowser, OnCopyEntry) { SvTreeListEntry* pSelected = m_pTreeView->getListBox().FirstSelected(); if( isEntryCopyAllowed( pSelected ) ) @@ -215,7 +215,7 @@ namespace dbaui if (pTransfer) pTransfer->CopyToClipboard(getView()); } - IMPL_LINK( SbaTableQueryBrowser, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ ) + IMPL_LINK_NOARG( SbaTableQueryBrowser, OnAsyncDrop ) { m_nAsyncDrop = 0; SolarMutexGuard aSolarGuard; diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 3aef2d47f5af..d9537a80ebb8 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -361,7 +361,7 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDis return FmXGridPeer::queryDispatch(aURL, aTargetFrameName, nSearchFlags); } -IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, /*NOTINTERESTEDIN*/ ) +IMPL_LINK_NOARG( SbaXGridPeer, OnDispatchEvent ) { VclPtr< SbaGridControl > pGrid = GetAs< SbaGridControl >(); if ( pGrid ) // if this fails, we were disposing before arriving here @@ -1444,7 +1444,7 @@ Reference< XPropertySet > SbaGridControl::getDataSource() const return xReturn; } -IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/) +IMPL_LINK_NOARG(SbaGridControl, AsynchDropEvent) { m_nAsyncDropEvent = 0; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index d80894fe1275..4514ea3c0403 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2491,7 +2491,7 @@ bool SbaTableQueryBrowser::implSelect(const OUString& _rDataSourceName, const OU return false; } -IMPL_LINK(SbaTableQueryBrowser, OnSelectionChange, void*, /*NOINTERESTEDIN*/) +IMPL_LINK_NOARG(SbaTableQueryBrowser, OnSelectionChange) { return implSelect( m_pTreeView->getListBox().FirstSelected() ) ? 1L : 0L; } diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 91fb5ddcb371..c1b15806da8c 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -177,7 +177,7 @@ IMPL_LINK_NOARG_TYPED(OSqlEdit, OnInvalidateTimer, Timer *, void) m_timerInvalidate.Start(); } -IMPL_LINK(OSqlEdit, ModifyHdl, void*, /*EMPTYTAG*/) +IMPL_LINK_NOARG(OSqlEdit, ModifyHdl) { if (m_timerUndoActionCreation.IsActive()) m_timerUndoActionCreation.Stop(); diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 74fbdda370d1..3f541a1fd168 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -423,7 +423,7 @@ IMPL_LINK( OAddTableDlg, AddClickHdl, Button*, /*pButton*/ ) return 0; } -IMPL_LINK( OAddTableDlg, TableListDoubleClickHdl, void*, /*EMPTY_ARG*/ ) +IMPL_LINK_NOARG( OAddTableDlg, TableListDoubleClickHdl ) { if ( impl_isAddAllowed() ) { @@ -436,7 +436,7 @@ IMPL_LINK( OAddTableDlg, TableListDoubleClickHdl, void*, /*EMPTY_ARG*/ ) return 0L; // not handled } -IMPL_LINK( OAddTableDlg, TableListSelectHdl, void*, /*EMPTY_ARG*/ ) +IMPL_LINK_NOARG( OAddTableDlg, TableListSelectHdl ) { m_pAddButton->Enable( m_xCurrentList->isLeafSelected() ); return 0; @@ -447,7 +447,7 @@ IMPL_LINK( OAddTableDlg, CloseClickHdl, Button*, /*pButton*/ ) return int(Close()); } -IMPL_LINK( OAddTableDlg, OnTypeSelected, void*, /*EMPTY_ARG*/ ) +IMPL_LINK_NOARG( OAddTableDlg, OnTypeSelected ) { if ( m_pCaseTables->IsChecked() ) impl_switchTo( Tables ); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index bb3885c0fd58..c71fe8871088 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -935,7 +935,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument() m_aAsyncCaller.Call( NULL ); } - IMPL_LINK( AsyncLoader, OnOpenDocument, void*, /*_pEmptyArg*/ ) + IMPL_LINK_NOARG( AsyncLoader, OnOpenDocument ) { try { diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index c5ceccbae91b..eddc0949f2cf 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -308,25 +308,25 @@ namespace dbaui OSL_FAIL("DirectSQLDialog::switchToHistory: invalid position!"); } - IMPL_LINK( DirectSQLDialog, OnStatementModified, void*, /*NOTINTERESTEDIN*/ ) + IMPL_LINK_NOARG( DirectSQLDialog, OnStatementModified ) { m_pExecute->Enable(!m_pSQL->GetText().isEmpty()); return 0L; } - IMPL_LINK( DirectSQLDialog, OnClose, void*, /*NOTINTERESTEDIN*/ ) + IMPL_LINK_NOARG( DirectSQLDialog, OnClose ) { EndDialog( RET_OK ); return 0L; } - IMPL_LINK( DirectSQLDialog, OnExecute, void*, /*NOTINTERESTEDIN*/ ) + IMPL_LINK_NOARG( DirectSQLDialog, OnExecute ) { executeCurrent(); return 0L; } - IMPL_LINK( DirectSQLDialog, OnListEntrySelected, void*, /*NOTINTERESTEDIN*/ ) + IMPL_LINK_NOARG( DirectSQLDialog, OnListEntrySelected ) { if (!m_pSQLHistory->IsTravelSelect()) { diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 950903da5ccd..a812a6b1afcb 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -124,7 +124,7 @@ IMPL_LINK_NOARG(ODatasourceSelectDialog, ManageClickHdl) return 0L; } -IMPL_LINK( ODatasourceSelectDialog, ManageProcessFinished, void*, /**/ ) +IMPL_LINK_NOARG( ODatasourceSelectDialog, ManageProcessFinished ) { StringBag aOdbcDatasources; OOdbcEnumeration aEnumeration; diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 9cdfc13d15bf..7abbb17ef6bb 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -557,7 +557,7 @@ namespace dbaui OnResetIndex(); } - IMPL_LINK( DbaIndexDialog, OnCloseDialog, void*, /*NOTINTERESTEDIN*/ ) + IMPL_LINK_NOARG( DbaIndexDialog, OnCloseDialog ) { if (m_pIndexList->IsEditingActive()) { @@ -733,7 +733,7 @@ namespace dbaui return true; } - IMPL_LINK( DbaIndexDialog, OnModified, void*, /*NOTINTERESTEDIN*/ ) + IMPL_LINK_NOARG( DbaIndexDialog, OnModified ) { OSL_ENSURE(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!"); Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(m_pPreviousSelection->GetUserData()); diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index a2634ebce764..b1763b47356f 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -257,7 +257,7 @@ IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton ) return 0; } -IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ ) +IMPL_LINK_NOARG( OWizNameMatching, TableListClickHdl ) { SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected(); if(pEntry) @@ -291,7 +291,7 @@ IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ ) return 0; } -IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, void*, /*NOTINTERESTEDIN*/ ) +IMPL_LINK_NOARG( OWizNameMatching, TableListRightSelectHdl ) { SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected(); if(pEntry) diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx index 2096c7a293c9..7769c1132e09 100644 --- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx +++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx @@ -57,7 +57,7 @@ namespace dbaui DECL_LINK( onExecute, void* ); }; - IMPL_LINK( DialogExecutor_Impl, onExecute, void*, /* _notInterestedIn */ ) + IMPL_LINK_NOARG( DialogExecutor_Impl, onExecute ) { try { diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index a42e8e63b228..de79ceb57cc3 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2528,7 +2528,7 @@ void OQueryDesignView::dispose() OQueryView::dispose(); } -IMPL_LINK( OQueryDesignView, SplitHdl, void*, /*p*/ ) +IMPL_LINK_NOARG( OQueryDesignView, SplitHdl ) { if (!getController().isReadOnly()) { diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 545e7712d361..f0408d945205 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -275,14 +275,14 @@ sal_Int8 OTableWindowListBox::AcceptDrop( const AcceptDropEvent& _rEvt ) return nDND_Action; } -IMPL_LINK( OTableWindowListBox, LookForUiHdl, void *, /*EMPTY_ARG*/) +IMPL_LINK_NOARG( OTableWindowListBox, LookForUiHdl ) { m_nUiEvent = 0; m_pTabWin->getTableView()->lookForUiActivities(); return 0L; } -IMPL_LINK( OTableWindowListBox, DropHdl, void *, /*EMPTY_ARG*/) +IMPL_LINK_NOARG( OTableWindowListBox, DropHdl ) { // create the connection m_nDropEvent = 0; diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 9aa8ba3d6494..47ef55bbc19c 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -133,7 +133,7 @@ namespace dbaui if(m_pViewSwitch) m_pViewSwitch->GrabFocus(); } - IMPL_LINK( OQueryContainerWindow, SplitHdl, void*, /*p*/ ) + IMPL_LINK_NOARG( OQueryContainerWindow, SplitHdl ) { m_pSplitter->SetPosPixel( Point( m_pSplitter->GetPosPixel().X(),m_pSplitter->GetSplitPosPixel() ) ); Resize(); diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 4db99e4d3151..841dc331e973 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1967,7 +1967,7 @@ void OQueryController::setEscapeProcessing_fireEvent( const bool _bEscapeProcess fire( &nHandle, &aNewValue, &aOldValue, 1, sal_False ); } -IMPL_LINK( OQueryController, OnExecuteAddTable, void*, /*pNotInterestedIn*/ ) +IMPL_LINK_NOARG( OQueryController, OnExecuteAddTable ) { Execute( ID_BROWSER_ADDTABLE,Sequence<PropertyValue>() ); return 0L; diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 430d0a35aef0..6a88ef2f5417 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( ORelationController, OnThreadFinished, void*, /*NOTINTERESTEDIN*/ ) +IMPL_LINK_NOARG( ORelationController, OnThreadFinished ) { ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 55b02a6593ab..203341077a09 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -624,7 +624,7 @@ bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) return true; } -IMPL_LINK( OTableEditorCtrl, InvalidateFieldType, void*, /*EMPTYTAG*/ ) +IMPL_LINK_NOARG( OTableEditorCtrl, InvalidateFieldType ) { nInvalidateTypeEvent = 0; Invalidate( GetFieldRectPixel(nOldDataPos, FIELD_TYPE) ); @@ -1456,14 +1456,14 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) } -IMPL_LINK( OTableEditorCtrl, DelayedCut, void*, /*EMPTYTAG*/ ) +IMPL_LINK_NOARG( OTableEditorCtrl, DelayedCut ) { nCutEvent = 0; OTableRowView::cut(); return 0; } -IMPL_LINK( OTableEditorCtrl, DelayedPaste, void*, /*EMPTYTAG*/ ) +IMPL_LINK_NOARG( OTableEditorCtrl, DelayedPaste ) { nPasteEvent = 0; @@ -1491,14 +1491,14 @@ IMPL_LINK( OTableEditorCtrl, DelayedPaste, void*, /*EMPTYTAG*/ ) return 0; } -IMPL_LINK( OTableEditorCtrl, DelayedDelete, void*, /*EMPTYTAG*/ ) +IMPL_LINK_NOARG( OTableEditorCtrl, DelayedDelete ) { nDeleteEvent = 0; DeleteRows(); return 0; } -IMPL_LINK( OTableEditorCtrl, DelayedInsNewRows, void*, /*EMPTYTAG*/ ) +IMPL_LINK_NOARG( OTableEditorCtrl, DelayedInsNewRows ) { nInsNewRowsEvent = 0; sal_Int32 nPastePosition = GetView()->getController().getFirstEmptyRowPosition(); |