From bd205223ec029a875c662474bb6d423d3cdd1994 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 1 Mar 2012 18:00:32 +0100 Subject: New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem ...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type" for the problem. --- dbaccess/source/ui/app/AppController.cxx | 2 +- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2 +- dbaccess/source/ui/app/AppSwapWindow.cxx | 2 +- dbaccess/source/ui/browser/brwctrlr.cxx | 4 ++-- dbaccess/source/ui/browser/genericcontroller.cxx | 4 ++-- dbaccess/source/ui/control/RelationControl.cxx | 4 ++-- dbaccess/source/ui/control/TableGrantCtrl.cxx | 4 ++-- dbaccess/source/ui/control/sqledit.cxx | 4 ++-- dbaccess/source/ui/dlg/CollectionView.cxx | 8 ++++---- dbaccess/source/ui/dlg/UserAdmin.cxx | 4 ++-- dbaccess/source/ui/dlg/adminpages.cxx | 2 +- dbaccess/source/ui/dlg/adminpages.hxx | 2 +- dbaccess/source/ui/dlg/dsselect.cxx | 2 +- dbaccess/source/ui/dlg/sqlmessage.cxx | 2 +- dbaccess/source/ui/inc/CollectionView.hxx | 8 ++++---- dbaccess/source/ui/inc/WCopyTable.hxx | 8 ++++---- dbaccess/source/ui/misc/WCopyTable.cxx | 8 ++++---- dbaccess/source/ui/querydesign/JoinTableView.cxx | 2 +- dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 +- dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index b3f34f325871..1ee3d1b77dd1 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2312,7 +2312,7 @@ void OApplicationController::showPreviewFor(const ElementType _eType,const ::rtl } //------------------------------------------------------------------------------ -IMPL_LINK( OApplicationController, OnClipboardChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(OApplicationController, OnClipboardChanged) { OnInvalidateClipboard(); return 0L; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index a68416cfb5be..758ca7247b76 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -158,7 +158,7 @@ namespace return nRet; } // ----------------------------------------------------------------------------- - IMPL_LINK(OTablePreviewWindow, OnDisableInput, void*, EMPTYARG) + IMPL_LINK_NOARG(OTablePreviewWindow, OnDisableInput) { EnableInput(sal_False); return 0L; diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 13e7cdcc94fb..9d8ab1a51708 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -186,7 +186,7 @@ IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pCo return 1L; } //------------------------------------------------------------------------------ -IMPL_LINK(OApplicationSwapWindow, ChangeToLastSelected, void*, EMPTYARG) +IMPL_LINK_NOARG(OApplicationSwapWindow, ChangeToLastSelected) { selectContainer(m_eLastType); return 0L; diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index aee125c8493a..c68923c24079 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2486,7 +2486,7 @@ void SbaXDataBrowserController::CellDeactivated() } //------------------------------------------------------------------------------ -IMPL_LINK( SbaXDataBrowserController, OnClipboardChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(SbaXDataBrowserController, OnClipboardChanged) { SolarMutexGuard aGuard; return OnInvalidateClipboard( NULL ); @@ -2657,7 +2657,7 @@ IMPL_LINK(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInformatio } //------------------------------------------------------------------------------ -IMPL_LINK(SbaXDataBrowserController, OnAsyncGetCellFocus, void*, EMPTYARG) +IMPL_LINK_NOARG(SbaXDataBrowserController, OnAsyncGetCellFocus) { SbaGridControl* pVclGrid = getBrowserView() ? getBrowserView()->getVclControl() : NULL; // if we have a controller, but the window for the controller doesn't have the focus, we correct this diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index da549604f723..d05d8903e562 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -277,7 +277,7 @@ sal_Bool OGenericUnoController::Construct(Window* /*pParent*/) return sal_True; } //------------------------------------------------------------------------------ -IMPL_LINK(OGenericUnoController, OnAsyncInvalidateAll, void*, EMPTYARG) +IMPL_LINK_NOARG(OGenericUnoController, OnAsyncInvalidateAll) { if ( !OGenericUnoController_Base::rBHelper.bInDispose && !OGenericUnoController_Base::rBHelper.bDisposed ) InvalidateFeature_Impl(); @@ -1125,7 +1125,7 @@ void OGenericUnoController::closeTask() m_aAsyncCloseTask.Call(); } // ----------------------------------------------------------------------------- -IMPL_LINK(OGenericUnoController, OnAsyncCloseTask, void*, EMPTYARG) +IMPL_LINK_NOARG(OGenericUnoController, OnAsyncCloseTask) { if ( !OGenericUnoController_Base::rBHelper.bInDispose ) { diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 4ba048dd9b3e..2201637f0f43 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -211,14 +211,14 @@ namespace dbaui } //------------------------------------------------------------------------------ - IMPL_LINK(ORelationControl, AsynchActivate, void*, EMPTYARG) + IMPL_LINK_NOARG(ORelationControl, AsynchActivate) { ActivateCell(); return 0L; } //------------------------------------------------------------------------------ - IMPL_LINK(ORelationControl, AsynchDeactivate, void*, EMPTYARG) + IMPL_LINK_NOARG(ORelationControl, AsynchDeactivate) { DeactivateCell(); return 0L; diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index ea942b5ef10e..c9589e030702 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -186,7 +186,7 @@ long OTableGrantControl::PreNotify(NotifyEvent& rNEvt) } //------------------------------------------------------------------------------ -IMPL_LINK(OTableGrantControl, AsynchActivate, void*, EMPTYARG) +IMPL_LINK_NOARG(OTableGrantControl, AsynchActivate) { m_nDeactivateEvent = 0; ActivateCell(); @@ -194,7 +194,7 @@ IMPL_LINK(OTableGrantControl, AsynchActivate, void*, EMPTYARG) } //------------------------------------------------------------------------------ -IMPL_LINK(OTableGrantControl, AsynchDeactivate, void*, EMPTYARG) +IMPL_LINK_NOARG(OTableGrantControl, AsynchDeactivate) { m_nDeactivateEvent = 0; DeactivateCell(); diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index afa0e7fb2ed4..765d6a78074b 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -179,7 +179,7 @@ void OSqlEdit::GetFocus() } //------------------------------------------------------------------------------ -IMPL_LINK(OSqlEdit, OnUndoActionTimer, void*, EMPTYARG) +IMPL_LINK_NOARG(OSqlEdit, OnUndoActionTimer) { String aText =GetText(); if(aText != m_strOrigText) @@ -200,7 +200,7 @@ IMPL_LINK(OSqlEdit, OnUndoActionTimer, void*, EMPTYARG) return 0L; } //------------------------------------------------------------------------------ -IMPL_LINK(OSqlEdit, OnInvalidateTimer, void*, EMPTYARG) +IMPL_LINK_NOARG(OSqlEdit, OnInvalidateTimer) { OJoinController& rController = m_pView->getContainerWindow()->getDesignView()->getController(); rController.InvalidateFeature(SID_CUT); diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index a41a36603915..432ea32561e2 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -124,7 +124,7 @@ Reference< XContent> OCollectionView::getSelectedFolder() const return m_xContent; } // ----------------------------------------------------------------------------- -IMPL_LINK( OCollectionView, Save_Click, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OCollectionView, Save_Click) { ::rtl::OUString sName = m_aName.GetText(); if ( sName.isEmpty() ) @@ -221,7 +221,7 @@ IMPL_LINK( OCollectionView, Save_Click, PushButton*, EMPTYARG ) return 0; } // ----------------------------------------------------------------------------- -IMPL_LINK( OCollectionView, NewFolder_Click, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OCollectionView, NewFolder_Click) { try { @@ -240,7 +240,7 @@ IMPL_LINK( OCollectionView, NewFolder_Click, PushButton*, EMPTYARG ) return 0; } // ----------------------------------------------------------------------------- -IMPL_LINK( OCollectionView, Up_Click, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OCollectionView, Up_Click) { try { @@ -265,7 +265,7 @@ IMPL_LINK( OCollectionView, Up_Click, PushButton*, EMPTYARG ) return 0; } // ----------------------------------------------------------------------------- -IMPL_LINK( OCollectionView, Dbl_Click_FileView, SvtFileView*, EMPTYARG ) +IMPL_LINK_NOARG(OCollectionView, Dbl_Click_FileView) { try { diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 8155dbeadd32..520b5cfa021f 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -74,7 +74,7 @@ class OPasswordDialog : public ModalDialog HelpButton aHelpBtn; - DECL_LINK( OKHdl_Impl, OKButton * ); + DECL_LINK( OKHdl_Impl, void * ); DECL_LINK( ModifiedHdl, Edit * ); public: @@ -112,7 +112,7 @@ OPasswordDialog::OPasswordDialog(Window* _pParent,const String& _sUserName) : aEDOldPassword.SetModifyHdl( LINK( this, OPasswordDialog, ModifiedHdl ) ); } // ----------------------------------------------------------------------------- -IMPL_LINK( OPasswordDialog, OKHdl_Impl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(OPasswordDialog, OKHdl_Impl) { if( aEDPassword.GetText() == aEDPasswordRepeat.GetText() ) EndDialog( RET_OK ); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index c1c4cd2b8491..c8bbc1386165 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -140,7 +140,7 @@ namespace dbaui // ----------------------------------------------------------------------- - IMPL_LINK(OGenericAdministrationPage, OnControlModified, Control*, EMPTYARG) + IMPL_LINK_NOARG(OGenericAdministrationPage, OnControlModified) { callModifiedHdl(); return 0L; diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index dd258de98be9..756fbaf02975 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -251,7 +251,7 @@ namespace dbaui /** This link be used for controls where the tabpage does not need to take any special action when the control is modified. The implementation just calls callModifiedHdl. */ - DECL_LINK(OnControlModified, Control*); + DECL_LINK(OnControlModified, void*); DECL_LINK(OnTestConnectionClickHdl,PushButton*); /// may be used in SetXXXHdl calls to controls, is a link to OnControlModified diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 3e450c1f0f17..baee01c37736 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -111,7 +111,7 @@ sal_Bool ODatasourceSelectDialog::Close() // ----------------------------------------------------------------------- #ifdef HAVE_ODBC_ADMINISTRATION -IMPL_LINK( ODatasourceSelectDialog, ManageClickHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ODatasourceSelectDialog, ManageClickHdl) { if ( !m_pODBCManagement.get() ) m_pODBCManagement.reset( new OOdbcManagement( LINK( this, ODatasourceSelectDialog, ManageProcessFinished ) ) ); diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index bc123122e91c..89c9ccfa8914 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -397,7 +397,7 @@ OExceptionChainDialog::~OExceptionChainDialog() } //------------------------------------------------------------------------------ -IMPL_LINK(OExceptionChainDialog, OnExceptionSelected, void*, EMPTYARG) +IMPL_LINK_NOARG(OExceptionChainDialog, OnExceptionSelected) { SvLBoxEntry* pSelected = m_aExceptionList.FirstSelected(); OSL_ENSURE(!pSelected || !m_aExceptionList.NextSelected(pSelected), "OExceptionChainDialog::OnExceptionSelected : multi selection ?"); diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 395ad71f3e0c..95e84c89b5c1 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -62,10 +62,10 @@ namespace dbaui sal_Int32 m_nFixDeltaHeight; sal_Bool m_bCreateForm; - DECL_LINK(Up_Click,PushButton*); - DECL_LINK(NewFolder_Click,PushButton*); - DECL_LINK(Save_Click,PushButton*); - DECL_LINK(Dbl_Click_FileView,SvtFileView*); + DECL_LINK(Up_Click,void*); + DECL_LINK(NewFolder_Click,void*); + DECL_LINK(Save_Click,void*); + DECL_LINK(Dbl_Click_FileView,void*); /// sets the fixedtext to the right content void initCurrentPath(); diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 7249dcdc1104..ca7f272ff1e0 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -284,10 +284,10 @@ namespace dbaui sal_Bool m_bUseHeaderLine; private: - DECL_LINK( ImplPrevHdl , PushButton* ); - DECL_LINK( ImplNextHdl , PushButton* ); - DECL_LINK( ImplOKHdl , OKButton* ); - DECL_LINK( ImplActivateHdl, WizardDialog* ); + DECL_LINK( ImplPrevHdl , void* ); + DECL_LINK( ImplNextHdl , void* ); + DECL_LINK( ImplOKHdl , void* ); + DECL_LINK( ImplActivateHdl, void* ); sal_Bool CheckColumns(sal_Int32& _rnBreakPos); void loadData( const ICopyTableSourceObject& _rSourceObject, ODatabaseExport::TColumns& _rColumns, diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index f5eea9010188..3672d1a49eef 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -766,7 +766,7 @@ OCopyTableWizard::~OCopyTableWizard() m_aDestTypeInfoIndex.clear(); } // ----------------------------------------------------------------------- -IMPL_LINK( OCopyTableWizard, ImplPrevHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OCopyTableWizard, ImplPrevHdl) { m_ePressed = WIZARD_PREV; if ( GetCurLevel() ) @@ -786,7 +786,7 @@ IMPL_LINK( OCopyTableWizard, ImplPrevHdl, PushButton*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( OCopyTableWizard, ImplNextHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl) { m_ePressed = WIZARD_NEXT; if ( GetCurLevel() < MAX_PAGES ) @@ -889,7 +889,7 @@ sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos) return bRet; } // ----------------------------------------------------------------------- -IMPL_LINK( OCopyTableWizard, ImplOKHdl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl) { m_ePressed = WIZARD_FINISH; sal_Bool bFinish = DeactivatePage() != 0; @@ -1002,7 +1002,7 @@ void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUStri } // ----------------------------------------------------------------------- -IMPL_LINK( OCopyTableWizard, ImplActivateHdl, WizardDialog*, EMPTYARG ) +IMPL_LINK_NOARG(OCopyTableWizard, ImplActivateHdl) { OWizardPage* pCurrent = (OWizardPage*)GetPage(GetCurLevel()); if(pCurrent) diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 60e8e7cfae40..9343309e9df2 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1163,7 +1163,7 @@ sal_Bool OJoinTableView::ScrollWhileDragging() } //------------------------------------------------------------------------ -IMPL_LINK(OJoinTableView, OnDragScrollTimer, void*, EMPTYARG) +IMPL_LINK_NOARG(OJoinTableView, OnDragScrollTimer) { ScrollWhileDragging(); return 0L; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index b7cf65ee35fc..35a08f5228df 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2594,7 +2594,7 @@ void OSelectionBrowseBox::appendUndoAction(const String& _rOldValue,const String } } // ----------------------------------------------------------------------------- -IMPL_LINK(OSelectionBrowseBox, OnInvalidateTimer, void*, EMPTYARG) +IMPL_LINK_NOARG(OSelectionBrowseBox, OnInvalidateTimer) { static_cast(getDesignView()->getController()).InvalidateFeature(SID_CUT); static_cast(getDesignView()->getController()).InvalidateFeature(SID_COPY); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index e18d0d791410..afc4c9934a68 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -123,7 +123,7 @@ OTableEditorCtrl::ClipboardInvalidator::~ClipboardInvalidator() } //------------------------------------------------------------------ -IMPL_LINK(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate, void*, EMPTYARG) +IMPL_LINK_NOARG(OTableEditorCtrl::ClipboardInvalidator, OnInvalidate) { m_pOwner->GetView()->getController().InvalidateFeature(SID_CUT); m_pOwner->GetView()->getController().InvalidateFeature(SID_COPY); -- cgit