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

Noel Grandin noel.grandin at collabora.co.uk
Fri Apr 6 04:29:44 UTC 2018


 sd/source/ui/view/sdview2.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 606c019123bccc102e3903f1c1f6b8c8121cca79
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Thu Apr 5 10:35:30 2018 +0200

    fix bug in View::CreateSelectionDataObject
    
    ever since
        commit 5e6def1bd4e36379e8dce78402820540bd6f02e2
        Date:   Fri Jan 19 18:15:28 2001 +0000
        Redesign for XTransferable
    
    found by my unusedvariablemore plugin
    
    Change-Id: I80c8db159c026cbdc93449ace61444adf7c854ce
    Reviewed-on: https://gerrit.libreoffice.org/52448
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index c18f8bdbed0c..29c3c2bc24a8 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -200,14 +200,13 @@ css::uno::Reference< css::datatransfer::XTransferable > View::CreateSelectionDat
     css::uno::Reference< css::datatransfer::XTransferable > xRet( pTransferable );
     std::unique_ptr<TransferableObjectDescriptor> pObjDesc(new TransferableObjectDescriptor);
     const ::tools::Rectangle                 aMarkRect( GetAllMarkedRect() );
-    OUString                        aDisplayName;
 
     SD_MOD()->pTransferSelection = pTransferable;
 
     if( mpDocSh )
     {
-        aDisplayName = mpDocSh->GetMedium()->GetURLObject().GetURLNoPass();
         mpDocSh->FillTransferableObjectDescriptor( *pObjDesc );
+        pObjDesc->maDisplayName = mpDocSh->GetMedium()->GetURLObject().GetURLNoPass();
     }
 
     pObjDesc->maSize = aMarkRect.GetSize();


More information about the Libreoffice-commits mailing list