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>

13 files changed, 11 insertions, 75 deletions

diff --git a/sdext/source/pdfimport/sax/emitcontext.cxx b/sdext/source/pdfimport/sax/emitcontext.cxx
index 59f110191bfd..a923488d688d 100644
--- a/sdext/source/pdfimport/sax/emitcontext.cxx
+++ b/sdext/source/pdfimport/sax/emitcontext.cxx
@@ -25,7 +25,6 @@
 #include <rtl/strbuf.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/xml/sax/SAXException.hpp>
-#include <comphelper/servicehelper.hxx>
 #include <xmloff/xmlimp.hxx>
 
 #if OSL_DEBUG_LEVEL > 0
@@ -43,7 +42,7 @@ SaxEmitter::SaxEmitter( const uno::Reference< xml::sax::XDocumentHandler >& xDoc
     m_xDocHdl( xDocHdl )
 {
     OSL_PRECOND(m_xDocHdl.is(), "SaxEmitter(): invalid doc handler");
-    if (SvXMLImport *pFastHandler = comphelper::getFromUnoTunnel<SvXMLImport>(m_xDocHdl))
+    if (SvXMLImport *pFastHandler = dynamic_cast<SvXMLImport*>(m_xDocHdl.get()))
         m_xDocHdl.set( new SvXMLLegacyToFastDocHandler( pFastHandler ) );
     try
     {
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 7040da4a3c51..4f2fa33f3866 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -38,7 +38,6 @@
 #include <com/sun/star/drawing/framework/XPane.hpp>
 #include <com/sun/star/drawing/framework/XView.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <comphelper/servicehelper.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <o3tl/safeint.hxx>
@@ -514,7 +513,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy()
     if (pNotesPane)
         xNotesView = pNotesPane->mxView;
     rtl::Reference<PresenterNotesView> pNotesView (
-        comphelper::getFromUnoTunnel<PresenterNotesView>(xNotesView));
+        dynamic_cast<PresenterNotesView*>(xNotesView.get()));
 
     UpdateAccessibilityHierarchy(
         pPreviewPane ? pPreviewPane->mxContentWindow : Reference<awt::XWindow>(),
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index 7bfc1bfa2c06..457be1f612b7 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/rendering/CompositeOperation.hpp>
 #include <com/sun/star/rendering/XSpriteCanvas.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
-#include <comphelper/servicehelper.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -377,16 +376,6 @@ void SAL_CALL PresenterNotesView::keyPressed (const awt::KeyEvent& rEvent)
 
 void SAL_CALL PresenterNotesView::keyReleased (const awt::KeyEvent&) {}
 
-sal_Int64 PresenterNotesView::getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) {
-    return comphelper::getSomethingImpl(
-        aIdentifier, this, comphelper::FallbackToGetSomethingOf<CachablePresenterView>{});
-}
-
-css::uno::Sequence<sal_Int8> const & PresenterNotesView::getUnoTunnelId() {
-    static comphelper::UnoIdInit const id;
-    return id.getSeq();
-}
-
 
 void PresenterNotesView::Layout()
 {
diff --git a/sdext/source/presenter/PresenterNotesView.hxx b/sdext/source/presenter/PresenterNotesView.hxx
index 05368a7151c6..1af3f241f004 100644
--- a/sdext/source/presenter/PresenterNotesView.hxx
+++ b/sdext/source/presenter/PresenterNotesView.hxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/drawing/framework/XView.hpp>
 #include <com/sun/star/drawing/framework/XResourceId.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <rtl/ref.hxx>
 #include <memory>
 
@@ -46,8 +45,7 @@ typedef cppu::WeakComponentImplHelper<
     css::awt::XPaintListener,
     css::drawing::framework::XView,
     css::drawing::XDrawView,
-    css::awt::XKeyListener,
-    css::lang::XUnoTunnel
+    css::awt::XKeyListener
     > PresenterNotesViewInterfaceBase;
 
 /** A drawing framework view of the notes of a slide.  At the moment this is
@@ -119,9 +117,6 @@ public:
     virtual void SAL_CALL keyPressed (const css::awt::KeyEvent& rEvent) override;
     virtual void SAL_CALL keyReleased (const css::awt::KeyEvent& rEvent) override;
 
-    sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) override;
-    static css::uno::Sequence<sal_Int8> const & getUnoTunnelId();
-
 private:
     css::uno::Reference<css::drawing::framework::XResourceId> mxViewId;
     ::rtl::Reference<PresenterController> mpPresenterController;
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index bda104ce37d8..a32a73b6180e 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -24,7 +24,6 @@
 #include "PresenterPaneContainer.hxx"
 #include "PresenterViewFactory.hxx"
 #include "PresenterWindowManager.hxx"
-#include <comphelper/servicehelper.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <algorithm>
@@ -793,7 +792,7 @@ NotesFontSizeCommand::NotesFontSizeCommand(
     if (!pDescriptor)
         return nullptr;
 
-    return comphelper::getFromUnoTunnel<PresenterNotesView>(pDescriptor->mxView);
+    return dynamic_cast<PresenterNotesView*>(pDescriptor->mxView.get());
 }
 
 void NotesFontSizeCommand::Execute()
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index be4cc6a65d20..132eaf35f85e 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -279,10 +279,6 @@ css::uno::Reference<css::drawing::XDrawPage> SAL_CALL PresenterSlideShowView::ge
     return mxCurrentSlide;
 }
 
-sal_Int64 PresenterSlideShowView::getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) {
-    return CachablePresenterView::getSomething(aIdentifier);
-}
-
 //----- CachablePresenterView -------------------------------------------------
 
 void PresenterSlideShowView::ReleaseView()
diff --git a/sdext/source/presenter/PresenterSlideShowView.hxx b/sdext/source/presenter/PresenterSlideShowView.hxx
index 7f93e4b0e6e2..e4466522eddf 100644
--- a/sdext/source/presenter/PresenterSlideShowView.hxx
+++ b/sdext/source/presenter/PresenterSlideShowView.hxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/drawing/framework/XResourceId.hpp>
 #include <com/sun/star/drawing/framework/XView.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/presentation/XSlideShowController.hpp>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -48,8 +47,7 @@ typedef cppu::WeakComponentImplHelper<
     css::awt::XMouseMotionListener,
     css::awt::XWindowListener,
     css::drawing::framework::XView,
-    css::drawing::XDrawView,
-    css::lang::XUnoTunnel
+    css::drawing::XDrawView
     > PresenterSlideShowViewInterfaceBase;
 
 /** Life view in a secondary window of a full screen slide show.
@@ -168,10 +166,6 @@ public:
 
     virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override;
 
-    // XUnoTunnel
-
-    sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) override;
-
     // CachablePresenterView
 
     virtual void ActivatePresenterView() override;
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 1b3fb0a1d753..ef33a4dde634 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -612,11 +612,6 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage()
 }
 
 
-sal_Int64 PresenterSlideSorter::getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) {
-    return CachablePresenterView::getSomething(aIdentifier);
-}
-
-
 void PresenterSlideSorter::UpdateLayout()
 {
     if ( ! mxWindow.is())
diff --git a/sdext/source/presenter/PresenterSlideSorter.hxx b/sdext/source/presenter/PresenterSlideSorter.hxx
index 7f1f3ac845d8..807bc439929e 100644
--- a/sdext/source/presenter/PresenterSlideSorter.hxx
+++ b/sdext/source/presenter/PresenterSlideSorter.hxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/drawing/framework/XResourceId.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/geometry/RealRectangle2D.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/rendering/XPolyPolygon2D.hpp>
 
 namespace sdext::presenter {
@@ -51,8 +50,7 @@ typedef cppu::WeakComponentImplHelper<
     css::drawing::XSlidePreviewCacheListener,
     css::awt::XMouseListener,
     css::awt::XMouseMotionListener,
-    css::drawing::XDrawView,
-    css::lang::XUnoTunnel
+    css::drawing::XDrawView
     > PresenterSlideSorterInterfaceBase;
 
 /** A simple slide sorter for the presenter screen.  It uses a preview cache
@@ -131,10 +129,6 @@ public:
 
     virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override;
 
-    // XUnoTunnel
-
-    sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) override;
-
 private:
     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
     css::uno::Reference<css::drawing::framework::XResourceId> mxViewId;
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index b095975680e4..867459423d8e 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -575,11 +575,6 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage()
 }
 
 
-sal_Int64 PresenterToolBar::getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) {
-    return CachablePresenterView::getSomething(aIdentifier);
-}
-
-
 void PresenterToolBar::CreateControls (
     const OUString& rsConfigurationPath)
 {
diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx
index 50937ea8d3bd..1b789955689c 100644
--- a/sdext/source/presenter/PresenterToolBar.hxx
+++ b/sdext/source/presenter/PresenterToolBar.hxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/drawing/framework/XView.hpp>
 #include <com/sun/star/drawing/framework/XResourceId.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 
 #include <functional>
 
@@ -45,8 +44,7 @@ typedef cppu::WeakComponentImplHelper<
     css::awt::XPaintListener,
     css::awt::XMouseListener,
     css::awt::XMouseMotionListener,
-    css::drawing::XDrawView,
-    css::lang::XUnoTunnel
+    css::drawing::XDrawView
     > PresenterToolBarInterfaceBase;
 
 typedef cppu::WeakComponentImplHelper<
@@ -136,10 +134,6 @@ public:
 
     virtual css::uno::Reference<css::drawing::XDrawPage> SAL_CALL getCurrentPage() override;
 
-    // XUnoTunnel
-
-    sal_Int64 SAL_CALL getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) override;
-
     class Context;
 
 private:
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 2768edf763ab..06eff32f7d3f 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -26,7 +26,6 @@
 #include "PresenterSlideSorter.hxx"
 #include "PresenterToolBar.hxx"
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
-#include <comphelper/servicehelper.hxx>
 #include <utility>
 
 using namespace ::com::sun::star;
@@ -216,7 +215,7 @@ void SAL_CALL PresenterViewFactory::releaseResource (const Reference<XResource>&
         pDescriptor->SetActivationState(false);
 
     // Dispose only views that we can not put into the cache.
-    CachablePresenterView* pView = comphelper::getFromUnoTunnel<CachablePresenterView>(rxView);
+    CachablePresenterView* pView = dynamic_cast<CachablePresenterView*>(rxView.get());
     if (pView == nullptr || mpResourceCache == nullptr)
     {
         try
@@ -272,7 +271,7 @@ Reference<XResource> PresenterViewFactory::GetViewFromCache(
             if (iView->second.second == rxAnchorPane)
             {
                 CachablePresenterView* pView
-                    = comphelper::getFromUnoTunnel<CachablePresenterView>(iView->second.first);
+                    = dynamic_cast<CachablePresenterView*>(iView->second.first.get());
                 if (pView != nullptr)
                     pView->ActivatePresenterView();
                 return iView->second.first;
@@ -323,7 +322,7 @@ Reference<XResource> PresenterViewFactory::CreateView(
         }
 
         // Activate it.
-        CachablePresenterView* pView = comphelper::getFromUnoTunnel<CachablePresenterView>(xView);
+        CachablePresenterView* pView = dynamic_cast<CachablePresenterView*>(xView.get());
         if (pView != nullptr)
             pView->ActivatePresenterView();
     }
@@ -481,15 +480,6 @@ void PresenterViewFactory::ThrowIfDisposed() const
 
 //===== CachablePresenterView =================================================
 
-sal_Int64 CachablePresenterView::getSomething(css::uno::Sequence<sal_Int8> const & id) {
-    return comphelper::getSomethingImpl(id, this);
-}
-
-css::uno::Sequence<sal_Int8> const & CachablePresenterView::getUnoTunnelId() {
-    static comphelper::UnoIdInit const id;
-    return id.getSeq();
-}
-
 CachablePresenterView::CachablePresenterView()
     : mbIsPresenterViewActive(true)
 {
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index 32429c790cff..7f3468d4e57a 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -39,7 +39,7 @@ typedef ::cppu::WeakComponentImplHelper <
 /** Base class for presenter views that allows the view factory to store
     them in a cache and reuse deactivated views.
 */
-class CachablePresenterView
+class SAL_LOPLUGIN_ANNOTATE("crosscast") CachablePresenterView
 {
 public:
     virtual void ActivatePresenterView();
@@ -55,9 +55,6 @@ public:
     */
     virtual void ReleaseView();
 
-    sal_Int64 getSomething(css::uno::Sequence<sal_Int8> const & id);
-    static css::uno::Sequence<sal_Int8> const & getUnoTunnelId();
-
 protected:
     bool mbIsPresenterViewActive;