summaryrefslogtreecommitdiff
path: root/filter
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 /filter
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 'filter')
-rw-r--r--filter/source/pdf/impdialog.cxx24
-rw-r--r--filter/source/pdf/impdialog.hxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx4
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabdialog.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.cxx2
6 files changed, 19 insertions, 19 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 583b96bb876d..5024c30226c3 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -265,7 +265,7 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
/////////////////
}
-IMPL_LINK( ImpPDFTabDialog, CancelHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(ImpPDFTabDialog, CancelHdl)
{
EndDialog( sal_False );
return 0;
@@ -665,7 +665,7 @@ SfxTabPage* ImpPDFTabGeneralPage::Create( Window* pParent,
}
// -----------------------------------------------------------------------------
-IMPL_LINK( ImpPDFTabGeneralPage, TogglePagesHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePagesHdl)
{
maEdPages.Enable( maRbRange.IsChecked() );
if ( maRbRange.IsChecked() )
@@ -674,7 +674,7 @@ IMPL_LINK( ImpPDFTabGeneralPage, TogglePagesHdl, void*, EMPTYARG )
}
// -----------------------------------------------------------------------------
-IMPL_LINK( ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl)
{
maLbFormsFormat.Enable( maCbExportFormFields.IsChecked() );
maCbAllowDuplicateFieldNames.Enable( maCbExportFormFields.IsChecked() );
@@ -682,21 +682,21 @@ IMPL_LINK( ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl, void*, EMPTYARG )
}
// -----------------------------------------------------------------------------
-IMPL_LINK( ImpPDFTabGeneralPage, ToggleCompressionHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleCompressionHdl)
{
maNfQuality.Enable( maRbJPEGCompression.IsChecked() );
return 0;
}
// -----------------------------------------------------------------------------
-IMPL_LINK( ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl)
{
maCoReduceImageResolution.Enable( maCbReduceImageResolution.IsChecked() );
return 0;
}
// -----------------------------------------------------------------------------
-IMPL_LINK( ImpPDFTabGeneralPage, ToggleAddStreamHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl)
{
if( maCbAddStream.IsVisible() )
{
@@ -719,7 +719,7 @@ IMPL_LINK( ImpPDFTabGeneralPage, ToggleAddStreamHdl, void*, EMPTYARG )
}
// -----------------------------------------------------------------------------
-IMPL_LINK( ImpPDFTabGeneralPage, ToggleExportPDFAHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl)
{
ImpPDFTabSecurityPage* pSecPage = NULL;
//set the security page status (and its controls as well)
@@ -935,7 +935,7 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
}
}
-IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl)
{
maCbPgLyFirstOnLeft.Enable( maRbPgLyContinueFacing.IsChecked() );
return 0;
@@ -1217,7 +1217,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen
!( ( ImpPDFTabGeneralPage* )paParent->GetTabPage( RID_PDF_TAB_GENER ) )->IsPdfaSelected() );
}
-IMPL_LINK( ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl)
{
SfxPasswordDialog aPwdDialog( this, &msUserPwdTitle );
aPwdDialog.SetMinLen( 0 );
@@ -1479,7 +1479,7 @@ void ImpPDFTabLinksPage::ImplPDFALinkControl( sal_Bool bEnableLaunch )
// -----------------------------------------------------------------------------
// reset the memory of Launch action present
// when PDF/A-1 was requested
-IMPL_LINK( ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl)
{
mbOpnLnksDefaultUserState = maRbOpnLnksDefault.IsChecked();
mbOpnLnksLaunchUserState = maRbOpnLnksLaunch.IsChecked();
@@ -1490,7 +1490,7 @@ IMPL_LINK( ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, void*, EMPTYARG )
// -----------------------------------------------------------------------------
// reset the memory of a launch action present
// when PDF/A-1 was requested
-IMPL_LINK( ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl, void*, EMPTYARG )
+IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl)
{
mbOpnLnksDefaultUserState = maRbOpnLnksDefault.IsChecked();
mbOpnLnksLaunchUserState = maRbOpnLnksLaunch.IsChecked();
@@ -1594,7 +1594,7 @@ ImplErrorDialog::~ImplErrorDialog()
delete (String*)maErrors.GetEntryData( n );
}
-IMPL_LINK( ImplErrorDialog, SelectHdl, ListBox*, EMPTYARG )
+IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl)
{
String* pStr = reinterpret_cast<String*>(maErrors.GetEntryData( maErrors.GetSelectEntryPos() ));
maExplanation.SetText( pStr ? *pStr : String() );
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index ffa08b02f45e..7ee03ffcb696 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -72,7 +72,7 @@ class ImplErrorDialog : public ModalDialog
OKButton maButton;
- DECL_LINK( SelectHdl, ListBox* );
+ DECL_LINK(SelectHdl, void *);
public:
ImplErrorDialog( const std::set< vcl::PDFWriter::ErrorCode >& );
~ImplErrorDialog();
@@ -89,7 +89,7 @@ private:
Any maSelection;
- DECL_LINK( CancelHdl, Button * );
+ DECL_LINK(CancelHdl, void *);
protected:
//the following data are the configuration used throughout the dialog and pages
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index f9c081eb32c7..0bc05d6b7a2f 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -168,7 +168,7 @@ IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, PushButton *, pButton )
// -----------------------------------------------------------------------
-IMPL_LINK(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl)
{
updateStates();
return 0;
@@ -176,7 +176,7 @@ IMPL_LINK(XMLFilterSettingsDialog, SelectionChangedHdl_Impl, void *, EMPTYARG )
// -----------------------------------------------------------------------
-IMPL_LINK(XMLFilterSettingsDialog, DoubleClickHdl_Impl, void *, EMPTYARG )
+IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl)
{
onEdit();
return 0;
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index 8279fa2cf46e..f45d8da4b7da 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -336,7 +336,7 @@ filter_info_impl* XMLFilterTabDialog::getNewFilterInfo() const
// -----------------------------------------------------------------------
-IMPL_LINK( XMLFilterTabDialog, OkHdl, Button *, EMPTYARG )
+IMPL_LINK_NOARG(XMLFilterTabDialog, OkHdl)
{
if( onOk() )
EndDialog(1);
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
index 06386f8f93e2..04439a7a4b6a 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx
@@ -57,7 +57,7 @@ private:
DECL_LINK( ActivatePageHdl, TabControl * );
DECL_LINK( DeactivatePageHdl, TabControl * );
- DECL_LINK( OkHdl, Button * );
+ DECL_LINK(OkHdl, void *);
ResMgr& mrResMgr;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 1a581736b05f..80474742481f 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -199,7 +199,7 @@ OUString XMLFilterTabPageXSLT::GetURL( SvtURLBox& rURLBox )
return aURL;
}
-IMPL_LINK ( XMLFilterTabPageXSLT, ToggleXSLTImplHdl, void *, EMPTYARG) {
+IMPL_LINK_NOARG(XMLFilterTabPageXSLT, ToggleXSLTImplHdl) {
return (0L);
}