summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-03-01 18:00:32 +0100
committerStephan Bergmann <sbergman@redhat.com>2012-03-01 18:00:32 +0100
commitbd205223ec029a875c662474bb6d423d3cdd1994 (patch)
tree6531a292edb0d2a13103a4c55cbd10e7137b8a58 /extensions
parent32781c2d268ed94eb46318a0398385baf31368c4 (diff)
New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem
...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type" for the problem.
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx2
-rw-r--r--extensions/source/abpilot/abpfinalpage.hxx2
-rw-r--r--extensions/source/bibliography/datman.cxx4
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx2
-rw-r--r--extensions/source/plugin/aqua/sysplug.mm2
-rw-r--r--extensions/source/propctrlr/browserview.cxx2
-rw-r--r--extensions/source/propctrlr/propcontroller.cxx2
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx4
-rw-r--r--extensions/source/propctrlr/propertyeditor.hxx4
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx16
10 files changed, 20 insertions, 20 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 3a5229e291df..4df35081def6 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -210,7 +210,7 @@ namespace abp
}
// -----------------------------------------------------------------------------
- IMPL_LINK( FinalPage, OnRegister, CheckBox*, EMPTYARG )
+ IMPL_LINK_NOARG(FinalPage, OnRegister)
{
sal_Bool bEnable = m_aRegisterName.IsChecked();
m_aNameLabel.Enable(bEnable);
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index 036b4fa543b4..f6ab3ce357c2 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -78,7 +78,7 @@ namespace abp
private:
DECL_LINK( OnNameModified, Edit* );
- DECL_LINK( OnRegister, CheckBox* );
+ DECL_LINK(OnRegister, void *);
sal_Bool isValidName() const;
void implCheckName();
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 6fe89fe136f3..27369e9cbc1a 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -291,7 +291,7 @@ class MappingDialog_Impl : public ModalDialog
- DECL_LINK(OkHdl, OKButton*);
+ DECL_LINK(OkHdl, void *);
DECL_LINK(ListBoxSelectHdl, ListBox*);
public:
@@ -519,7 +519,7 @@ IMPL_LINK(MappingDialog_Impl, ListBoxSelectHdl, ListBox*, pListBox)
return 0;
}
-IMPL_LINK(MappingDialog_Impl, OkHdl, OKButton*, EMPTYARG)
+IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl)
{
if(bModified)
{
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 674555fb07a8..1face92fcd43 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -507,7 +507,7 @@ namespace dbp
}
//---------------------------------------------------------------------
- IMPL_LINK(OLinkFieldsPage, OnSelectionModified, void*, EMPTYARG)
+ IMPL_LINK_NOARG(OLinkFieldsPage, OnSelectionModified)
{
implCheckFinish();
return 0L;
diff --git a/extensions/source/plugin/aqua/sysplug.mm b/extensions/source/plugin/aqua/sysplug.mm
index 55d3c573478b..6797f2ae5743 100644
--- a/extensions/source/plugin/aqua/sysplug.mm
+++ b/extensions/source/plugin/aqua/sysplug.mm
@@ -381,7 +381,7 @@ sal_Bool MacPluginComm::retrieveFunction( const char* i_pName, void** o_ppFunc )
return (*o_ppFunc != NULL);
}
-IMPL_LINK( MacPluginComm, NullTimerHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(MacPluginComm, NullTimerHdl)
{
// note: this is a Timer handler, we are already protected by the SolarMutex
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index 34ca93767984..31a98fe12748 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -62,7 +62,7 @@ namespace pcr
}
//------------------------------------------------------------------------
- IMPL_LINK(OPropertyBrowserView, OnPageActivation, void*, EMPTYARG)
+ IMPL_LINK_NOARG(OPropertyBrowserView, OnPageActivation)
{
m_nActivePage = m_pPropBox->GetCurPage();
if (m_aPageActivationHandler.IsSet())
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index a2c27fab52f3..4f625778e384 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -656,7 +656,7 @@ namespace pcr
}
//------------------------------------------------------------------------
- IMPL_LINK(OPropertyBrowserController, OnPageActivation, void*, EMPTYARG)
+ IMPL_LINK_NOARG(OPropertyBrowserController, OnPageActivation)
{
updateViewDataFromActivePage();
return 0L;
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 4b80cf5608b3..3bf59dc1039c 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -511,7 +511,7 @@ namespace pcr
}
//------------------------------------------------------------------
- IMPL_LINK(OPropertyEditor, OnPageActivate, TabControl*, EMPTYARG)
+ IMPL_LINK_NOARG(OPropertyEditor, OnPageActivate)
{
if (m_aPageActivationHandler.IsSet())
m_aPageActivationHandler.Call(NULL);
@@ -519,7 +519,7 @@ namespace pcr
}
//------------------------------------------------------------------
- IMPL_LINK(OPropertyEditor, OnPageDeactivate, TabControl*, EMPTYARG)
+ IMPL_LINK_NOARG(OPropertyEditor, OnPageDeactivate)
{
// commit the data on the current (to-be-decativated) tab page
// (79404)
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index 6f9217f7329c..0a43a2f4cd79 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -151,8 +151,8 @@ namespace pcr
void setHelpLineLimits( OBrowserPage& _rPage, const void* );
protected:
- DECL_LINK(OnPageDeactivate, TabControl*);
- DECL_LINK(OnPageActivate, TabControl*);
+ DECL_LINK(OnPageDeactivate, void *);
+ DECL_LINK(OnPageActivate, void *);
};
//............................................................................
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index da90b4b33fa1..ceb5691ad93e 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -152,11 +152,11 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper3
sal_uInt16 mnIconID;
private:
- DECL_LINK( ClickHdl, sal_uInt16* );
+ DECL_LINK(ClickHdl, void *);
DECL_LINK( HighlightHdl, MenuBar::MenuBarButtonCallbackArg* );
- DECL_LINK( WaitTimeOutHdl, Timer* );
- DECL_LINK( TimeOutHdl, Timer* );
- DECL_LINK( UserEventHdl, UpdateCheckUI* );
+ DECL_LINK(WaitTimeOutHdl, void *);
+ DECL_LINK(TimeOutHdl, void *);
+ DECL_LINK(UserEventHdl, void *);
DECL_LINK( WindowEventHdl, VclWindowEvent* );
DECL_LINK( ApplicationEventHdl, VclSimpleEvent* );
@@ -633,7 +633,7 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon )
}
// -----------------------------------------------------------------------
-IMPL_LINK( UpdateCheckUI, ClickHdl, sal_uInt16*, EMPTYARG )
+IMPL_LINK_NOARG(UpdateCheckUI, ClickHdl)
{
SolarMutexGuard aGuard;
@@ -667,7 +667,7 @@ IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg*, pDat
}
// -----------------------------------------------------------------------
-IMPL_LINK( UpdateCheckUI, WaitTimeOutHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl)
{
SolarMutexGuard aGuard;
@@ -682,7 +682,7 @@ IMPL_LINK( UpdateCheckUI, WaitTimeOutHdl, Timer*, EMPTYARG )
}
// -----------------------------------------------------------------------
-IMPL_LINK( UpdateCheckUI, TimeOutHdl, Timer*, EMPTYARG )
+IMPL_LINK_NOARG(UpdateCheckUI, TimeOutHdl)
{
RemoveBubbleWindow( false );
@@ -690,7 +690,7 @@ IMPL_LINK( UpdateCheckUI, TimeOutHdl, Timer*, EMPTYARG )
}
// -----------------------------------------------------------------------
-IMPL_LINK( UpdateCheckUI, UserEventHdl, UpdateCheckUI*, EMPTYARG )
+IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl)
{
SolarMutexGuard aGuard;