2 files changed, 2 insertions, 22 deletions
diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx
index 53d9d4268401..4dd837259bf7 100644
--- a/vbahelper/source/vbahelper/vbashaperange.cxx
+++ b/vbahelper/source/vbahelper/vbashaperange.cxx
@@ -24,7 +24,6 @@
 #include <ooo/vba/office/MsoShapeType.hpp>
 
 #include <utility>
-#include <comphelper/servicehelper.hxx>
 #include <vbahelper/vbashaperange.hxx>
 #include <vbahelper/vbashape.hxx>
 using namespace ::ooo::vba;
@@ -45,7 +44,7 @@ public:
         }
         virtual uno::Any SAL_CALL nextElement(  ) override
         {
-                ScVbaShapeRange* pCollectionImpl = comphelper::getFromUnoTunnel< ScVbaShapeRange >(m_xParent);
+                ScVbaShapeRange* pCollectionImpl = dynamic_cast< ScVbaShapeRange* >(m_xParent.get());
                 if ( pCollectionImpl && hasMoreElements() )
                     return pCollectionImpl->createCollectionObject(  m_xIndexAccess->getByIndex( nIndex++ ) );
                 throw container::NoSuchElementException();
@@ -392,15 +391,6 @@ ScVbaShapeRange::createEnumeration()
     return new VbShapeRangeEnumHelper( this, m_xIndexAccess );
 }
 
-sal_Int64 ScVbaShapeRange::getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) {
-    return comphelper::getSomethingImpl(aIdentifier, this);
-}
-
-css::uno::Sequence<sal_Int8> const & ScVbaShapeRange::getUnoTunnelId() {
-    static comphelper::UnoIdInit const id;
-    return id.getSeq();
-}
-
 uno::Any
 ScVbaShapeRange:: createCollectionObject( const css::uno::Any& aSource )
 {
diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx
index a61fbddfb350..02630a75c520 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -39,7 +39,6 @@
 #include <com/sun/star/drawing/XShapes.hpp>
 
 #include <utility>
-#include <comphelper/servicehelper.hxx>
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbashape.hxx>
 #include <vbahelper/vbashapes.hxx>
@@ -64,7 +63,7 @@ public:
         }
         virtual uno::Any SAL_CALL nextElement(  ) override
         {
-                ScVbaShapes* pShapes = comphelper::getFromUnoTunnel< ScVbaShapes >(m_xParent);
+                ScVbaShapes* pShapes = dynamic_cast< ScVbaShapes* >(m_xParent.get());
                 if ( pShapes && hasMoreElements() )
                     return pShapes->createCollectionObject(  m_xIndexAccess->getByIndex( nIndex++ ) );
                 throw container::NoSuchElementException();
@@ -102,15 +101,6 @@ ScVbaShapes::createEnumeration()
     return new VbShapeEnumHelper( this,  m_xIndexAccess );
 }
 
-sal_Int64 ScVbaShapes::getSomething(css::uno::Sequence<sal_Int8> const & aIdentifier) {
-    return comphelper::getSomethingImpl(aIdentifier, this);
-}
-
-css::uno::Sequence<sal_Int8> const & ScVbaShapes::getUnoTunnelId() {
-    static comphelper::UnoIdInit const id;
-    return id.getSeq();
-}
-
 uno::Any
 ScVbaShapes::createCollectionObject( const css::uno::Any& aSource )
 {