[Libreoffice-commits] core.git: vcl/inc vcl/source

[Noel Grandin (via logerrit)]

 vcl/inc/graphic/UnoBinaryDataContainer.hxx      |    6 +-----
 vcl/source/graphic/BinaryDataContainerTools.cxx |    2 +-
 vcl/source/graphic/UnoBinaryDataContainer.cxx   |    3 ---
 3 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 4f0012b73cfabc039da4c78dc993abb42c9cf987
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Fri Jan 13 09:31:38 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Jan 15 10:14:16 2023 +0000

    XUnoTunnel->dynamic_cast in UnoBinaryDataContainer
    
    Change-Id: Ifdef69448558f4c5d6902188208d3eea1a080334
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145506
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/vcl/inc/graphic/UnoBinaryDataContainer.hxx 
b/vcl/inc/graphic/UnoBinaryDataContainer.hxx
index f1e123dad8d8..7698afe254f7 100644
--- a/vcl/inc/graphic/UnoBinaryDataContainer.hxx
+++ b/vcl/inc/graphic/UnoBinaryDataContainer.hxx
@@ -17,14 +17,12 @@
 #include <comphelper/servicehelper.hxx>
 
 #include <com/sun/star/util/XBinaryDataContainer.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <utility>
 #include <vcl/BinaryDataContainer.hxx>
 
-class UnoBinaryDataContainer final
-    : public cppu::WeakImplHelper<css::util::XBinaryDataContainer, 
css::lang::XUnoTunnel>
+class UnoBinaryDataContainer final : public 
cppu::WeakImplHelper<css::util::XBinaryDataContainer>
 {
 private:
     BinaryDataContainer maBinaryDataContainer;
@@ -39,8 +37,6 @@ public:
 
     // XBinaryDataContainer
     css::uno::Sequence<sal_Int8> SAL_CALL getCopyAsByteSequence() override;
-
-    UNO3_GETIMPLEMENTATION_DECL(UnoBinaryDataContainer)
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/graphic/BinaryDataContainerTools.cxx 
b/vcl/source/graphic/BinaryDataContainerTools.cxx
index 359a8664daa6..c64380331356 100644
--- a/vcl/source/graphic/BinaryDataContainerTools.cxx
+++ b/vcl/source/graphic/BinaryDataContainerTools.cxx
@@ -18,7 +18,7 @@ BinaryDataContainer convertUnoBinaryDataContainer(
 {
     BinaryDataContainer aBinaryDataContainer;
     UnoBinaryDataContainer* pUnoBinaryDataContainer
-        = 
comphelper::getFromUnoTunnel<UnoBinaryDataContainer>(rxBinaryDataContainer);
+        = dynamic_cast<UnoBinaryDataContainer*>(rxBinaryDataContainer.get());
     if (pUnoBinaryDataContainer)
         aBinaryDataContainer = 
pUnoBinaryDataContainer->getBinaryDataContainer();
     return aBinaryDataContainer;
diff --git a/vcl/source/graphic/UnoBinaryDataContainer.cxx 
b/vcl/source/graphic/UnoBinaryDataContainer.cxx
index 8ee3660be416..4d6a0de9f796 100644
--- a/vcl/source/graphic/UnoBinaryDataContainer.cxx
+++ b/vcl/source/graphic/UnoBinaryDataContainer.cxx
@@ -14,9 +14,6 @@
 
 using namespace css;
 
-// css::lang::XUnoTunnel
-UNO3_GETIMPLEMENTATION_IMPL(UnoBinaryDataContainer);
-
 css::uno::Sequence<sal_Int8> SAL_CALL 
UnoBinaryDataContainer::getCopyAsByteSequence()
 {
     if (maBinaryDataContainer.isEmpty())