diff options
| author | Noel Grandin <noel@peralex.com> | 2015-10-20 17:22:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-21 07:44:43 +0000 |
| commit | 382eb1a23c390154619c385414bdbe6f6e461173 (patch) | |
| tree | dbd1970c3d36903b78ed4c754f5faf14f57755c7 /xmlsecurity | |
| parent | 652933e8fe46b24049ad0a6e61811727b1965aea (diff) | |
remove untyped Link<>
Change-Id: I809f9e10309ceadda0a82c3818277323b34ec61b
Reviewed-on: https://gerrit.libreoffice.org/19491
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/source/dialogs/certificatechooser.cxx | 1 | ||||
| -rw-r--r-- | xmlsecurity/workben/signaturetest.cxx | 21 |
2 files changed, 6 insertions, 16 deletions
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 8a9138ef94ac..24b13fc35903 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -119,7 +119,6 @@ short CertificateChooser::Execute() return ModalDialog::Execute(); } -// IMPL_LINK_NOARG(CertificateChooser, Initialize) void CertificateChooser::ImplInitialize() { if ( !mbInitialized ) diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx index e97e6f33c633..d16e9468f489 100644 --- a/xmlsecurity/workben/signaturetest.cxx +++ b/xmlsecurity/workben/signaturetest.cxx @@ -123,13 +123,9 @@ private: FixedLine maHintLine; FixedText maHintText; - DECL_LINK( CryptoCheckBoxHdl, CheckBox* ); - DECL_LINK( SignButtonHdl, Button* ); - DECL_LINK( VerifyButtonHdl, Button* ); - DECL_LINK( DigitalSignaturesWithServiceHdl, Button* ); - DECL_LINK( VerifyDigitalSignaturesHdl, Button* ); - DECL_LINK( DigitalSignaturesWithTokenHdl, Button* ); - DECL_LINK( StartVerifySignatureHdl, void* ); + DECL_LINK_TYPED( CryptoCheckBoxHdl, CheckBox*, void ); + DECL_LINK_TYPED( DigitalSignaturesWithServiceHdl, Button*, void ); + DECL_LINK_TYPED( VerifyDigitalSignaturesHdl, Button*, void ); public: MyWin( vcl::Window* pParent, WinBits nWinStyle ); @@ -255,7 +251,7 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : } -IMPL_LINK_NOARG(MyWin, CryptoCheckBoxHdl) +IMPL_LINK_NOARG_TYPED(MyWin, CryptoCheckBoxHdl, CheckBox*, void) { if ( maCryptoCheckBox.IsChecked() ) { @@ -267,10 +263,9 @@ IMPL_LINK_NOARG(MyWin, CryptoCheckBoxHdl) maEditTokenName.Enable(); maFixedTextTokenName.Enable(); } - return 1; } -IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl) +IMPL_LINK_NOARG_TYPED(MyWin, DigitalSignaturesWithServiceHdl, Button*, void) { OUString aDocFileName = maEditDOCFileName.GetText(); uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( @@ -279,11 +274,9 @@ IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl) uno::Reference< security::XDocumentDigitalSignatures > xD( security::DocumentDigitalSignatures::createDefault(comphelper::getProcessComponentContext()) ); xD->signDocumentContent( xStore, NULL ); - - return 0; } -IMPL_LINK_NOARG(MyWin, VerifyDigitalSignaturesHdl) +IMPL_LINK_NOARG_TYPED(MyWin, VerifyDigitalSignaturesHdl, Button*, void) { OUString aDocFileName = maEditDOCFileName.GetText(); uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL( @@ -303,8 +296,6 @@ IMPL_LINK_NOARG(MyWin, VerifyDigitalSignaturesHdl) aText.append( "valid" ); ScopedVclPtr<InfoBox>::Create( this, aText )->Execute(); } - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |