diff options
| author | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-07-10 17:12:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolan.mcnamara@collabora.com> | 2024-07-11 09:26:28 +0200 |
| commit | e68f28ec9f68a1f70afce7acfa38ce7a63ccdafe (patch) | |
| tree | 45593e64ba3faa1b22f794743876ce13abd85c84 /sc | |
| parent | 3aac0f9b378e12cb51d8e8239f8c0f7627d0f8ca (diff) | |
cid#1607892 COPY_INSTEAD_OF_MOVE
and
cid#1607910 COPY_INSTEAD_OF_MOVE
cid#1607818 COPY_INSTEAD_OF_MOVE
cid#1557402 COPY_INSTEAD_OF_MOVE
cid#1556530 COPY_INSTEAD_OF_MOVE
cid#1557396 COPY_INSTEAD_OF_MOVE
cid#1556522 COPY_INSTEAD_OF_MOVE
cid#1555628 COPY_INSTEAD_OF_MOVE
cid#1554705 COPY_INSTEAD_OF_MOVE
Change-Id: Iae3fbf4a04bf3714f416995640b9d70fe204cf73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170321
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/excel.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index 79e4c9073627..44fe3b31a0b1 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -185,9 +185,8 @@ ErrCode ScFormatFilterPluginImpl::ScImportExcel( SfxMedium& rMedium, ScDocument* rtl::Reference<SotStorageStream> xDRMStrm = ScfTools::OpenStorageStreamRead(xRootStrg, u"\011DRMContent"_ustr); if (xDRMStrm.is()) { - auto pDecryptedStorage = lcl_DRMDecrypt(rMedium, xRootStrg, aNewStorageStrm); - if (pDecryptedStorage) - xRootStrg = pDecryptedStorage; + if (auto xDecryptedStorage = lcl_DRMDecrypt(rMedium, xRootStrg, aNewStorageStrm)) + xRootStrg = std::move(xDecryptedStorage); else { bUnableToDecryptContent = true; |