diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-13 18:26:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-01-16 08:40:47 +0000 |
| commit | 8081533f7c35939b64f11894470c3e033057a887 (patch) | |
| tree | befb5ac4e524d19f2b4286810c8dc87f8d3cdd25 /toolkit | |
| parent | b9411e587586750f36ba9009b5f1e29fe461d8b5 (diff) | |
XUnoTunnel->dynamic_cast in VCLXBitmap
Change-Id: I2cf42ac720184bc2b8b89ced5564dbb95e7dc1ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145535
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/inc/awt/vclxbitmap.hxx | 5 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxbitmap.cxx | 3 | ||||
| -rw-r--r-- | toolkit/source/helper/vclunohelper.cxx | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/toolkit/inc/awt/vclxbitmap.hxx b/toolkit/inc/awt/vclxbitmap.hxx index 6cf8928e06c4..9edf562c1db8 100644 --- a/toolkit/inc/awt/vclxbitmap.hxx +++ b/toolkit/inc/awt/vclxbitmap.hxx @@ -21,7 +21,6 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/awt/XDisplayBitmap.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/util/XAccounting.hpp> #include <comphelper/servicehelper.hxx> #include <cppuhelper/implbase.hxx> @@ -34,7 +33,6 @@ class VCLXBitmap final : public cppu::WeakImplHelper< css::awt::XBitmap, css::awt::XDisplayBitmap, - css::lang::XUnoTunnel, css::util::XAccounting> { std::mutex maMutex; @@ -51,9 +49,6 @@ public: void SetBitmap( const BitmapEx& rBmp ) { maBitmap = rBmp; } const BitmapEx& GetBitmap() const { return maBitmap; } - // css::lang::XUnoTunnel - UNO3_GETIMPLEMENTATION_DECL(VCLXBitmap) - // css::awt::XBitmap css::awt::Size SAL_CALL getSize() override; css::uno::Sequence< sal_Int8 > SAL_CALL getDIB() override; diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx index 17111311dfbb..1faedb623550 100644 --- a/toolkit/source/awt/vclxbitmap.cxx +++ b/toolkit/source/awt/vclxbitmap.cxx @@ -25,9 +25,6 @@ -// css::lang::XUnoTunnel -UNO3_GETIMPLEMENTATION_IMPL( VCLXBitmap ); - // css::awt::XBitmap css::awt::Size VCLXBitmap::getSize() { diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index c0f93ca5d756..45580c37cac8 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -73,7 +73,7 @@ BitmapEx VCLUnoHelper::GetBitmap( const css::uno::Reference< css::awt::XBitmap>& } else if ( rxBitmap.is() ) { - VCLXBitmap* pVCLBitmap = comphelper::getFromUnoTunnel<VCLXBitmap>( rxBitmap ); + VCLXBitmap* pVCLBitmap = dynamic_cast<VCLXBitmap*>( rxBitmap.get() ); if ( pVCLBitmap ) aBmp = pVCLBitmap->GetBitmap(); else |