[Libreoffice-commits] core.git: sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/app/sdxfer.cxx   |    9 +--------
 sd/source/ui/dlg/sdtreelb.cxx |    9 +--------
 2 files changed, 2 insertions(+), 16 deletions(-)

New commits:
commit 4f45d7bb863a991e70adcea4848377a3c65f7194
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Mar 3 10:56:54 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Mar 3 17:19:37 2023 +0000

    Related: tdf#94319 object pasted in draw/impress is always centered
    
    this is a recent problem since:
    
    commit d60722e29a0dde6282915188e5ff7e24890a14d3
    Date:   Thu Jan 12 16:25:40 2023 +0200
    
        XUnoTunnel->dynamic_cast in TransferableHelper
    
    Change-Id: I764b62d7a395d01f8e86174ce8e4d30dfeb80ead
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148171
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index e7fb0ff357f9..2e048542f9b6 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -729,14 +729,7 @@ const css::uno::Sequence< sal_Int8 >& 
SdTransferable::getUnoTunnelId()
 
 SdTransferable* SdTransferable::getImplementation( const Reference< XInterface 
>& rxData ) noexcept
 {
-    try
-    {
-        return comphelper::getFromUnoTunnel<SdTransferable>(rxData);
-    }
-    catch( const css::uno::Exception& )
-    {
-    }
-    return nullptr;
+    return dynamic_cast<SdTransferable*>(rxData.get());
 }
 
 void SdTransferable::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 5b2d092cb105..87780bada9aa 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -118,14 +118,7 @@ void SdPageObjsTLV::SdPageObjsTransferable::DragFinished( 
sal_Int8 nDropAction )
 SdPageObjsTLV::SdPageObjsTransferable* 
SdPageObjsTLV::SdPageObjsTransferable::getImplementation( const 
css::uno::Reference< css::uno::XInterface >& rxData )
     noexcept
 {
-    try
-    {
-        return 
comphelper::getFromUnoTunnel<SdPageObjsTLV::SdPageObjsTransferable>(rxData);
-    }
-    catch( const css::uno::Exception& )
-    {
-    }
-    return nullptr;
+    return dynamic_cast<SdPageObjsTLV::SdPageObjsTransferable*>(rxData.get());
 }
 
 SotClipboardFormatId 
SdPageObjsTLV::SdPageObjsTransferable::GetListBoxDropFormatId()