summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-03-03 10:56:54 +0000
committerCaolán McNamara <caolanm@redhat.com>2023-03-03 17:19:37 +0000
commit4f45d7bb863a991e70adcea4848377a3c65f7194 (patch)
treebe1a816a7fd881a0e6bef1a73c2bc022ae7cf956 /sd
parent7545f47eb93373324eed35a7253e55448bbbdfbd (diff)
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 <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/app/sdxfer.cxx9
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx9
2 files changed, 2 insertions, 16 deletions
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()