summaryrefslogtreecommitdiff
path: root/fpicker
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 /fpicker
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 'fpicker')
-rw-r--r--fpicker/source/office/commonpicker.cxx2
-rw-r--r--fpicker/source/office/iodlg.cxx14
-rw-r--r--fpicker/source/office/iodlg.hxx8
3 files changed, 12 insertions, 12 deletions
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index df317e47a1f1..b7664c9731da 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -401,7 +401,7 @@ namespace svt
}
//---------------------------------------------------------------------
- IMPL_LINK( OCommonPicker, OnCancelPicker, void*, EMPTYARG )
+ IMPL_LINK_NOARG(OCommonPicker, OnCancelPicker)
{
// By definition, the solar mutex is locked when we arrive here. Note that this
// is important, as for instance the consistency of m_pDlg depends on this mutex.
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 4e801caace73..9ea83da4b3e1 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -968,7 +968,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const String& _rFilter )
}
//-----------------------------------------------------------------------------
-IMPL_LINK( SvtFileDialog, CancelHdl_Impl, void*, EMPTYARG )
+IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl)
{
if ( m_pCurrentAsyncAction.is() )
{
@@ -1623,7 +1623,7 @@ IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox )
//*****************************************************************************
-IMPL_LINK( SvtFileDialog, DblClickHdl_Impl, SvTabListBox*, EMPTYARG )
+IMPL_LINK_NOARG(SvtFileDialog, DblClickHdl_Impl)
{
_pImp->_bDoubleClick = sal_True;
OpenHdl_Impl( this, NULL );
@@ -1634,7 +1634,7 @@ IMPL_LINK( SvtFileDialog, DblClickHdl_Impl, SvTabListBox*, EMPTYARG )
//*****************************************************************************
-IMPL_LINK( SvtFileDialog, EntrySelectHdl_Impl, ComboBox*, EMPTYARG )
+IMPL_LINK_NOARG(SvtFileDialog, EntrySelectHdl_Impl)
{
FileSelect();
@@ -1668,7 +1668,7 @@ IMPL_LINK( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView )
//*****************************************************************************
-IMPL_LINK( SvtFileDialog, AutoExtensionHdl_Impl, CheckBox*, EMPTYARG )
+IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl)
{
if ( _pFileNotifier )
_pFileNotifier->notify( CTRL_STATE_CHANGED,
@@ -1710,7 +1710,7 @@ IMPL_LINK( SvtFileDialog, ClickHdl_Impl, CheckBox*, pCheckBox )
//*****************************************************************************
-IMPL_LINK( SvtFileDialog, PlayButtonHdl_Impl, PushButton*, EMPTYARG )
+IMPL_LINK_NOARG(SvtFileDialog, PlayButtonHdl_Impl)
{
if ( _pFileNotifier )
_pFileNotifier->notify( CTRL_STATE_CHANGED,
@@ -3348,7 +3348,7 @@ QueryFolderNameDialog::QueryFolderNameDialog
};
// -----------------------------------------------------------------------
-IMPL_LINK( QueryFolderNameDialog, OKHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(QueryFolderNameDialog, OKHdl)
{
// trim the strings
aNameEdit.SetText( aNameEdit.GetText().EraseLeadingChars().EraseTrailingChars() );
@@ -3357,7 +3357,7 @@ IMPL_LINK( QueryFolderNameDialog, OKHdl, Button *, EMPTYARG )
}
// -----------------------------------------------------------------------
-IMPL_LINK( QueryFolderNameDialog, NameHdl, Edit *, EMPTYARG )
+IMPL_LINK_NOARG(QueryFolderNameDialog, NameHdl)
{
// trim the strings
String aName = aNameEdit.GetText();
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 3a2a28cfae90..9a9da4b047d8 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -151,12 +151,12 @@ private:
void AddControls_Impl( );
DECL_LINK( SelectHdl_Impl, SvTabListBox* );
- DECL_LINK( DblClickHdl_Impl, SvTabListBox* );
- DECL_LINK( EntrySelectHdl_Impl, ComboBox* );
+ DECL_LINK(DblClickHdl_Impl, void *);
+ DECL_LINK(EntrySelectHdl_Impl, void *);
DECL_LINK( OpenDoneHdl_Impl, SvtFileView* );
- DECL_LINK( AutoExtensionHdl_Impl, CheckBox* );
+ DECL_LINK(AutoExtensionHdl_Impl, void *);
DECL_LINK( ClickHdl_Impl, CheckBox* );
- DECL_LINK( PlayButtonHdl_Impl, PushButton* );
+ DECL_LINK(PlayButtonHdl_Impl, void *);
// removes a filter with wildcards from the path and returns it
sal_Bool IsolateFilterFromPath_Impl( String& rPath, String& rFilter );