sc/source/ui/app/drwtrans.cxx | 4 ++--
sc/source/ui/app/seltrans.cxx | 4 ++--
sc/source/ui/inc/drwtrans.hxx | 2 +-
sc/source/ui/navipi/content.cxx | 4 ++--
sc/source/ui/view/drawvie4.cxx | 12 ++++++------
5 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 5288887d0028115611bf4ea3d497cf27bfcdb182
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed Aug 29 10:59:52 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Aug 29 12:25:45 2018 +0200
loplugin:useuniqueptr in ScDrawTransferObj
Change-Id: I7a895a88576eabf010caa13353ad5698b4daf4d6
Reviewed-on: https://gerrit.libreoffice.org/59756
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 7f60ebcd3ad8..3cb2fefebf0b 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -72,9 +72,9 @@ constexpr sal_uInt32 SCDRAWTRANS_TYPE_EMBOBJ = 1;
constexpr sal_uInt32 SCDRAWTRANS_TYPE_DRAWMODEL = 2;
constexpr sal_uInt32 SCDRAWTRANS_TYPE_DOCUMENT = 3;
-ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell*
pContainerShell,
+ScDrawTransferObj::ScDrawTransferObj( std::unique_ptr<SdrModel> pClipModel,
ScDocShell* pContainerShell,
const TransferableObjectDescriptor&
rDesc ) :
- m_pModel( pClipModel ),
+ m_pModel( std::move(pClipModel) ),
m_aObjDesc( rDesc ),
m_pBookmark( nullptr ),
m_bGraphic( false ),
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index e2e6004c6154..c42134bb28cd 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -327,7 +327,7 @@ void ScSelectionTransferObj::CreateDrawData()
}
ScDrawLayer::SetGlobalDrawPersist( aDragShellRef.get() );
- SdrModel* pModel = pDrawView->GetMarkedObjModel();
+ std::unique_ptr<SdrModel> pModel(pDrawView->GetMarkedObjModel());
ScDrawLayer::SetGlobalDrawPersist(nullptr);
ScViewData& rViewData = pView->GetViewData();
@@ -338,7 +338,7 @@ void ScSelectionTransferObj::CreateDrawData()
aObjDesc.maDisplayName =
pDocSh->GetMedium()->GetURLObject().GetURLNoPass();
// maSize is set in ScDrawTransferObj ctor
- rtl::Reference<ScDrawTransferObj> pTransferObj = new
ScDrawTransferObj( pModel, pDocSh, aObjDesc );
+ rtl::Reference<ScDrawTransferObj> pTransferObj = new
ScDrawTransferObj( std::move(pModel), pDocSh, aObjDesc );
SfxObjectShellRef aPersistRef( aDragShellRef.get() );
pTransferObj->SetDrawPersist( aPersistRef ); // keep persist
for ole objects alive
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index e403e967b7c8..0a4dcb952e28 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -69,7 +69,7 @@ private:
void CreateOLEData();
public:
- ScDrawTransferObj( SdrModel* pClipModel, ScDocShell*
pContainerShell,
+ ScDrawTransferObj( std::unique_ptr<SdrModel> pClipModel,
ScDocShell* pContainerShell,
const TransferableObjectDescriptor& rDesc );
virtual ~ScDrawTransferObj() override;
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 71405a56d22d..ecaecee72982 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -1253,14 +1253,14 @@ static void lcl_DoDragObject( ScDocShell* pSrcShell,
const OUString& rName, ScCo
SdrPageView* pPV = aEditView.GetSdrPageView();
aEditView.MarkObj(pObject, pPV);
- SdrModel* pDragModel = aEditView.GetMarkedObjModel();
+ std::unique_ptr<SdrModel>
pDragModel(aEditView.GetMarkedObjModel());
TransferableObjectDescriptor aObjDesc;
pSrcShell->FillTransferableObjectDescriptor( aObjDesc );
aObjDesc.maDisplayName =
pSrcShell->GetMedium()->GetURLObject().GetURLNoPass();
// maSize is set in ScDrawTransferObj ctor
- rtl::Reference<ScDrawTransferObj> pTransferObj = new
ScDrawTransferObj( pDragModel, pSrcShell, aObjDesc );
+ rtl::Reference<ScDrawTransferObj> pTransferObj = new
ScDrawTransferObj( std::move(pDragModel), pSrcShell, aObjDesc );
pTransferObj->SetDragSourceObj( *pObject, nTab );
pTransferObj->SetDragSourceFlags(ScDragSrc::Navigator);
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index caf786900f96..4bd6b11719cf 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -80,7 +80,7 @@ void ScDrawView::BeginDrag( vcl::Window* pWindow, const
Point& rStartPos )
aDragShellRef->DoInitNew();
}
ScDrawLayer::SetGlobalDrawPersist( aDragShellRef.get() );
- SdrModel* pModel = GetMarkedObjModel();
+ std::unique_ptr<SdrModel> pModel(GetMarkedObjModel());
ScDrawLayer::SetGlobalDrawPersist(nullptr);
// Charts now always copy their data in addition to the source
reference, so
@@ -95,7 +95,7 @@ void ScDrawView::BeginDrag( vcl::Window* pWindow, const
Point& rStartPos )
aObjDesc.maDisplayName =
pDocSh->GetMedium()->GetURLObject().GetURLNoPass();
// maSize is set in ScDrawTransferObj ctor
- rtl::Reference<ScDrawTransferObj> pTransferObj = new
ScDrawTransferObj( pModel, pDocSh, aObjDesc );
+ rtl::Reference<ScDrawTransferObj> pTransferObj = new
ScDrawTransferObj( std::move(pModel), pDocSh, aObjDesc );
pTransferObj->SetDrawPersist( aDragShellRef.get() ); // keep
persist for ole objects alive
pTransferObj->SetDragSource( this ); // copies selection
@@ -358,7 +358,7 @@ void ScDrawView::DoCopy()
ScDocument& rClipDoc = xDocSh->GetDocument();
copyChartRefDataToClipDoc(pDoc, &rClipDoc, aRanges);
}
- SdrModel* pModel = GetMarkedObjModel();
+ std::unique_ptr<SdrModel> pModel(GetMarkedObjModel());
ScDrawLayer::SetGlobalDrawPersist(nullptr);
// Charts now always copy their data in addition to the source reference,
so
@@ -373,7 +373,7 @@ void ScDrawView::DoCopy()
aObjDesc.maDisplayName =
pDocSh->GetMedium()->GetURLObject().GetURLNoPass();
// maSize is set in ScDrawTransferObj ctor
- ScDrawTransferObj* pTransferObj = new ScDrawTransferObj( pModel, pDocSh,
aObjDesc );
+ ScDrawTransferObj* pTransferObj = new ScDrawTransferObj(
std::move(pModel), pDocSh, aObjDesc );
uno::Reference<css::datatransfer::XTransferable2> xTransferObj =
pTransferObj;
if ( ScGlobal::xDrawClipDocShellRef.is() )
@@ -392,7 +392,7 @@ uno::Reference<datatransfer::XTransferable>
ScDrawView::CopyToTransferable()
// update ScGlobal::xDrawClipDocShellRef
ScDrawLayer::SetGlobalDrawPersist( ScTransferObj::SetDrawClipDoc( bAnyOle
) );
- SdrModel* pModel = GetMarkedObjModel();
+ std::unique_ptr<SdrModel> pModel( GetMarkedObjModel() );
ScDrawLayer::SetGlobalDrawPersist(nullptr);
// Charts now always copy their data in addition to the source reference,
so
@@ -408,7 +408,7 @@ uno::Reference<datatransfer::XTransferable>
ScDrawView::CopyToTransferable()
aObjDesc.maDisplayName =
pDocSh->GetMedium()->GetURLObject().GetURLNoPass();
// maSize is set in ScDrawTransferObj ctor
- ScDrawTransferObj* pTransferObj = new ScDrawTransferObj( pModel, pDocSh,
aObjDesc );
+ ScDrawTransferObj* pTransferObj = new ScDrawTransferObj(
std::move(pModel), pDocSh, aObjDesc );
uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj );
if ( ScGlobal::xDrawClipDocShellRef.is() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
