summaryrefslogtreecommitdiff
path: root/svx/source/form
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 /svx/source/form
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 'svx/source/form')
-rw-r--r--svx/source/form/datanavi.cxx28
-rw-r--r--svx/source/form/filtnav.cxx2
-rw-r--r--svx/source/form/fmshimp.cxx2
-rw-r--r--svx/source/form/formcontroller.cxx4
-rw-r--r--svx/source/form/navigatortree.cxx8
5 files changed, 22 insertions, 22 deletions
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index ebdaff328ef9..aab704a6cf09 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -360,13 +360,13 @@ namespace svxform
{
}
//------------------------------------------------------------------------
- IMPL_LINK( XFormsPage, TbxSelectHdl, ToolBox *, EMPTYARG )
+ IMPL_LINK_NOARG(XFormsPage, TbxSelectHdl)
{
DoToolBoxAction( m_aToolBox.GetCurItemId() );
return 0;
}
//------------------------------------------------------------------------
- IMPL_LINK( XFormsPage, ItemSelectHdl, DataTreeListBox *, EMPTYARG )
+ IMPL_LINK_NOARG(XFormsPage, ItemSelectHdl)
{
EnableMenuItems( NULL );
return 0;
@@ -1985,7 +1985,7 @@ namespace svxform
return 0;
}
// -----------------------------------------------------------------------
- IMPL_LINK( DataNavigatorWindow, ActivatePageHdl, TabControl *, EMPTYARG )
+ IMPL_LINK_NOARG(DataNavigatorWindow, ActivatePageHdl)
{
sal_uInt16 nId = 0;
XFormsPage* pPage = GetCurrentPage( nId );
@@ -1999,7 +1999,7 @@ namespace svxform
return 0;
}
// -----------------------------------------------------------------------
- IMPL_LINK( DataNavigatorWindow, UpdateHdl, Timer *, EMPTYARG )
+ IMPL_LINK_NOARG(DataNavigatorWindow, UpdateHdl)
{
ModelSelectHdl( NULL );
return 0;
@@ -2681,7 +2681,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- IMPL_LINK( AddDataItemDialog, OKHdl, OKButton *, EMPTYARG )
+ IMPL_LINK_NOARG(AddDataItemDialog, OKHdl)
{
bool bIsHandleBinding = ( DITBinding == m_eItemType );
bool bIsHandleText = ( DITText == m_eItemType );
@@ -3077,7 +3077,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- IMPL_LINK( AddConditionDialog, EditHdl, PushButton *, EMPTYARG )
+ IMPL_LINK_NOARG(AddConditionDialog, EditHdl)
{
Reference< XNameContainer > xNameContnr;
try
@@ -3102,7 +3102,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- IMPL_LINK( AddConditionDialog, OKHdl, OKButton *, EMPTYARG )
+ IMPL_LINK_NOARG(AddConditionDialog, OKHdl)
{
/*!!!
try
@@ -3120,14 +3120,14 @@ namespace svxform
}
//------------------------------------------------------------------------
- IMPL_LINK( AddConditionDialog, ModifyHdl, MultiLineEdit *, EMPTYARG )
+ IMPL_LINK_NOARG(AddConditionDialog, ModifyHdl)
{
m_aResultTimer.Start();
return 0;
}
//------------------------------------------------------------------------
- IMPL_LINK( AddConditionDialog, ResultHdl, Timer *, EMPTYARG )
+ IMPL_LINK_NOARG(AddConditionDialog, ResultHdl)
{
String sCondition = m_aConditionED.GetText().EraseLeadingChars().EraseTrailingChars();
String sResult;
@@ -3257,7 +3257,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- IMPL_LINK( NamespaceItemDialog, OKHdl, OKButton *, EMPTYARG )
+ IMPL_LINK_NOARG(NamespaceItemDialog, OKHdl)
{
try
{
@@ -3355,7 +3355,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- IMPL_LINK( ManageNamespaceDialog, OKHdl, OKButton *, EMPTYARG )
+ IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl)
{
String sPrefix = m_aPrefixED.GetText();
@@ -3432,7 +3432,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- IMPL_LINK( AddSubmissionDialog, RefHdl, PushButton *, EMPTYARG )
+ IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl)
{
AddConditionDialog aDlg( this, PN_BINDING_EXPR, m_xTempBinding );
aDlg.SetCondition( m_aRefED.GetText() );
@@ -3443,7 +3443,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- IMPL_LINK( AddSubmissionDialog, OKHdl, OKButton *, EMPTYARG )
+ IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl)
{
rtl::OUString sName(m_aNameED.GetText());
if(sName.isEmpty()) {
@@ -3683,7 +3683,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- IMPL_LINK( AddInstanceDialog, FilePickerHdl, PushButton *, EMPTYARG )
+ IMPL_LINK_NOARG(AddInstanceDialog, FilePickerHdl)
{
::sfx2::FileDialogHelper aDlg(
css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index bc19a1c39cec..9734fac2e90c 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1281,7 +1281,7 @@ IMPL_LINK( FmFilterNavigator, OnRemove, SvLBoxEntry*, pEntry )
}
//------------------------------------------------------------------------
-IMPL_LINK( FmFilterNavigator, OnDropActionTimer, void*, EMPTYARG )
+IMPL_LINK_NOARG(FmFilterNavigator, OnDropActionTimer)
{
if (--m_aTimerCounter > 0)
return 0L;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 95d177a92fa2..2edf59dafb60 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1058,7 +1058,7 @@ void FmXFormShell::LockSlotInvalidation(sal_Bool bLock)
}
//------------------------------------------------------------------------------
-IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG)
+IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots)
{
if ( impl_checkDisposed() )
return 0L;
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index c6471c95b722..956663c906fc 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -1495,7 +1495,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields)
}
//------------------------------------------------------------------------------
-IMPL_LINK(FormController, OnToggleAutoFields, void*, EMPTYARG)
+IMPL_LINK_NOARG(FormController, OnToggleAutoFields)
{
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2678,7 +2678,7 @@ void FormController::updateAllDispatchers() const
}
//------------------------------------------------------------------------------
-IMPL_LINK(FormController, OnLoad, void*, EMPTYARG)
+IMPL_LINK_NOARG(FormController, OnLoad)
{
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
m_bLocked = determineLockState();
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index df1c845e9c84..53947c390000 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1528,7 +1528,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- IMPL_LINK( NavigatorTree, OnEdit, void*, EMPTYARG )
+ IMPL_LINK_NOARG(NavigatorTree, OnEdit)
{
nEditEvent = 0;
EditEntry( m_pEditEntry );
@@ -1538,7 +1538,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- IMPL_LINK( NavigatorTree, OnDropActionTimer, void*, EMPTYARG )
+ IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer)
{
if (--m_aTimerCounter > 0)
return 0L;
@@ -1592,7 +1592,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- IMPL_LINK(NavigatorTree, OnSynchronizeTimer, void*, EMPTYARG)
+ IMPL_LINK_NOARG(NavigatorTree, OnSynchronizeTimer)
{
SynchronizeMarkList();
return 0L;
@@ -1600,7 +1600,7 @@ namespace svxform
//------------------------------------------------------------------------
- IMPL_LINK( NavigatorTree, OnClipboardAction, void*, EMPTYARG )
+ IMPL_LINK_NOARG(NavigatorTree, OnClipboardAction)
{
if ( !m_aControlExchange.isClipboardOwner() )
{