3 files changed, 2 insertions, 14 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 7cd02f77f91f..c7d4567dd0c2 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -57,7 +57,6 @@
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/sequence.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/gen.hxx>
 #include <tools/globname.hxx>
@@ -1157,7 +1156,7 @@ Reference< XShape > const & Shape::createAndInsert(
             {
                 uno::Reference<uno::XInterface> const xMathModel(xObj->getComponent());
                 oox::FormulaImExportBase *const pMagic(
-                        comphelper::getFromUnoTunnel<oox::FormulaImExportBase>(xMathModel));
+                        dynamic_cast<oox::FormulaImExportBase*>(xMathModel.get()));
                 assert(pMagic);
                 pMagic->readFormulaOoxml(*pMathXml);
             }
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index ce3787069adb..137c69fe7c33 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -71,7 +71,6 @@
 #include <tools/globname.hxx>
 #include <comphelper/classids.hxx>
 #include <comphelper/propertysequence.hxx>
-#include <comphelper/servicehelper.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <sot/exchange.hxx>
 #include <utility>
@@ -2474,7 +2473,7 @@ void ShapeExport::WriteMathShape(Reference<XShape> const& xShape)
     mpFS->startElementNS(XML_a14, XML_m);
 
     oox::FormulaImExportBase *const pMagic(
-        comphelper::getFromUnoTunnel<oox::FormulaImExportBase>(xMathModel));
+        dynamic_cast<oox::FormulaImExportBase*>(xMathModel.get()));
     assert(pMagic);
     pMagic->writeFormulaOoxml(GetFS(), GetFB()->getVersion(), GetDocumentType(),
         FormulaImExportBase::eFormulaAlign::INLINE);
diff --git a/oox/source/mathml/imexport.cxx b/oox/source/mathml/imexport.cxx
index ad0389051b42..2b5990679bea 100644
--- a/oox/source/mathml/imexport.cxx
+++ b/oox/source/mathml/imexport.cxx
@@ -13,7 +13,6 @@
 #include <oox/core/contexthandler.hxx>
 #include <oox/token/namespaces.hxx>
 
-#include <comphelper/servicehelper.hxx>
 #include <drawingml/textparagraph.hxx>
 
 
@@ -22,15 +21,6 @@ using namespace ::com::sun::star;
 namespace oox
 {
 
-sal_Int64 FormulaImExportBase::getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) {
-    return comphelper::getSomethingImpl(aIdentifier, this);
-}
-
-css::uno::Sequence<sal_Int8> const & FormulaImExportBase::getUnoTunnelId() {
-    static comphelper::UnoIdInit const id;
-    return id.getSeq();
-}
-
 FormulaImExportBase::FormulaImExportBase()
 {
 }