diff options
author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-01-07 16:24:23 +0000 |
---|---|---|
committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-01-08 13:09:02 +0100 |
commit | 6342aa6c665012f51a5c11f0293d5d3ff3a573ee (patch) | |
tree | eba3c93b801a416b50ba203980a901421b719492 /sd | |
parent | 7413b4ad50b38cf9839fc3e3d4d0bec6ada90a6a (diff) |
cid#1545370 COPY_INSTEAD_OF_MOVE
and
cid#1545364 COPY_INSTEAD_OF_MOVE
cid#1545363 COPY_INSTEAD_OF_MOVE
cid#1545344 COPY_INSTEAD_OF_MOVE
cid#1545299 COPY_INSTEAD_OF_MOVE
cid#1545287 COPY_INSTEAD_OF_MOVE
cid#1545267 COPY_INSTEAD_OF_MOVE
cid#1545256 COPY_INSTEAD_OF_MOVE
cid#1545226 COPY_INSTEAD_OF_MOVE
cid#1545500 COPY_INSTEAD_OF_MOVE
cid#1545538 COPY_INSTEAD_OF_MOVE
cid#1545618 COPY_INSTEAD_OF_MOVE
cid#1545681 COPY_INSTEAD_OF_MOVE
cid#1545750 COPY_INSTEAD_OF_MOVE
cid#1545778 COPY_INSTEAD_OF_MOVE
cid#1545785 COPY_INSTEAD_OF_MOVE
cid#1545799 COPY_INSTEAD_OF_MOVE
cid#1545847 COPY_INSTEAD_OF_MOVE
cid#1545958 COPY_INSTEAD_OF_MOVE
cid#1545963 COPY_INSTEAD_OF_MOVE
cid#1545990 COPY_INSTEAD_OF_MOVE
cid#1546013 COPY_INSTEAD_OF_MOVE
cid#1546029 COPY_INSTEAD_OF_MOVE
cid#1546079 COPY_INSTEAD_OF_MOVE
cid#1546104 COPY_INSTEAD_OF_MOVE
cid#1546127 COPY_INSTEAD_OF_MOVE
cid#1546133 COPY_INSTEAD_OF_MOVE
cid#1546155 COPY_INSTEAD_OF_MOVE
cid#1546190 COPY_INSTEAD_OF_MOVE
cid#1546216 COPY_INSTEAD_OF_MOVE
cid#1546273 COPY_INSTEAD_OF_MOVE
cid#1546315 COPY_INSTEAD_OF_MOVE
cid#1546326 COPY_INSTEAD_OF_MOVE
cid#1546387 COPY_INSTEAD_OF_MOVE
accept some reasonable suggestions
Change-Id: I7b004086d490c7618d8fe7a21a53cfa8ac1f8408
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161748
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/filter/grf/sdgrffilter.cxx | 5 | ||||
-rw-r--r-- | sd/source/ui/app/sdxfer.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 1bb51ae40f95..36594fbcd588 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -167,9 +167,8 @@ bool SdGRFFilter::Import() } for (size_t nPageIndex = 0; nPageIndex < nImages; ++nPageIndex) { - Graphic pGraphic = aAnim.Get(nPageIndex).maBitmapEx; - SdPage* pPage = mrDocument.GetSdPage(nPageIndex, PageKind::Standard); - InsertSdrGrafObj(pGraphic, pPage); + InsertSdrGrafObj(aAnim.Get(nPageIndex).maBitmapEx, + mrDocument.GetSdPage(nPageIndex, PageKind::Standard)); } } else diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 74728dd0e64a..257a7c10aee4 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -489,7 +489,7 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo } } - maDocShellRef = aOldRef; + maDocShellRef = std::move(aOldRef); } else if( nFormat == SotClipboardFormatId::GDIMETAFILE ) { |