3 files changed, 2 insertions, 9 deletions
diff --git a/toolkit/inc/awt/vclxpointer.hxx b/toolkit/inc/awt/vclxpointer.hxx
index 3bfcceeabf0a..103031926919 100644
--- a/toolkit/inc/awt/vclxpointer.hxx
+++ b/toolkit/inc/awt/vclxpointer.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/awt/XPointer.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <mutex>
@@ -33,7 +32,7 @@
 
 
 class VCLXPointer final : public cppu::WeakImplHelper<
-    css::awt::XPointer, css::lang::XUnoTunnel, css::lang::XServiceInfo>
+    css::awt::XPointer, css::lang::XServiceInfo>
 {
     std::mutex    maMutex;
     PointerStyle    maPointer;
@@ -44,9 +43,6 @@ public:
 
     PointerStyle GetPointer() const { return maPointer; }
 
-    // css::lang::XUnoTunnel
-    UNO3_GETIMPLEMENTATION_DECL(VCLXPointer)
-
     // css::awt::XPointer
     void SAL_CALL setType( sal_Int32 nType ) override;
     sal_Int32 SAL_CALL getType(  ) override;
diff --git a/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx
index 89828e48a611..b54161041373 100644
--- a/toolkit/source/awt/vclxpointer.cxx
+++ b/toolkit/source/awt/vclxpointer.cxx
@@ -29,9 +29,6 @@ VCLXPointer::~VCLXPointer()
 {
 }
 
-// css::lang::XUnoTunnel
-UNO3_GETIMPLEMENTATION_IMPL( VCLXPointer );
-
 void VCLXPointer::setType( sal_Int32 nType )
 {
     std::scoped_lock aGuard( maMutex );
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 284ffb75326b..f5ebe82f02db 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1146,7 +1146,7 @@ void VCLXWindow::setPointer( const css::uno::Reference< css::awt::XPointer >& rx
 {
     SolarMutexGuard aGuard;
 
-    VCLXPointer* pPointer = comphelper::getFromUnoTunnel<VCLXPointer>( rxPointer );
+    VCLXPointer* pPointer = dynamic_cast<VCLXPointer*>( rxPointer.get() );
     if ( pPointer && GetWindow() )
         GetWindow()->SetPointer( pPointer->GetPointer() );
 }