diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /xmlsecurity/inc | |
parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'xmlsecurity/inc')
-rw-r--r-- | xmlsecurity/inc/certificatechooser.hxx | 6 | ||||
-rw-r--r-- | xmlsecurity/inc/certificateviewer.hxx | 6 | ||||
-rw-r--r-- | xmlsecurity/inc/digitalsignaturesdialog.hxx | 14 | ||||
-rw-r--r-- | xmlsecurity/inc/macrosecurity.hxx | 16 | ||||
-rw-r--r-- | xmlsecurity/inc/xmlsignaturehelper.hxx | 6 |
5 files changed, 24 insertions, 24 deletions
diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx index 9f96e338cdf9..fe138c67700b 100644 --- a/xmlsecurity/inc/certificatechooser.hxx +++ b/xmlsecurity/inc/certificatechooser.hxx @@ -56,9 +56,9 @@ private: sal_uInt16 GetSelectedEntryPos() const; - DECL_LINK_TYPED(ViewButtonHdl, Button*, void); - DECL_LINK_TYPED(CertificateHighlightHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED(CertificateSelectHdl, SvTreeListBox*, bool ); + DECL_LINK(ViewButtonHdl, Button*, void); + DECL_LINK(CertificateHighlightHdl, SvTreeListBox*, void ); + DECL_LINK(CertificateSelectHdl, SvTreeListBox*, bool ); void ImplShowCertificateDetails(); void ImplInitialize(); diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx index bd5e19c87cd9..03f8b89bfe2f 100644 --- a/xmlsecurity/inc/certificateviewer.hxx +++ b/xmlsecurity/inc/certificateviewer.hxx @@ -102,7 +102,7 @@ private: vcl::Font m_aStdFont; vcl::Font m_aFixedWidthFont; - DECL_LINK_TYPED( ElementSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ElementSelectHdl, SvTreeListBox*, void ); void Clear(); void InsertElement( const OUString& _rField, const OUString& _rValue, const OUString& _rDetails, bool _bFixedWidthFont = false ); @@ -129,8 +129,8 @@ private: OUString msCertOK; OUString msCertNotValidated; - DECL_LINK_TYPED( ViewCertHdl, Button*, void ); - DECL_LINK_TYPED( CertSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ViewCertHdl, Button*, void ); + DECL_LINK( CertSelectHdl, SvTreeListBox*, void ); void Clear(); SvTreeListEntry* InsertCert( SvTreeListEntry* _pParent, const OUString& _rName, const css::uno::Reference< css::security::XCertificate >& rxCert, diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx index 075f67fa4b9b..1422acadcf9d 100644 --- a/xmlsecurity/inc/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx @@ -83,13 +83,13 @@ private: bool m_bHasDocumentSignature; bool m_bWarningShowSignMacro; - DECL_LINK_TYPED(ViewButtonHdl, Button*, void); - DECL_LINK_TYPED(AddButtonHdl, Button*, void); - DECL_LINK_TYPED(RemoveButtonHdl, Button*, void); - DECL_LINK_TYPED(SignatureHighlightHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED(SignatureSelectHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED(StartVerifySignatureHdl, LinkParamNone*, bool ); - DECL_LINK_TYPED(OKButtonHdl, Button*, void ); + DECL_LINK(ViewButtonHdl, Button*, void); + DECL_LINK(AddButtonHdl, Button*, void); + DECL_LINK(RemoveButtonHdl, Button*, void); + DECL_LINK(SignatureHighlightHdl, SvTreeListBox*, void ); + DECL_LINK(SignatureSelectHdl, SvTreeListBox*, bool ); + DECL_LINK(StartVerifySignatureHdl, LinkParamNone*, bool ); + DECL_LINK(OKButtonHdl, Button*, void ); void ImplGetSignatureInformations(bool bUseTempStream, bool bCacheLastSignature = true); void ImplFillSignaturesBox(); diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx index 7a2ac1d11bca..19da1e764289 100644 --- a/xmlsecurity/inc/macrosecurity.hxx +++ b/xmlsecurity/inc/macrosecurity.hxx @@ -61,7 +61,7 @@ private: VclPtr<MacroSecurityTP> mpLevelTP; VclPtr<MacroSecurityTP> mpTrustSrcTP; - DECL_LINK_TYPED( OkBtnHdl, Button*, void ); + DECL_LINK( OkBtnHdl, Button*, void ); public: MacroSecurity(vcl::Window* pParent, const css::uno::Reference< css::uno::XComponentContext>& rxCtx, @@ -99,7 +99,7 @@ private: sal_uInt16 mnCurLevel; protected: - DECL_LINK_TYPED(RadioButtonHdl, Button*, void); + DECL_LINK(RadioButtonHdl, Button*, void); public: MacroSecurityLevelTP( vcl::Window* pParent, MacroSecurity* _pDlg ); @@ -127,12 +127,12 @@ private: bool mbAuthorsReadonly; bool mbURLsReadonly; - DECL_LINK_TYPED( ViewCertPBHdl, Button*, void ); - DECL_LINK_TYPED( RemoveCertPBHdl, Button*, void ); - DECL_LINK_TYPED( AddLocPBHdl, Button*, void ); - DECL_LINK_TYPED( RemoveLocPBHdl, Button*, void ); - DECL_LINK_TYPED( TrustCertLBSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( TrustFileLocLBSelectHdl, ListBox&, void ); + DECL_LINK( ViewCertPBHdl, Button*, void ); + DECL_LINK( RemoveCertPBHdl, Button*, void ); + DECL_LINK( AddLocPBHdl, Button*, void ); + DECL_LINK( RemoveLocPBHdl, Button*, void ); + DECL_LINK( TrustCertLBSelectHdl, SvTreeListBox*, void ); + DECL_LINK( TrustFileLocLBSelectHdl, ListBox&, void ); void FillCertLB(); void ImplCheckButtons(); diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx index 4118b6304b42..4ba359c0bd67 100644 --- a/xmlsecurity/inc/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsignaturehelper.hxx @@ -107,9 +107,9 @@ private: Link<LinkParamNone*,bool> maStartVerifySignatureHdl; private: - DECL_LINK_TYPED( SignatureCreationResultListener, XMLSignatureCreationResult&, void ); - DECL_LINK_TYPED( SignatureVerifyResultListener, XMLSignatureVerifyResult&, void ); - DECL_LINK_TYPED( StartVerifySignatureElement, LinkParamNone*, void ); + DECL_LINK( SignatureCreationResultListener, XMLSignatureCreationResult&, void ); + DECL_LINK( SignatureVerifyResultListener, XMLSignatureVerifyResult&, void ); + DECL_LINK( StartVerifySignatureElement, LinkParamNone*, void ); XMLSignatureHelper(const XMLSignatureHelper&) = delete; |