diff options
Diffstat (limited to 'xmlsecurity/source')
-rw-r--r-- | xmlsecurity/source/dialogs/certificatechooser.cxx | 6 | ||||
-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/helper/xmlsignaturehelper.cxx | 6 |
5 files changed, 24 insertions, 24 deletions
diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 62ec941220c7..499ad49f5063 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -215,7 +215,7 @@ OUString CertificateChooser::GetDescription() return m_pDescriptionED->GetText(); } -IMPL_LINK_NOARG_TYPED(CertificateChooser, CertificateHighlightHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(CertificateChooser, CertificateHighlightHdl, SvTreeListBox*, void) { bool bEnable = GetSelectedCertificate().is(); m_pViewBtn->Enable( bEnable ); @@ -223,13 +223,13 @@ IMPL_LINK_NOARG_TYPED(CertificateChooser, CertificateHighlightHdl, SvTreeListBox m_pDescriptionED->Enable(bEnable); } -IMPL_LINK_NOARG_TYPED(CertificateChooser, CertificateSelectHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(CertificateChooser, CertificateSelectHdl, SvTreeListBox*, bool) { EndDialog( RET_OK ); return false; } -IMPL_LINK_NOARG_TYPED(CertificateChooser, ViewButtonHdl, Button*, void) +IMPL_LINK_NOARG(CertificateChooser, ViewButtonHdl, Button*, void) { ImplShowCertificateDetails(); } diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index a2b61370e86b..9f42cd127970 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -317,7 +317,7 @@ void CertificateViewerDetailsTP::ActivatePage() { } -IMPL_LINK_NOARG_TYPED(CertificateViewerDetailsTP, ElementSelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(CertificateViewerDetailsTP, ElementSelectHdl, SvTreeListBox*, void) { SvTreeListEntry* pEntry = m_pElementsLB->FirstSelected(); OUString aElementText; @@ -425,7 +425,7 @@ void CertificateViewerCertPathTP::ActivatePage() } } -IMPL_LINK_NOARG_TYPED(CertificateViewerCertPathTP, ViewCertHdl, Button*, void) +IMPL_LINK_NOARG(CertificateViewerCertPathTP, ViewCertHdl, Button*, void) { SvTreeListEntry* pEntry = mpCertPathLB->FirstSelected(); if( pEntry ) @@ -438,7 +438,7 @@ IMPL_LINK_NOARG_TYPED(CertificateViewerCertPathTP, ViewCertHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(CertificateViewerCertPathTP, CertSelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(CertificateViewerCertPathTP, CertSelectHdl, SvTreeListBox*, void) { OUString sStatus; SvTreeListEntry* pEntry = mpCertPathLB->FirstSelected(); diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index e7456a9a72b2..ca33f875b38b 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -315,7 +315,7 @@ short DigitalSignaturesDialog::Execute() return Dialog::Execute(); } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, SignatureHighlightHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureHighlightHdl, SvTreeListBox*, void) { bool bSel = m_pSignaturesLB->FirstSelected(); m_pViewBtn->Enable( bSel ); @@ -323,25 +323,25 @@ IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, SignatureHighlightHdl, SvTreeList m_pRemoveBtn->Enable( bSel ); } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, OKButtonHdl, Button*, void) +IMPL_LINK_NOARG(DigitalSignaturesDialog, OKButtonHdl, Button*, void) { maSignatureManager.write(); EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, SignatureSelectHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl, SvTreeListBox*, bool) { ImplShowSignaturesDetails(); return false; } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, ViewButtonHdl, Button*, void) +IMPL_LINK_NOARG(DigitalSignaturesDialog, ViewButtonHdl, Button*, void) { ImplShowSignaturesDetails(); } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, AddButtonHdl, Button*, void) +IMPL_LINK_NOARG(DigitalSignaturesDialog, AddButtonHdl, Button*, void) { if( ! canAdd()) return; @@ -382,7 +382,7 @@ IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, AddButtonHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, RemoveButtonHdl, Button*, void) +IMPL_LINK_NOARG(DigitalSignaturesDialog, RemoveButtonHdl, Button*, void) { if (!canRemove()) return; @@ -407,7 +407,7 @@ IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, RemoveButtonHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(DigitalSignaturesDialog, StartVerifySignatureHdl, LinkParamNone*, bool) +IMPL_LINK_NOARG(DigitalSignaturesDialog, StartVerifySignatureHdl, LinkParamNone*, bool) { return mbVerifySignatures; } diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index d73123ea7ba5..b5771f4b3b78 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star; -IMPL_LINK_NOARG_TYPED(MacroSecurity, OkBtnHdl, Button*, void) +IMPL_LINK_NOARG(MacroSecurity, OkBtnHdl, Button*, void) { mpLevelTP->ClosePage(); mpTrustSrcTP->ClosePage(); @@ -182,7 +182,7 @@ void MacroSecurityLevelTP::dispose() MacroSecurityTP::dispose(); } -IMPL_LINK_NOARG_TYPED(MacroSecurityLevelTP, RadioButtonHdl, Button*, void) +IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl, Button*, void) { sal_uInt16 nNewLevel = 0; if( m_pVeryHighRB->IsChecked() ) @@ -215,7 +215,7 @@ void MacroSecurityTrustedSourcesTP::ImplCheckButtons() } -IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, ViewCertPBHdl, Button*, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, ViewCertPBHdl, Button*, void) { if( m_pTrustCertLB->FirstSelected() ) { @@ -240,7 +240,7 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, ViewCertPBHdl, Button*, voi } } -IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, Button*, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, Button*, void) { if( m_pTrustCertLB->FirstSelected() ) { @@ -252,7 +252,7 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveCertPBHdl, Button*, v } } -IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, AddLocPBHdl, Button*, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, AddLocPBHdl, Button*, void) { try { @@ -290,7 +290,7 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, AddLocPBHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, Button*, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, Button*, void) { sal_Int32 nSel = m_pTrustFileLocLB->GetSelectEntryPos(); if( nSel != LISTBOX_ENTRY_NOTFOUND ) @@ -309,12 +309,12 @@ IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, RemoveLocPBHdl, Button*, vo } } -IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustCertLBSelectHdl, SvTreeListBox*, void) { ImplCheckButtons(); } -IMPL_LINK_NOARG_TYPED(MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(MacroSecurityTrustedSourcesTP, TrustFileLocLBSelectHdl, ListBox&, void) { ImplCheckButtons(); } diff --git a/xmlsecurity/source/helper/xmlsignaturehelper.cxx b/xmlsecurity/source/helper/xmlsignaturehelper.cxx index a79a98213c10..8a895b5c867a 100644 --- a/xmlsecurity/source/helper/xmlsignaturehelper.cxx +++ b/xmlsecurity/source/helper/xmlsignaturehelper.cxx @@ -350,21 +350,21 @@ uno::Reference< css::xml::crypto::XSecurityEnvironment > XMLSignatureHelper::Get return (mxSecurityContext.is()?(mxSecurityContext->getSecurityEnvironment()): uno::Reference< css::xml::crypto::XSecurityEnvironment >()); } -IMPL_LINK_TYPED( XMLSignatureHelper, SignatureCreationResultListener, XMLSignatureCreationResult&, rResult, void ) +IMPL_LINK( XMLSignatureHelper, SignatureCreationResultListener, XMLSignatureCreationResult&, rResult, void ) { maCreationResults.insert( maCreationResults.begin() + maCreationResults.size(), rResult ); if ( rResult.nSignatureCreationResult != css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED ) mbError = true; } -IMPL_LINK_TYPED( XMLSignatureHelper, SignatureVerifyResultListener, XMLSignatureVerifyResult&, rResult, void ) +IMPL_LINK( XMLSignatureHelper, SignatureVerifyResultListener, XMLSignatureVerifyResult&, rResult, void ) { maVerifyResults.insert( maVerifyResults.begin() + maVerifyResults.size(), rResult ); if ( rResult.nSignatureVerifyResult != css::xml::crypto::SecurityOperationStatus_OPERATION_SUCCEEDED ) mbError = true; } -IMPL_LINK_NOARG_TYPED( XMLSignatureHelper, StartVerifySignatureElement, LinkParamNone*, void ) +IMPL_LINK_NOARG( XMLSignatureHelper, StartVerifySignatureElement, LinkParamNone*, void ) { if ( !maStartVerifySignatureHdl.IsSet() || maStartVerifySignatureHdl.Call(nullptr) ) { |