Revert all the recent loplugin:unocast changes

...as obsoleted by ef533553559fe09b4afab651fc692885d1acf4ed "Rudimentary support
for dynamic_cast on UNO proxy objects".

This reverts all of:
4cfcc9ac37b90ce64c8402a41eb4638adb185b5c "loplugin:unocast (framework::Desktop)"
03efbf72f4ddf7a84aa8aabef348331bd4b75e8a "loplugin:unocast
(vclcanvas::TextLayout)"
80099fdd51a69eaa6c36ca88ef772810e4a777fa "loplugin:unocast (SalGtkXWindow)"
cc147f576d8687fb79c77d47d41dc4ba1678a469 "loplugin:unocast
(sdext::presenter::CachablePresenterView)"
40db42be1d8fd0f9c6c8c5ba3767ddb9ee2034c2 "loplugin:unocast
(vclcanvas::CanvasFont)"
2d1e7995eae29e2826449eb5179f5fae181794a5 "loplugin:unocast (CairoColorSpace)"
4c0bbe4bd97636207cf71a6aa120c67698891da9 "loplugin:unocast
(canvas::ParametricPolyPolygon)"
89803666621c07d1b1ac9d3bd883f0ca192a91a0 "loplugin:unocast
(vclcanas::CanvasBitmap)"
d5e0c2c8db71878d21c2a7255af08cf5f9a6dd04 "loplugin:unocast
(sfx2::DigitalSignatures)"
c0c4519e0d5b555f59bbc04cc616454edfd1f4ce "loplugin:unocast
(VCLXAccessibleComponent)"
feb8b833a6245d42400f42a0bc789dc84594ee6f "loplugin:unocast (VCLXDialog)"
1fa58cc6cc9c3849753342a5d9a6ddfa461b5e66 "loplugin:unocast (VCLXMultiPage)"
f481f036deb1b1b46f3038074c4659f3a91b9c6c "loplugin:unocast
(DocumentSettingsSerializer)"
73df933f5fa5932f94e5a1b338a3eda00a9ce354 "loplugin:unocast
(css::embed::EmbeddedUpdate)"
420165ab0ef03c0467f9d17f504de2d2fc78f0e6 "loplugin:unocast
(canvas::tools' StandardColorSpace, StandardNoAlphaColorSpace)"
9abe8ee067e6c00f19d8a13346d53c4641c27166 "loplugin:unocast (MutableTreeNode)"
9f3022ceb036f23b4b0994c3e2fbd1001bff225a "loplugin:unocast (VCLXTabPage)"
1be70dda02c12a60778b7607cff2520ae1aa611e "loplugin:unocast
(vcl::unotools::VclCanvasBitmap)"
d6a70bb641b96e8e5616448c2378131ed62658b4 "loplugin:unocast
(basegfx::unotools::UnoPolyPolygon)"
5a14f009e6782c077463c8cbb8e9cea3d7950107 "loplugin:unocast
(xmlsecurity::Certificate)"
99009c9535dfa3e0d838989ccc7d84bfa2320ff4 "loplugin:unocast (sd::Annotation)"
0c7585c5fa78887e5459885ed744e8044fd76137 "loplugin:unocast (sd::TextApiObject)"
24e14afd1bfcaed6c200ab081973fba7e47267ca "loplugin:unocast
(SignatureVerifierImpl)"
1a7ad0c10d286ce9ae2700ceb2fd50eed1fb43a4 "loplugin:unocast
(pcr::PropertyEventTranslation)"
a97e2d2702d9a6f37775ccee2c08c4f3b2479c4b "loplugin:unocast (RangePageBreaks)"
19dfdf86ad1f5b08041d8b7a9f196caf881231ab "iloplugin:unocast
(pcr::OFormattedNumericControl)"
f9785ea595fd8e911f6370e836fa579225b9e571 "loplugin:unocast
(frm::OInterfaceContainer)"
5e5f40a4a92a31b0932c690219d002fcf18598cf "loplugin:unocast (ScVbaShapes)"
27b35b2c215b4832d4378ec3a7ecbba926552d06 "loplugin:unocast (ScVbaShapeRange)"
cb3108f860065928552a86cf8acc4b3a95718ecf "cid#1517812 Dereference null return
value"
feba0ddb1521d1142560fe54b7d7696ee910237f "loplugin:unocast
(weld::TransportAsXWindow)"
4d6c23216559eb48f9943bb49d6e475a6d64ba15 "loplugin:unocast
(oox::ForumlaImExportBase)"
4844c096a8ab6a9a620c410a0949d4499f12a504 "loplugin:unocast
(cairocanvas::SurfaceProvider)"
9a0b523e0a84d403b9092176ccec4b3e3efe42d0 "loplugin:unocast
(cairocanvas::CanvasBitmap)"
8a5648d8e59b4b007dbbf3824777c19a21efc61e "loplugin:unocast
(cairocanvas::TextLayout)"
28c27a0623bc78a0590858f97d03b620985bc84c "loplugin:unocast
(cairocanvas::CanvasFont)"
53bc223cb3288e32a417696ee61c29e5f01f209d "loplugin:unocast
(cairocanvas::RepaintTarget)"
5f70b0b9f6bc4ab145ddbd9155590ed4a3b1b9ec "loplugin:unocast (SvXMLImport)"
068187a898cdd2e26e9b16c348ecc1ed2dee3f29 "loplugin:unocast (VCLXWindow)"
88b4f966202717cd4ad38a30a8eda22c3e69ed35 "loplugin:unocast
(sfx2::sidebar::SidebarController)"
f1b7a69b280aefe2f1b3b0f32193494fd765f2bd "loplugin:unocast
(SvxLineStyleToolBoxControl)"
ba76f0ba7e8de4d2953739c952004b7d9af47197 "loplugin:unocast
(i18npool::Calendar_gregorian)"
840154daf934d8df52ead1cb7acd798c4d30f007 "loplugin:unocast
(framework::AddonsToolBarWrapper)"
b0e9c4c5f063cefa9557810e3349bdb9c7493091 "loplugin:unocast
(GrammarCheckingIterator)"
8ee6cfc9655ce9de4617cea1a0d9cb9d7a4fbfac "loplugin:unocast
(ucb::ucp::ext::Content)"
5b8cd77c112bc8c0e92b8fec215c3c8e802bbc0a "loplugin:unocast
(basic::SfxScriptLibraryContainer)"
9e73ff9fce12e102bb3c3cea8d8bb96c88f2c9ad "loplugin:unocast
(sdext::presenter::PresenterNotesView)"
a98acca8fbc38d3fd5600ae5056a8e42b6d8a40d "loplugin:unocast
(SelectionChangeHandler)"
c0b59ad6e35b0cb0dea0821e95f95569739078c1 "Consistently use
comphelper::getSomethingImpl<I>(aIdentifier, this)"
276e3ccbdd3259ec3daf8a1a98fa7f406b14e21c "loplugin:unocast
(vclcanvas::RepaintTarget)"

Change-Id: I37c73e3422a5154bf6cb647640d2d3f23db8bc34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145063
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

14 files changed, 19 insertions, 171 deletions

diff --git a/include/basegfx/utils/unopolypolygon.hxx b/include/basegfx/utils/unopolypolygon.hxx
index 4392f798c6ce..48788b074ede 100644
--- a/include/basegfx/utils/unopolypolygon.hxx
+++ b/include/basegfx/utils/unopolypolygon.hxx
@@ -22,7 +22,6 @@
 #include <comphelper/compbase.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/rendering/FillRule.hpp>
 #include <com/sun/star/rendering/XLinePolyPolygon2D.hpp>
 #include <com/sun/star/rendering/XBezierPolyPolygon2D.hpp>
@@ -35,8 +34,7 @@ namespace basegfx::unotools
     typedef comphelper::WeakComponentImplHelper<
             css::rendering::XLinePolyPolygon2D,
             css::rendering::XBezierPolyPolygon2D,
-            css::lang::XServiceInfo,
-            css::lang::XUnoTunnel > UnoPolyPolygonBase;
+            css::lang::XServiceInfo > UnoPolyPolygonBase;
 
     class BASEGFX_DLLPUBLIC UnoPolyPolygon
         : public UnoPolyPolygonBase
@@ -70,10 +68,6 @@ namespace basegfx::unotools
         SAL_DLLPRIVATE virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
         SAL_DLLPRIVATE virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
-        SAL_DLLPRIVATE sal_Int64 SAL_CALL getSomething(
-            css::uno::Sequence<sal_Int8> const & aIdentifier) override;
-        static SAL_DLLPRIVATE css::uno::Sequence<sal_Int8> const & getUnoTunnelId();
-
         SAL_DLLPRIVATE B2DPolyPolygon getPolyPolygon() const;
 
     protected:
diff --git a/include/comphelper/servicehelper.hxx b/include/comphelper/servicehelper.hxx
index 286108bd2568..c225494ccf1b 100644
--- a/include/comphelper/servicehelper.hxx
+++ b/include/comphelper/servicehelper.hxx
@@ -82,16 +82,6 @@ namespace comphelper {
             && memcmp(T::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16) == 0;
     }
 
-    template<typename T> struct MixinToGetSomethingOf {
-        static bool get(css::uno::Sequence<sal_Int8> const & id, T * p, sal_Int64 * result) {
-            if (!isUnoTunnelId<T>(id)) {
-                return false;
-            }
-            *result = getSomething_cast(p);
-            return true;
-        }
-    };
-
     template <class Base> struct FallbackToGetSomethingOf
     {
         static sal_Int64 get(const css::uno::Sequence<sal_Int8>& rId, Base* p)
@@ -105,85 +95,12 @@ namespace comphelper {
         static sal_Int64 get(const css::uno::Sequence<sal_Int8>&, void*) { return 0; }
     };
 
-    // There are five cases how to implement T::getSomething:
-    // (1) Delegate to Base:
-    //     Either, if Base has only getUnoTunnelId but no getSomething:
-    //     return getSomethingImpl<Base>(aIdentifier, this);
-    //     Or, if Base has getSomething:
-    //     return Base::getSomething(aIdentifier)
-    // (2) Check against T::getUnoTunnelId, else return 0:
-    //     return getSomethingImpl(aIdentifier, this);
-    // (3) Check against T::getUnoTunnelId, else delegate to Base:
-    //     return getSomethingImpl(aIdentifier, this, FallbackToGetSomethingOf<Base>{});
-    // (4) Check against T::getUnoTunnelId, else check against each Mixins::getUnoTunnelId, else
-    //     delegate to Base:
-    //     return getSomethingImpl(
-    //         aIdentifier, this, MixinToGetSomethingOf<Mixin1>{}, ...,
-    //         MixinToGetSomethingOf<MixinN>{}, FallbackToGetSomethingOf<Base>{});
-    // (5) Check against each Mixins::getUnoTunnelId, else delegate to Base:
-    //     return getSomethingImpl_skipDerived(
-    //         aIdentifier, this, MixinToGetSomethingOf<Mixin1>{}, ...,
-    //         MixinToGetSomethingOf<MixinN>{}, FallbackToGetSomethingOf<Base>{});
-
     template <class T, class Base = void>
     sal_Int64 getSomethingImpl(const css::uno::Sequence<sal_Int8>& rId, T* pThis,
         FallbackToGetSomethingOf<Base> = {})
     {
-        sal_Int64 res;
-        if (MixinToGetSomethingOf<T>::get(rId, pThis, &res)) {
-            return res;
-        }
-
-        return FallbackToGetSomethingOf<Base>::get(rId, pThis);
-    }
-
-#if defined _MSC_VER && _MSC_VER < 1930 && !defined __clang__
-    // Without this additional overload, at least VS 2019 16.11.21 has sometimes issues deducing the
-    // Base template argument in calls to the "full" getSomethingImpl overload with zero arguments
-    // substituted for the variadic Mixins parameter:
-    template <class T, class Mixin, class Base>
-    sal_Int64 getSomethingImpl(const css::uno::Sequence<sal_Int8>& rId, T* pThis,
-        MixinToGetSomethingOf<Mixin>,
-        FallbackToGetSomethingOf<Base>)
-    {
-        sal_Int64 res;
-        if (MixinToGetSomethingOf<T>::get(rId, pThis, &res)
-            || MixinToGetSomethingOf<Mixin>::get(rId, pThis, &res))
-        {
-            return res;
-        }
-
-        return FallbackToGetSomethingOf<Base>::get(rId, pThis);
-    }
-#endif
-
-    template <class T, class Mixin, class... Mixins, class Base>
-    sal_Int64 getSomethingImpl(const css::uno::Sequence<sal_Int8>& rId, T* pThis,
-        MixinToGetSomethingOf<Mixin>, MixinToGetSomethingOf<Mixins>...,
-        FallbackToGetSomethingOf<Base>)
-    {
-        sal_Int64 res;
-        if (((MixinToGetSomethingOf<T>::get(rId, pThis, &res)
-              || MixinToGetSomethingOf<Mixin>::get(rId, pThis, &res)) || ...
-             || MixinToGetSomethingOf<Mixins>::get(rId, pThis, &res)))
-        {
-            return res;
-        }
-
-        return FallbackToGetSomethingOf<Base>::get(rId, pThis);
-    }
-
-    template <class T, class Mixin, class... Mixins, class Base>
-    sal_Int64 getSomethingImpl_skipDerived(const css::uno::Sequence<sal_Int8>& rId, T* pThis,
-        MixinToGetSomethingOf<Mixin>, MixinToGetSomethingOf<Mixins>...,
-        FallbackToGetSomethingOf<Base>)
-    {
-        sal_Int64 res;
-        if ((MixinToGetSomethingOf<Mixin>::get(rId, pThis, &res) || ...
-             || MixinToGetSomethingOf<Mixins>::get(rId, pThis, &res)))
-        {
-            return res;
-        }
+        if (isUnoTunnelId<T>(rId))
+            return getSomething_cast(pThis);
 
         return FallbackToGetSomethingOf<Base>::get(rId, pThis);
     }
diff --git a/include/svtools/embeddedupdate.hxx b/include/embeddedobj/embeddedupdate.hxx
index 95d49d35764a..63e7bf4464c8 100644
--- a/include/svtools/embeddedupdate.hxx
+++ b/include/embeddedobj/embeddedupdate.hxx
@@ -9,9 +9,7 @@
 
 #pragma once
 
-#include <com/sun/star/uno/Sequence.hxx>
-#include <sal/types.h>
-#include <svtools/svtdllapi.h>
+#include <embeddedobj/embobjdllapi.h>
 
 namespace com
 {
@@ -26,7 +24,7 @@ namespace embed
 
     @since LibreOffice 7.4
  */
-class SVT_DLLPUBLIC EmbeddedUpdate
+class EMBOBJ_DLLPUBLIC SAL_LOPLUGIN_ANNOTATE("crosscast") EmbeddedUpdate
 {
     /** By "Refresh all" is used to perform an OLE update and a link update.
         In the case of a link update, the class OCommonEmbeddedObject is
@@ -42,8 +40,6 @@ public:
     EmbeddedUpdate() = default;
     virtual ~EmbeddedUpdate() = default;
 
-    static css::uno::Sequence<sal_Int8> const& getUnoTunnelId();
-
 private:
     EmbeddedUpdate(const EmbeddedUpdate&) = delete;
     EmbeddedUpdate& operator=(const EmbeddedUpdate&) = delete;
diff --git a/include/framework/desktop.hxx b/include/framework/desktop.hxx
index deeb9c20233b..3d525eb54938 100644
--- a/include/framework/desktop.hxx
+++ b/include/framework/desktop.hxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/frame/XFramesSupplier.hpp>
 #include <com/sun/star/frame/XFrames.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XTasksSupplier.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -95,8 +94,7 @@ typedef cppu::WeakComponentImplHelper<
            css::frame::XTasksSupplier           ,
            css::frame::XDispatchResultListener  ,   // => XEventListener
            css::task::XInteractionHandler       ,
-           css::frame::XUntitledNumbers,
-           css::lang::XUnoTunnel > Desktop_BASE;
+           css::frame::XUntitledNumbers > Desktop_BASE;
 
 class FWK_DLLPUBLIC Desktop final : private cppu::BaseMutex,
                 public Desktop_BASE,
@@ -289,9 +287,6 @@ class FWK_DLLPUBLIC Desktop final : private cppu::BaseMutex,
 
         void shutdown();
 
-        sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) override;
-        static css::uno::Sequence<sal_Int8> const & getUnoTunnelId();
-
     private:
         //  OPropertySetHelper
         virtual sal_Bool                                            SAL_CALL convertFastPropertyValue        (       css::uno::Any&  aConvertedValue ,
diff --git a/include/oox/mathml/imexport.hxx b/include/oox/mathml/imexport.hxx
index 5a0ac1313f18..a93216fb1199 100644
--- a/include/oox/mathml/imexport.hxx
+++ b/include/oox/mathml/imexport.hxx
@@ -9,14 +9,12 @@
 #ifndef INCLUDED_OOX_MATHML_IMEXPORT_HXX
 #define INCLUDED_OOX_MATHML_IMEXPORT_HXX
 
-#include <com/sun/star/uno/Sequence.hxx>
 #include <oox/core/filterbase.hxx>
 #include <oox/dllapi.h>
 #include <oox/export/utils.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/textenc.h>
-#include <sal/types.h>
 #include <sax/fshelper.hxx>
 #include <tools/gen.hxx>
 
@@ -45,9 +43,6 @@ public:
     virtual void writeFormulaRtf( OStringBuffer& rBuffer, rtl_TextEncoding nEncoding ) = 0;
     enum eFormulaAlign { INLINE, CENTER, GROUPEDCENTER, LEFT, RIGHT };
 
-    sal_Int64 getSomething(css::uno::Sequence<sal_Int8> const & id);
-    static css::uno::Sequence<sal_Int8> const & getUnoTunnelId();
-
 protected:
     FormulaImExportBase();
 
diff --git a/include/sfx2/digitalsignatures.hxx b/include/sfx2/digitalsignatures.hxx
index 5e1891e250ed..b46cdd52e9d9 100644
--- a/include/sfx2/digitalsignatures.hxx
+++ b/include/sfx2/digitalsignatures.hxx
@@ -12,17 +12,14 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/security/XCertificate.hpp>
 
-#include <cppuhelper/implbase.hxx>
 #include <sal/types.h>
-#include <sfx2/dllapi.h>
 
 namespace sfx2
 {
 /// Extension of css::security::XDocumentDigitalSignatures for internal purposes.
-class SFX2_DLLPUBLIC DigitalSignatures : public cppu::WeakImplHelper<css::lang::XUnoTunnel>
+class SAL_NO_VTABLE SAL_DLLPUBLIC_RTTI SAL_LOPLUGIN_ANNOTATE("crosscast") DigitalSignatures
 {
 public:
     /// Same as signDocumentWithCertificate(), but passes the xModel as well.
@@ -33,12 +30,8 @@ public:
                              const css::uno::Reference<css::io::XStream>& xStream)
         = 0;
 
-    sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const& aIdentifier) override;
-    static css::uno::Sequence<sal_Int8> const& getUnoTunnelId();
-
 protected:
-    DigitalSignatures();
-    ~DigitalSignatures() override;
+    ~DigitalSignatures() noexcept = default;
 };
 }
 
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index be0a12b3a671..208af98b2fc2 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/XFrameActionListener.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/ui/XContextChangeEventListener.hpp>
 #include <com/sun/star/ui/XSidebar.hpp>
 
@@ -49,8 +48,7 @@ typedef comphelper::WeakComponentImplHelper <
     css::beans::XPropertyChangeListener,
     css::ui::XSidebar,
     css::frame::XStatusListener,
-    css::frame::XFrameActionListener,
-    css::lang::XUnoTunnel
+    css::frame::XFrameActionListener
     > SidebarControllerInterfaceBase;
 
 class SfxSplitWindow;
@@ -177,9 +175,6 @@ public:
 
     static SidebarController* GetSidebarControllerForView(const SfxViewShell* pViewShell);
 
-    sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) override;
-    static css::uno::Sequence<sal_Int8> const & getUnoTunnelId();
-
 private:
     SidebarController(SidebarDockingWindow* pParentWindow, const SfxViewFrame* pViewFrame);
 
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index 983242b776d2..e2cd9e6c8852 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SVX_LINECTRL_HXX
 #define INCLUDED_SVX_LINECTRL_HXX
 
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <svtools/popupwindowcontroller.hxx>
 #include <svx/svxdllapi.h>
@@ -37,8 +35,7 @@ typedef std::function<bool(const OUString&, const css::uno::Any&)> LineStyleSele
 typedef std::function<void(bool)> LineStyleIsNoneFunction;
 
 // SvxLineStyleController:
-class SVXCORE_DLLPUBLIC SvxLineStyleToolBoxControl final :
-    public cppu::ImplInheritanceHelper<svt::PopupWindowController, css::lang::XUnoTunnel>
+class SVXCORE_DLLPUBLIC SvxLineStyleToolBoxControl final : public svt::PopupWindowController
 {
 private:
     std::unique_ptr<svx::ToolboxButtonLineStyleUpdater> m_xBtnUpdater;
@@ -56,9 +53,6 @@ public:
     virtual OUString SAL_CALL getImplementationName() 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();
-
     virtual void SAL_CALL execute(sal_Int16 nKeyModifier) override;
     virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) override;
 
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index dd25c76c2c2d..7c299edf6d65 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -22,8 +22,7 @@
 
 #include <toolkit/dllapi.h>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase1.hxx>
 #include <comphelper/accimplaccess.hxx>
 #include <comphelper/accessiblecomponenthelper.hxx>
 
@@ -43,8 +42,8 @@ class AccessibleRelationSetHelper;
 
 
 
-typedef ::cppu::ImplHelper2<
-    css::lang::XServiceInfo, css::lang::XUnoTunnel > VCLXAccessibleComponent_BASE;
+typedef ::cppu::ImplHelper1<
+    css::lang::XServiceInfo > VCLXAccessibleComponent_BASE;
 
 class TOOLKIT_DLLPUBLIC VCLXAccessibleComponent
         :public comphelper::OAccessibleExtendedComponentHelper
@@ -90,9 +89,6 @@ public:
     virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 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();
-
     // css::accessibility::XAccessibleContext
     sal_Int64 SAL_CALL getAccessibleChildCount(  ) override;
     css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int64 i ) override;
diff --git a/include/vbahelper/vbashaperange.hxx b/include/vbahelper/vbashaperange.hxx
index a814de1afba1..dfcca6c82549 100644
--- a/include/vbahelper/vbashaperange.hxx
+++ b/include/vbahelper/vbashaperange.hxx
@@ -21,7 +21,6 @@
 
 #include <exception>
 
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -50,7 +49,7 @@ namespace ooo::vba {
     namespace msforms { class XShape; }
 }
 
-typedef CollTestImplHelper< ov::msforms::XShapeRange, css::lang::XUnoTunnel > ScVbaShapeRange_BASE;
+typedef CollTestImplHelper< ov::msforms::XShapeRange > ScVbaShapeRange_BASE;
 
 class VBAHELPER_DLLPUBLIC ScVbaShapeRange final : public ScVbaShapeRange_BASE
 {
@@ -97,10 +96,6 @@ public:
     //XEnumerationAccess
     virtual css::uno::Type SAL_CALL getElementType() override;
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
-
-    sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) override;
-    static css::uno::Sequence<sal_Int8> const & getUnoTunnelId();
-
     // ScVbaCollectionBaseImpl
     virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) override;
 };
diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx
index fabacae0732c..7131d8118031 100644
--- a/include/vbahelper/vbashapes.hxx
+++ b/include/vbahelper/vbashapes.hxx
@@ -23,7 +23,6 @@
 #include <string_view>
 
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -51,7 +50,7 @@ namespace ooo::vba {
     namespace msforms { class XShapeRange; }
 }
 
-typedef CollTestImplHelper< ov::msforms::XShapes, css::lang::XUnoTunnel > ScVbaShapes_BASE;
+typedef CollTestImplHelper< ov::msforms::XShapes > ScVbaShapes_BASE;
 
 class VBAHELPER_DLLPUBLIC ScVbaShapes final : public ScVbaShapes_BASE
 {
@@ -86,9 +85,6 @@ public:
     virtual css::uno::Type SAL_CALL getElementType() override;
     virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() override;
 
-    sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) override;
-    static css::uno::Sequence<sal_Int8> const & getUnoTunnelId();
-
     virtual void SAL_CALL SelectAll() override;
     //helper::calc
     virtual css::uno::Any SAL_CALL AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) override;
diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx
index 24f1a1cc1ef7..8a4c128515a0 100644
--- a/include/vcl/weldutils.hxx
+++ b/include/vcl/weldutils.hxx
@@ -14,11 +14,9 @@
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <comphelper/interfacecontainer4.hxx>
 #include <comphelper/compbase.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <tools/time.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/formatter.hxx>
@@ -35,8 +33,7 @@ class Window;
 
 namespace weld
 {
-typedef comphelper::WeakComponentImplHelper<css::awt::XWindow, css::lang::XUnoTunnel>
-    TransportAsXWindow_Base;
+typedef comphelper::WeakComponentImplHelper<css::awt::XWindow> TransportAsXWindow_Base;
 
 class VCL_DLLPUBLIC TransportAsXWindow : public TransportAsXWindow_Base
 {
@@ -171,13 +168,6 @@ public:
         std::unique_lock g(m_aMutex);
         m_aPaintListeners.removeInterface(g, rListener);
     }
-
-    sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const& aIdentifier) override
-    {
-        return comphelper::getSomethingImpl(aIdentifier, this);
-    }
-
-    static css::uno::Sequence<sal_Int8> const& getUnoTunnelId();
 };
 
 // don't export to avoid duplicate WeakImplHelper definitions with MSVC
diff --git a/include/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx
index 8f83a8a0e20a..339e71bbd1a7 100644
--- a/include/xmloff/settingsstore.hxx
+++ b/include/xmloff/settingsstore.hxx
@@ -12,10 +12,7 @@
 #ifndef INCLUDED_XMLOFF_SETTINGSSTORE_HXX
 #define INCLUDED_XMLOFF_SETTINGSSTORE_HXX
 
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <xmloff/dllapi.h>
 
 namespace com::sun::star::beans { struct PropertyValue; }
 namespace com::sun::star::embed { class XStorage; }
@@ -23,9 +20,7 @@ namespace com::sun::star::uno { template <typename > class Reference; }
 
 // Scans list of properties for certain URL properties that could refer
 // to internal objects, and initializes from these.
-class XMLOFF_DLLPUBLIC DocumentSettingsSerializer:
-    public cppu::WeakImplHelper<css::lang::XUnoTunnel>
-{
+class SAL_DLLPUBLIC_RTTI SAL_LOPLUGIN_ANNOTATE("crosscast") DocumentSettingsSerializer {
 public:
   // Import objects and update properties (eliding URLs)
   virtual css::uno::Sequence<css::beans::PropertyValue>
@@ -39,11 +34,8 @@ public:
         const css::uno::Reference< css::embed::XStorage > &xStorage,
         const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps ) = 0;
 
-    sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) override;
-    static css::uno::Sequence<sal_Int8> const & getUnoTunnelId();
-
 protected:
-    ~DocumentSettingsSerializer() override;
+    ~DocumentSettingsSerializer() {}
 };
 
 #endif // INCLUDED_XMLOFF_SETTINGSSTORE_HXX
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 14c7b92556b1..26873175268d 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -176,7 +176,7 @@ public:
     virtual void SAL_CALL setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator > & xLocator) override;
 };
 
-class XMLOFF_DLLPUBLIC SvXMLImport : public cppu::WeakImplHelper<
+class XMLOFF_DLLPUBLIC SAL_LOPLUGIN_ANNOTATE("crosscast") SvXMLImport : public cppu::WeakImplHelper<
              css::xml::sax::XFastDocumentHandler,
              css::lang::XServiceInfo,
              css::lang::XInitialization,