2 files changed, 3 insertions, 19 deletions
diff --git a/xmlsecurity/inc/certificate.hxx b/xmlsecurity/inc/certificate.hxx
index 885fcc8bd5ff..8357f50651a1 100644
--- a/xmlsecurity/inc/certificate.hxx
+++ b/xmlsecurity/inc/certificate.hxx
@@ -11,13 +11,7 @@
 
 #include <sal/types.h>
 
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/security/XCertificate.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <cppuhelper/implbase.hxx>
-
-#include "xsecxmlsecdllapi.h"
 
 namespace svl
 {
@@ -29,10 +23,8 @@ enum class SignatureMethodAlgorithm;
 
 namespace xmlsecurity
 {
-/// Base class of css::security::XCertificate implementations, for module-internal purposes.
-class XSECXMLSEC_DLLPUBLIC Certificate
-    : public ::cppu::WeakImplHelper<css::security::XCertificate, css::lang::XUnoTunnel,
-                                    css::lang::XServiceInfo>
+/// Extension of css::security::XCertificate for module-internal purposes.
+class SAL_NO_VTABLE SAL_DLLPUBLIC_RTTI SAL_LOPLUGIN_ANNOTATE("crosscast") Certificate
 {
 public:
     /// Returns the SHA-256 thumbprint.
@@ -43,9 +35,6 @@ public:
     /// Same as getSubjectPublicKeyAlgorithm(), but returns an ID, not a string.
     virtual svl::crypto::SignatureMethodAlgorithm getSignatureMethodAlgorithm() = 0;
 
-    sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const& aIdentifier) override;
-    static css::uno::Sequence<sal_Int8> const& getUnoTunnelId();
-
 protected:
     ~Certificate() noexcept = default;
 };
diff --git a/xmlsecurity/inc/framework/signatureverifierimpl.hxx b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
index 29d286d7ee57..15c79643e0aa 100644
--- a/xmlsecurity/inc/framework/signatureverifierimpl.hxx
+++ b/xmlsecurity/inc/framework/signatureverifierimpl.hxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/xml/crypto/sax/XSignatureVerifyResultBroadcaster.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase.hxx>
 
 #include <xmlsecuritydllapi.h>
@@ -36,8 +35,7 @@ typedef cppu::ImplInheritanceHelper
     SignatureEngine,
     css::xml::crypto::sax::XSignatureVerifyResultBroadcaster,
     css::lang::XInitialization,
-    css::lang::XServiceInfo,
-    css::lang::XUnoTunnel
+    css::lang::XServiceInfo
 > SignatureVerifierImpl_Base;
 
 class SignatureVerifierImpl final : public SignatureVerifierImpl_Base
@@ -76,9 +74,6 @@ public:
     virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
     virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) override;
 
-    sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) override;
-    static css::uno::Sequence<sal_Int8> const & getUnoTunnelId();
-
     void updateSignature( const css::uno::Reference< css::xml::crypto::XXMLSignature >& xSignature,
                           const css::uno::Reference< css::xml::crypto::XXMLSecurityContext >& xContext ) { m_xXMLSignature = xSignature; m_xXMLSecurityContext = xContext; }
 };