diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-13 15:34:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-16 06:41:53 +0000 |
| commit | 96cd6623662b719f09596cb700a1f828c75228fd (patch) | |
| tree | 236ed16b5e5b555e7d0f80629346620c0ed18452 /toolkit | |
| parent | e5092fdf2420c81887a7e845af8e00bcedee156e (diff) | |
XUnoTunnel->dynamic_cast in VCLXPointer
Change-Id: I322115c214de5d476f84650eb53dae8452d5d1a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145533
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/inc/awt/vclxpointer.hxx | 6 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxpointer.cxx | 3 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 2 |
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() ); } |