diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-20 13:49:04 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-22 07:36:30 +0100 |
commit | bf1daa9f4b0bd2ac706133def18c4af4cad9f216 (patch) | |
tree | 9e314013735ada1f2fe2429d25cad9cfa26e348e /sd/source/ui/view/sdview2.cxx | |
parent | c0a76a9460a4a7db1575bc87744985150462a334 (diff) |
loplugin:useuniqueptr in SdTransferable
Change-Id: I7ace5ab37ce6df240d3b7fbe8c0fd12618fa3031
Reviewed-on: https://gerrit.libreoffice.org/51669
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/view/sdview2.cxx')
-rw-r--r-- | sd/source/ui/view/sdview2.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 8f8775b015f7..c18f8bdbed0c 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -99,7 +99,7 @@ css::uno::Reference< css::datatransfer::XTransferable > View::CreateClipboardDat // #112978# need to use GetAllMarkedBoundRect instead of GetAllMarkedRect to get // fat lines correctly const ::tools::Rectangle aMarkRect( GetAllMarkedBoundRect() ); - TransferableObjectDescriptor aObjDesc; + std::unique_ptr<TransferableObjectDescriptor> pObjDesc(new TransferableObjectDescriptor); SdrOle2Obj* pSdrOleObj = nullptr; SdrPageView* pPgView = GetSdrPageView(); SdPage* pOldPage = pPgView ? static_cast<SdPage*>( pPgView->GetPage() ) : nullptr; @@ -130,17 +130,17 @@ css::uno::Reference< css::datatransfer::XTransferable > View::CreateClipboardDat } if( pSdrOleObj ) - SvEmbedTransferHelper::FillTransferableObjectDescriptor( aObjDesc, pSdrOleObj->GetObjRef(), pSdrOleObj->GetGraphic(), pSdrOleObj->GetAspect() ); + SvEmbedTransferHelper::FillTransferableObjectDescriptor( *pObjDesc, pSdrOleObj->GetObjRef(), pSdrOleObj->GetGraphic(), pSdrOleObj->GetAspect() ); else - pTransferable->GetWorkDocument()->GetDocSh()->FillTransferableObjectDescriptor( aObjDesc ); + pTransferable->GetWorkDocument()->GetDocSh()->FillTransferableObjectDescriptor( *pObjDesc ); if( mpDocSh ) - aObjDesc.maDisplayName = mpDocSh->GetMedium()->GetURLObject().GetURLNoPass(); + pObjDesc->maDisplayName = mpDocSh->GetMedium()->GetURLObject().GetURLNoPass(); - aObjDesc.maSize = aMarkRect.GetSize(); + pObjDesc->maSize = aMarkRect.GetSize(); pTransferable->SetStartPos( aMarkRect.TopLeft() ); - pTransferable->SetObjectDescriptor( aObjDesc ); + pTransferable->SetObjectDescriptor( std::move(pObjDesc) ); pTransferable->CopyToClipboard( mpViewSh->GetActiveWindow() ); return xRet; @@ -153,7 +153,7 @@ css::uno::Reference< css::datatransfer::XTransferable > View::CreateDragDataObje SD_MOD()->pTransferDrag = pTransferable; - TransferableObjectDescriptor aObjDesc; + std::unique_ptr<TransferableObjectDescriptor> pObjDesc(new TransferableObjectDescriptor); OUString aDisplayName; SdrOle2Obj* pSdrOleObj = nullptr; @@ -179,16 +179,16 @@ css::uno::Reference< css::datatransfer::XTransferable > View::CreateDragDataObje aDisplayName = mpDocSh->GetMedium()->GetURLObject().GetURLNoPass(); if( pSdrOleObj ) - SvEmbedTransferHelper::FillTransferableObjectDescriptor( aObjDesc, pSdrOleObj->GetObjRef(), pSdrOleObj->GetGraphic(), pSdrOleObj->GetAspect() ); + SvEmbedTransferHelper::FillTransferableObjectDescriptor( *pObjDesc, pSdrOleObj->GetObjRef(), pSdrOleObj->GetGraphic(), pSdrOleObj->GetAspect() ); else if (mpDocSh) - mpDocSh->FillTransferableObjectDescriptor( aObjDesc ); + mpDocSh->FillTransferableObjectDescriptor( *pObjDesc ); - aObjDesc.maSize = GetAllMarkedRect().GetSize(); - aObjDesc.maDragStartPos = rDragPos; - aObjDesc.maDisplayName = aDisplayName; + pObjDesc->maSize = GetAllMarkedRect().GetSize(); + pObjDesc->maDragStartPos = rDragPos; + pObjDesc->maDisplayName = aDisplayName; pTransferable->SetStartPos( rDragPos ); - pTransferable->SetObjectDescriptor( aObjDesc ); + pTransferable->SetObjectDescriptor( std::move(pObjDesc) ); pTransferable->StartDrag( &rWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK ); return xRet; @@ -198,7 +198,7 @@ css::uno::Reference< css::datatransfer::XTransferable > View::CreateSelectionDat { SdTransferable* pTransferable = new SdTransferable( &mrDoc, pWorkView, true ); css::uno::Reference< css::datatransfer::XTransferable > xRet( pTransferable ); - TransferableObjectDescriptor aObjDesc; + std::unique_ptr<TransferableObjectDescriptor> pObjDesc(new TransferableObjectDescriptor); const ::tools::Rectangle aMarkRect( GetAllMarkedRect() ); OUString aDisplayName; @@ -207,13 +207,13 @@ css::uno::Reference< css::datatransfer::XTransferable > View::CreateSelectionDat if( mpDocSh ) { aDisplayName = mpDocSh->GetMedium()->GetURLObject().GetURLNoPass(); - mpDocSh->FillTransferableObjectDescriptor( aObjDesc ); + mpDocSh->FillTransferableObjectDescriptor( *pObjDesc ); } - aObjDesc.maSize = aMarkRect.GetSize(); + pObjDesc->maSize = aMarkRect.GetSize(); pTransferable->SetStartPos( aMarkRect.TopLeft() ); - pTransferable->SetObjectDescriptor( aObjDesc ); + pTransferable->SetObjectDescriptor( std::move(pObjDesc) ); pTransferable->CopyToSelection( &rWindow ); return xRet; |