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

11 files changed, 54 insertions, 54 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;
 
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) )
     {
diff --git a/xmlsecurity/workben/signaturetest.cxx b/xmlsecurity/workben/signaturetest.cxx
index 5ced7d40d20b..252e4882cfaa 100644
--- a/xmlsecurity/workben/signaturetest.cxx
+++ b/xmlsecurity/workben/signaturetest.cxx
@@ -123,9 +123,9 @@ private:
     FixedLine   maHintLine;
     FixedText   maHintText;
 
-    DECL_LINK_TYPED(  CryptoCheckBoxHdl, CheckBox*, void );
-    DECL_LINK_TYPED(  DigitalSignaturesWithServiceHdl, Button*, void );
-    DECL_LINK_TYPED(  VerifyDigitalSignaturesHdl, Button*, void );
+    DECL_LINK(  CryptoCheckBoxHdl, CheckBox*, void );
+    DECL_LINK(  DigitalSignaturesWithServiceHdl, Button*, void );
+    DECL_LINK(  VerifyDigitalSignaturesHdl, Button*, void );
 
 public:
                 MyWin( vcl::Window* pParent, WinBits nWinStyle );
@@ -251,7 +251,7 @@ MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) :
 
 }
 
-IMPL_LINK_NOARG_TYPED(MyWin, CryptoCheckBoxHdl, CheckBox*, void)
+IMPL_LINK_NOARG(MyWin, CryptoCheckBoxHdl, CheckBox*, void)
 {
     if ( maCryptoCheckBox.IsChecked() )
     {
@@ -265,7 +265,7 @@ IMPL_LINK_NOARG_TYPED(MyWin, CryptoCheckBoxHdl, CheckBox*, void)
     }
 }
 
-IMPL_LINK_NOARG_TYPED(MyWin, DigitalSignaturesWithServiceHdl, Button*, void)
+IMPL_LINK_NOARG(MyWin, DigitalSignaturesWithServiceHdl, Button*, void)
 {
     OUString aDocFileName = maEditDOCFileName.GetText();
     uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL(
@@ -276,7 +276,7 @@ IMPL_LINK_NOARG_TYPED(MyWin, DigitalSignaturesWithServiceHdl, Button*, void)
     xD->signDocumentContent( xStore, NULL );
 }
 
-IMPL_LINK_NOARG_TYPED(MyWin, VerifyDigitalSignaturesHdl, Button*, void)
+IMPL_LINK_NOARG(MyWin, VerifyDigitalSignaturesHdl, Button*, void)
 {
     OUString aDocFileName = maEditDOCFileName.GetText();
     uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromURL(