New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem

...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type"
for the problem.

6 files changed, 28 insertions, 28 deletions

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 454fb00d0ed9..e1bd1e0015f4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2055,7 +2055,7 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* )
 }
 
 // ========================================================================
-IMPL_LINK( Desktop, AsyncInitFirstRun, void*, EMPTYARG )
+IMPL_LINK_NOARG(Desktop, AsyncInitFirstRun)
 {
     DoFirstRunInitializations();
     return 0L;
@@ -2077,7 +2077,7 @@ class ExitTimer : public Timer
     }
 };
 
-IMPL_LINK( Desktop, OpenClients_Impl, void*, EMPTYARG )
+IMPL_LINK_NOARG(Desktop, OpenClients_Impl)
 {
     RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "PERFORMANCE - DesktopOpenClients_Impl()" );
 
@@ -2100,7 +2100,7 @@ IMPL_LINK( Desktop, OpenClients_Impl, void*, EMPTYARG )
 }
 
 // enable acceptos
-IMPL_LINK( Desktop, EnableAcceptors_Impl, void*, EMPTYARG )
+IMPL_LINK_NOARG(Desktop, EnableAcceptors_Impl)
 {
     enableAcceptors();
     return 0;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 39606f10af96..95b90c9f0b86 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -493,7 +493,7 @@ IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar )
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( ExtBoxWithBtns_Impl, HandleOptionsBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn)
 {
     const sal_Int32 nActive = getSelIndex();
 
@@ -516,7 +516,7 @@ IMPL_LINK( ExtBoxWithBtns_Impl, HandleOptionsBtn, void*, EMPTYARG )
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( ExtBoxWithBtns_Impl, HandleEnableBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleEnableBtn)
 {
     const sal_Int32 nActive = getSelIndex();
 
@@ -537,7 +537,7 @@ IMPL_LINK( ExtBoxWithBtns_Impl, HandleEnableBtn, void*, EMPTYARG )
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( ExtBoxWithBtns_Impl, HandleRemoveBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleRemoveBtn)
 {
     const sal_Int32 nActive = getSelIndex();
 
@@ -994,7 +994,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker()
 }
 
 //------------------------------------------------------------------------------
-IMPL_LINK( ExtMgrDialog, HandleCancelBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(ExtMgrDialog, HandleCancelBtn)
 {
     if ( m_xAbortChannel.is() )
     {
@@ -1092,7 +1092,7 @@ void ExtMgrDialog::updatePackageInfo( const uno::Reference< deployment::XPackage
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( ExtMgrDialog, HandleAddBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(ExtMgrDialog, HandleAddBtn)
 {
     setBusy( true );
 
@@ -1108,14 +1108,14 @@ IMPL_LINK( ExtMgrDialog, HandleAddBtn, void*, EMPTYARG )
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( ExtMgrDialog, HandleExtTypeCbx, void*, EMPTYARG )
+IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx)
 {
 	// re-creates the list of packages with addEntry selecting the packages
 	m_pManager->createPackageList();
     return 1;
 }
 // -----------------------------------------------------------------------
-IMPL_LINK( ExtMgrDialog, HandleUpdateBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn)
 {
     m_pManager->checkUpdates( false, true );
 
@@ -1131,7 +1131,7 @@ IMPL_LINK( ExtMgrDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink )
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( ExtMgrDialog, TimeOutHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl)
 {
     if ( m_bStopProgress )
     {
@@ -1469,7 +1469,7 @@ bool UpdateRequiredDialog::enablePackage( const uno::Reference< deployment::XPac
 }
 
 //------------------------------------------------------------------------------
-IMPL_LINK( UpdateRequiredDialog, HandleCancelBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCancelBtn)
 {
     if ( m_xAbortChannel.is() )
     {
@@ -1575,7 +1575,7 @@ void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment::
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( UpdateRequiredDialog, HandleUpdateBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
@@ -1596,7 +1596,7 @@ IMPL_LINK( UpdateRequiredDialog, HandleUpdateBtn, void*, EMPTYARG )
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( UpdateRequiredDialog, HandleCloseBtn, void*, EMPTYARG )
+IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1622,7 +1622,7 @@ IMPL_LINK( UpdateRequiredDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperli
 }
 
 // -----------------------------------------------------------------------
-IMPL_LINK( UpdateRequiredDialog, TimeOutHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl)
 {
     if ( m_bStopProgress )
     {
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 0867faa8dac5..a06b75e8b5e1 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -147,7 +147,7 @@ class ExtMgrDialog : public ModelessDialog,
     DECL_DLLPRIVATE_LINK( HandleCancelBtn, void * );
     DECL_DLLPRIVATE_LINK( HandleExtTypeCbx, void * );
     DECL_DLLPRIVATE_LINK( HandleHyperlink, svt::FixedHyperlink * );
-    DECL_DLLPRIVATE_LINK( TimeOutHdl, Timer* );
+    DECL_DLLPRIVATE_LINK(TimeOutHdl, void *);
     DECL_DLLPRIVATE_LINK( startProgress, void * );
 
 public:
@@ -213,7 +213,7 @@ class UpdateRequiredDialog : public ModalDialog,
     DECL_DLLPRIVATE_LINK( HandleUpdateBtn, void * );
     DECL_DLLPRIVATE_LINK( HandleCloseBtn, void * );
     DECL_DLLPRIVATE_LINK( HandleCancelBtn, void * );
-    DECL_DLLPRIVATE_LINK( TimeOutHdl, Timer* );
+    DECL_DLLPRIVATE_LINK(TimeOutHdl, void *);
     DECL_DLLPRIVATE_LINK( startProgress, void * );
     DECL_DLLPRIVATE_LINK( HandleHyperlink, svt::FixedHyperlink * );
 
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 6805719ad951..13f2df1cdd7d 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -1228,7 +1228,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore,
 
 //------------------------------------------------------------------------------
 
-IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
+IMPL_LINK_NOARG(UpdateDialog, selectionHandler)
 {
     rtl::OUStringBuffer b;
     bool bInserted = false;
@@ -1328,7 +1328,7 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK(UpdateDialog, allHandler, void *, EMPTYARG)
+IMPL_LINK_NOARG(UpdateDialog, allHandler)
 {
     if (m_all.IsChecked())
     {
@@ -1371,7 +1371,7 @@ IMPL_LINK(UpdateDialog, allHandler, void *, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG)
+IMPL_LINK_NOARG(UpdateDialog, okHandler)
 {
     //If users are going to update a shared extension then we need
     //to warn them
@@ -1397,7 +1397,7 @@ IMPL_LINK(UpdateDialog, okHandler, void *, EMPTYARG)
     return 0;
 }
 
-IMPL_LINK(UpdateDialog, closeHandler, void *, EMPTYARG) {
+IMPL_LINK_NOARG(UpdateDialog, closeHandler) {
     m_thread->stop();
     EndDialog(RET_CANCEL);
     return 0;
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 20172ddd10e8..6c090845e3c7 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -332,7 +332,7 @@ void UpdateInstallDialog::setError(OUString const & exceptionMessage)
     m_mle_info.InsertText(exceptionMessage + OUSTR("\n"));
 }
 
-IMPL_LINK(UpdateInstallDialog, cancelHandler, void *, EMPTYARG)
+IMPL_LINK_NOARG(UpdateInstallDialog, cancelHandler)
 {
     m_thread->stop();
     EndDialog(RET_CANCEL);
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 131d18674aea..2a76bba34659 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -104,9 +104,9 @@ struct LicenseDialogImpl : public ModalDialog
     OKButton m_acceptButton;
     CancelButton m_declineButton;
 
-    DECL_LINK(PageDownHdl, PushButton*);
-    DECL_LINK(ScrolledHdl, LicenseView*);
-    DECL_LINK(EndReachedHdl, LicenseView*);
+    DECL_LINK(PageDownHdl, void *);
+    DECL_LINK(ScrolledHdl, void *);
+    DECL_LINK(EndReachedHdl, void *);
 
     bool m_bLicenseRead;
 
@@ -255,7 +255,7 @@ void LicenseDialogImpl::Activate()
     }
 }
 
-IMPL_LINK( LicenseDialogImpl, ScrolledHdl, LicenseView *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialogImpl, ScrolledHdl)
 {
 
     if (m_mlLicense.IsEndReached())
@@ -266,13 +266,13 @@ IMPL_LINK( LicenseDialogImpl, ScrolledHdl, LicenseView *, EMPTYARG )
     return 0;
 }
 
-IMPL_LINK( LicenseDialogImpl, PageDownHdl, PushButton *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialogImpl, PageDownHdl)
 {
     m_mlLicense.ScrollDown( SCROLL_PAGEDOWN );
     return 0;
 }
 
-IMPL_LINK( LicenseDialogImpl, EndReachedHdl, LicenseView *, EMPTYARG )
+IMPL_LINK_NOARG(LicenseDialogImpl, EndReachedHdl)
 {
     m_acceptButton.Enable();
     m_acceptButton.GrabFocus();