diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-29 16:27:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-30 09:46:37 +0200 |
| commit | b99c69784e8bb7b477759f14058a707e9000e56d (patch) | |
| tree | 83a87f074a4f6abcecbfa8a5f5965c64893a0454 /sd/source/ui/view/sdview3.cxx | |
| parent | 5ff20b1c726509ad88058c953406a2bd0c8e194b (diff) | |
rename GetMarkedObjModel to CreateMarkedObjModel
and return std::unique_ptr
Not that it helps much, the ownership quickly becomes complex once it
hits the TransferableHelper.
Change-Id: I3c6bd72072e092b71b32e4105fe859fdcea956af
Reviewed-on: https://gerrit.libreoffice.org/59777
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source/ui/view/sdview3.cxx')
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index a710e7325ec4..1245065e6814 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -622,7 +622,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, // model is owned by from AllocModel() created DocShell SdDrawDocument* pSourceDoc = static_cast<SdDrawDocument*>( pSourceView->GetModel() ); pSourceDoc->CreatingDataObj( pOwnData ); - SdDrawDocument* pModel = static_cast<SdDrawDocument*>( pSourceView->GetMarkedObjModel() ); + SdDrawDocument* pModel = static_cast<SdDrawDocument*>( pSourceView->CreateMarkedObjModel().release() ); bReturn = Paste(*pModel, maDropPos, pPage, nPasteOptions); if( !pPage ) |