XUnoTunnel->dynamic_cast in SvXMLImport

Change-Id: I070bc1a8136e5b492c0ea56774a274b9a3d2ec2d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145494
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 3 insertions, 35 deletions

diff --git a/starmath/inc/mathml/import.hxx b/starmath/inc/mathml/import.hxx
index 56f7fe68814b..312768e43f22 100644
--- a/starmath/inc/mathml/import.hxx
+++ b/starmath/inc/mathml/import.hxx
@@ -115,10 +115,6 @@ public:
     virtual ~SmMLImport() noexcept override { cleanup(); };
 
 public:
-    // XUnoTunnel
-    sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8>& rId) override;
-    static const css::uno::Sequence<sal_Int8>& getUnoTunnelId() noexcept;
-
     /** End the document
     */
     void SAL_CALL endDocument() override;
diff --git a/starmath/inc/mathml/mathmlimport.hxx b/starmath/inc/mathml/mathmlimport.hxx
index 03a78b92a76d..c18b587f20b5 100644
--- a/starmath/inc/mathml/mathmlimport.hxx
+++ b/starmath/inc/mathml/mathmlimport.hxx
@@ -84,10 +84,6 @@ public:
                 OUString const& implementationName, SvXMLImportFlags nImportFlags);
     virtual ~SmXMLImport() noexcept override;
 
-    // XUnoTunnel
-    sal_Int64 SAL_CALL getSomething(const css::uno::Sequence<sal_Int8>& rId) override;
-    static const css::uno::Sequence<sal_Int8>& getUnoTunnelId() noexcept;
-
     void SAL_CALL endDocument() override;
 
     SvXMLImportContext* CreateFastContext(
diff --git a/starmath/source/mathml/import.cxx b/starmath/source/mathml/import.cxx
index 90469abaa0d1..62cd455ad069 100644
--- a/starmath/source/mathml/import.cxx
+++ b/starmath/source/mathml/import.cxx
@@ -429,7 +429,7 @@ ErrCode SmMLImportWrapper::ReadThroughComponentIS(
 
         if (nSyntaxVersion == 5)
         {
-            SmXMLImport* pXMlImport = comphelper::getFromUnoTunnel<SmXMLImport>(xFilter);
+            SmXMLImport* pXMlImport = dynamic_cast<SmXMLImport*>(xFilter.get());
             if (pXMlImport != nullptr && pXMlImport->GetSuccess())
                 return ERRCODE_NONE;
             else
@@ -442,7 +442,7 @@ ErrCode SmMLImportWrapper::ReadThroughComponentIS(
             }
         }
 
-        m_pMlImport = comphelper::getFromUnoTunnel<SmMLImport>(xFilter);
+        m_pMlImport = dynamic_cast<SmMLImport*>(xFilter.get());
         if (m_pMlImport != nullptr && m_pMlImport->getSuccess())
             return ERRCODE_NONE;
         else
@@ -1203,18 +1203,6 @@ void SmMLImportContext::endFastElement(sal_Int32) { inheritStyleEnd(); }
 // SmMLImport
 /*************************************************************************************************/
 
-const uno::Sequence<sal_Int8>& SmMLImport::getUnoTunnelId() noexcept
-{
-    static const comphelper::UnoIdInit theSmMLImportUnoTunnelId;
-    return theSmMLImportUnoTunnelId.getSeq();
-}
-
-sal_Int64 SAL_CALL SmMLImport::getSomething(const uno::Sequence<sal_Int8>& rId)
-{
-    return comphelper::getSomethingImpl(rId, this,
-                                        comphelper::FallbackToGetSomethingOf<SvXMLImport>{});
-}
-
 SvXMLImportContext*
 SmMLImport::CreateFastContext(sal_Int32 nElement,
                               const uno::Reference<xml::sax::XFastAttributeList>& /*xAttrList*/)
diff --git a/starmath/source/mathml/mathmlimport.cxx b/starmath/source/mathml/mathmlimport.cxx
index e37c604ae150..f31383d076ea 100644
--- a/starmath/source/mathml/mathmlimport.cxx
+++ b/starmath/source/mathml/mathmlimport.cxx
@@ -294,7 +294,7 @@ ErrCode SmXMLImportWrapper::ReadThroughComponent(const Reference<io::XInputStrea
             xParser->parseStream(aParserInput);
         }
 
-        auto pFilter = comphelper::getFromUnoTunnel<SmXMLImport>(xFilter);
+        auto pFilter = dynamic_cast<SmXMLImport*>(xFilter.get());
         if (pFilter && pFilter->GetSuccess())
             nError = ERRCODE_NONE;
     }
@@ -404,12 +404,6 @@ SmXMLImport::SmXMLImport(const css::uno::Reference<css::uno::XComponentContext>&
 {
 }
 
-const uno::Sequence<sal_Int8>& SmXMLImport::getUnoTunnelId() noexcept
-{
-    static const comphelper::UnoIdInit theSmXMLImportUnoTunnelId;
-    return theSmXMLImportUnoTunnelId.getSeq();
-}
-
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
 Math_XMLImporter_get_implementation(uno::XComponentContext* pCtx,
                                     uno::Sequence<uno::Any> const& /*rSeq*/)
@@ -434,12 +428,6 @@ Math_XMLOasisSettingsImporter_get_implementation(uno::XComponentContext* pCtx,
                                          SvXMLImportFlags::SETTINGS));
 }
 
-sal_Int64 SAL_CALL SmXMLImport::getSomething(const uno::Sequence<sal_Int8>& rId)
-{
-    return comphelper::getSomethingImpl(rId, this,
-                                        comphelper::FallbackToGetSomethingOf<SvXMLImport>{});
-}
-
 void SmXMLImport::endDocument()
 {
     //Set the resulted tree into the SmDocShell where it belongs