diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
commit | bd205223ec029a875c662474bb6d423d3cdd1994 (patch) | |
tree | 6531a292edb0d2a13103a4c55cbd10e7137b8a58 /xmlsecurity | |
parent | 32781c2d268ed94eb46318a0398385baf31368c4 (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 'xmlsecurity')
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/certificatechooser.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx | 6 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsecurity/macrosecurity.hxx | 2 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/certificatechooser.cxx | 8 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/certificateviewer.cxx | 6 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 14 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/macrosecurity.cxx | 16 | ||||
-rw-r--r-- | xmlsecurity/source/dialogs/warnings.cxx | 4 | ||||
-rw-r--r-- | xmlsecurity/workben/signaturetest.cxx | 6 |
9 files changed, 32 insertions, 32 deletions
diff --git a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx index 65c69f691aff..70567dda80f5 100644 --- a/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificatechooser.hxx @@ -74,7 +74,7 @@ private: sal_Bool mbInitialized; sal_uInt16 GetSelectedEntryPos( void ) const; - DECL_LINK( ViewButtonHdl, Button* ); + DECL_LINK(ViewButtonHdl, void *); DECL_LINK( CertificateHighlightHdl, void* ); DECL_LINK( CertificateSelectHdl, void* ); diff --git a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx index 7bc0a1b29de6..08529dd39d05 100644 --- a/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/xmlsecurity/digitalsignaturesdialog.hxx @@ -104,9 +104,9 @@ private: bool m_bHasDocumentSignature; bool m_bWarningShowSignMacro; - DECL_LINK( ViewButtonHdl, Button* ); - DECL_LINK( AddButtonHdl, Button* ); - DECL_LINK( RemoveButtonHdl, Button* ); + DECL_LINK(ViewButtonHdl, void *); + DECL_LINK(AddButtonHdl, void *); + DECL_LINK(RemoveButtonHdl, void *); DECL_LINK( SignatureHighlightHdl, void* ); DECL_LINK( SignatureSelectHdl, void* ); DECL_LINK( StartVerifySignatureHdl, void* ); diff --git a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx index 178d44555f9b..3af050e7489e 100644 --- a/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx +++ b/xmlsecurity/inc/xmlsecurity/macrosecurity.hxx @@ -124,7 +124,7 @@ private: sal_uInt16 mnCurLevel; protected: - DECL_LINK( RadioButtonHdl, RadioButton* ); + DECL_LINK(RadioButtonHdl, void *); public: MacroSecurityLevelTP( Window* pParent, MacroSecurity* _pDlg ); diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index bcafd92fbbca..6651fa0f4a9e 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -122,7 +122,7 @@ short CertificateChooser::Execute() return ModalDialog::Execute(); } -// IMPL_LINK( CertificateChooser, Initialize, void*, EMPTYARG ) +// IMPL_LINK_NOARG(CertificateChooser, Initialize) void CertificateChooser::ImplInitialize() { if ( !mbInitialized ) @@ -206,7 +206,7 @@ uno::Reference< dcss::security::XCertificate > CertificateChooser::GetSelectedCe return xCert; } -IMPL_LINK( CertificateChooser, CertificateHighlightHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(CertificateChooser, CertificateHighlightHdl) { sal_Bool bEnable = GetSelectedCertificate().is(); maViewBtn.Enable( bEnable ); @@ -214,13 +214,13 @@ IMPL_LINK( CertificateChooser, CertificateHighlightHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( CertificateChooser, CertificateSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(CertificateChooser, CertificateSelectHdl) { EndDialog( RET_OK ); return 0; } -IMPL_LINK( CertificateChooser, ViewButtonHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(CertificateChooser, ViewButtonHdl) { ImplShowCertificateDetails(); return 0; diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 8169fcc834d6..b2c0f4240c48 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -342,7 +342,7 @@ void CertificateViewerDetailsTP::ActivatePage() { } -IMPL_LINK( CertificateViewerDetailsTP, ElementSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl) { SvLBoxEntry* pEntry = maElementsLB.FirstSelected(); String aElementText; @@ -461,7 +461,7 @@ void CertificateViewerCertPathTP::ActivatePage() } } -IMPL_LINK( CertificateViewerCertPathTP, ViewCertHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl) { SvLBoxEntry* pEntry = maCertPathLB.FirstSelected(); if( pEntry ) @@ -473,7 +473,7 @@ IMPL_LINK( CertificateViewerCertPathTP, ViewCertHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( CertificateViewerCertPathTP, CertSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl) { String sStatus; SvLBoxEntry* pEntry = maCertPathLB.FirstSelected(); diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 7a8a2d4b2766..c85a251225ce 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -370,7 +370,7 @@ short DigitalSignaturesDialog::Execute() return Dialog::Execute(); } -IMPL_LINK( DigitalSignaturesDialog, SignatureHighlightHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureHighlightHdl) { bool bSel = maSignaturesLB.FirstSelected() ? true : false; maViewBtn.Enable( bSel ); @@ -380,7 +380,7 @@ IMPL_LINK( DigitalSignaturesDialog, SignatureHighlightHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( DigitalSignaturesDialog, OKButtonHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, OKButtonHdl) { // Export all other signatures... SignatureStreamHelper aStreamHelper = ImplOpenSignatureStream( @@ -409,19 +409,19 @@ IMPL_LINK( DigitalSignaturesDialog, OKButtonHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( DigitalSignaturesDialog, SignatureSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl) { ImplShowSignaturesDetails(); return 0; } -IMPL_LINK( DigitalSignaturesDialog, ViewButtonHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, ViewButtonHdl) { ImplShowSignaturesDetails(); return 0; } -IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl) { if( ! canAdd()) return 0; @@ -527,7 +527,7 @@ IMPL_LINK( DigitalSignaturesDialog, AddButtonHdl, Button*, EMPTYARG ) return 0; } -IMPL_LINK( DigitalSignaturesDialog, RemoveButtonHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, RemoveButtonHdl) { if (!canRemove()) return 0; @@ -570,7 +570,7 @@ IMPL_LINK( DigitalSignaturesDialog, RemoveButtonHdl, Button*, EMPTYARG ) return 0; } -IMPL_LINK( DigitalSignaturesDialog, StartVerifySignatureHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(DigitalSignaturesDialog, StartVerifySignatureHdl) { return mbVerifySignatures ? 1 : 0; } diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 010cf7ab3191..dd9bda48f3e8 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star; -IMPL_LINK( MacroSecurity, OkBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurity, OkBtnHdl) { mpLevelTP->ClosePage(); mpTrustSrcTP->ClosePage(); @@ -158,7 +158,7 @@ MacroSecurityLevelTP::MacroSecurityLevelTP( Window* _pParent, MacroSecurity* _pD } -IMPL_LINK( MacroSecurityLevelTP, RadioButtonHdl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl) { sal_uInt16 nNewLevel = 0; if( maVeryHighRB.IsChecked() ) @@ -193,7 +193,7 @@ void MacroSecurityTrustedSourcesTP::ImplCheckButtons() } -IMPL_LINK( MacroSecurityTrustedSourcesTP, ViewCertPBHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl) { if( maTrustCertLB.FirstSelected() ) { @@ -219,7 +219,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, ViewCertPBHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl) { if( maTrustCertLB.FirstSelected() ) { @@ -233,7 +233,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( MacroSecurityTrustedSourcesTP, AddLocPBHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl) { try { @@ -274,7 +274,7 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, AddLocPBHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl) { sal_uInt16 nSel = maTrustFileLocLB.GetSelectEntryPos(); if( nSel != LISTBOX_ENTRY_NOTFOUND ) @@ -295,13 +295,13 @@ IMPL_LINK( MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl) { ImplCheckButtons(); return 0; } -IMPL_LINK( MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl) { ImplCheckButtons(); return 0; diff --git a/xmlsecurity/source/dialogs/warnings.cxx b/xmlsecurity/source/dialogs/warnings.cxx index c56575b90b42..00e722ea79b2 100644 --- a/xmlsecurity/source/dialogs/warnings.cxx +++ b/xmlsecurity/source/dialogs/warnings.cxx @@ -115,7 +115,7 @@ MacroWarning::~MacroWarning() { } -IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroWarning, ViewSignsBtnHdl) { DBG_ASSERT( mxCert.is(), "*MacroWarning::ViewSignsBtnHdl(): no certificate set!" ); @@ -125,7 +125,7 @@ IMPL_LINK( MacroWarning, ViewSignsBtnHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( MacroWarning, EnableBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl) { if( mbSignedMode && maAlwaysTrustCB.IsChecked() ) { // insert path into trusted path list diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx index b312d62f31c9..3071cfbfe5dd 100644 --- a/xmlsecurity/workben/signaturetest.cxx +++ b/xmlsecurity/workben/signaturetest.cxx @@ -293,7 +293,7 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) : } -IMPL_LINK( MyWin, CryptoCheckBoxHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(MyWin, CryptoCheckBoxHdl) { if ( maCryptoCheckBox.IsChecked() ) { @@ -308,7 +308,7 @@ IMPL_LINK( MyWin, CryptoCheckBoxHdl, CheckBox*, EMPTYARG ) return 1; } -IMPL_LINK( MyWin, DigitalSignaturesWithServiceHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl) { rtl::OUString aDocFileName = maEditDOCFileName.GetText(); uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( @@ -323,7 +323,7 @@ IMPL_LINK( MyWin, DigitalSignaturesWithServiceHdl, Button*, EMPTYARG ) return 0; } -IMPL_LINK( MyWin, VerifyDigitalSignaturesHdl, Button*, EMPTYARG ) +IMPL_LINK_NOARG(MyWin, VerifyDigitalSignaturesHdl) { rtl::OUString aDocFileName = maEditDOCFileName.GetText(); uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( |