emfio/source/reader/emfreader.cxx | 2 +- oox/source/export/ThemeExport.cxx | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-)
New commits: commit 3b4b323c7f5c18aee6533eb3a6c95ca7b3b72f3a Author: Caolán McNamara <[email protected]> AuthorDate: Tue Oct 14 08:45:55 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Oct 14 14:16:46 2025 +0200 cid#1667077 Variable copied when it could be moved Change-Id: I142c97c8e392770ae4a66f0945b580c1d141e5ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192370 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx index abd842e417da..739b49ab9b40 100644 --- a/emfio/source/reader/emfreader.cxx +++ b/emfio/source/reader/emfreader.cxx @@ -1625,7 +1625,7 @@ namespace emfio else { // just use Bitmap - aBitmapEx = aBitmap; + aBitmapEx = std::move(aBitmap); } } } commit 05322d40fd3404796b9a63fc584cc8fe8e7422f0 Author: Caolán McNamara <[email protected]> AuthorDate: Mon Oct 13 20:11:30 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Oct 14 14:16:36 2025 +0200 crashtesting: assert on exporting srgbClr with alpha Change-Id: I0420aa5c4586ab187772306be9cc1db38b9a6094 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192328 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/oox/source/export/ThemeExport.cxx b/oox/source/export/ThemeExport.cxx index 0a31ee3446fc..8f76e49af3f8 100644 --- a/oox/source/export/ThemeExport.cxx +++ b/oox/source/export/ThemeExport.cxx @@ -890,7 +890,20 @@ bool ThemeExport::writeColorSet(model::Theme const& rTheme) model::ThemeColorType eColorType = iterator->second; Color aColor = pColorSet->getColor(eColorType); mpFS->startElementNS(XML_a, nToken); - mpFS->singleElementNS(XML_a, XML_srgbClr, XML_val, I32SHEX(sal_Int32(aColor))); + if (!aColor.IsTransparent()) + mpFS->singleElementNS(XML_a, XML_srgbClr, XML_val, + I32SHEX(sal_Int32(aColor.GetRGBColor()))); + else + { + mpFS->startElementNS(XML_a, XML_srgbClr, XML_val, + I32SHEX(sal_Int32(aColor.GetRGBColor()))); + + // drawingML alpha is a percentage on a 0..100000 scale. + sal_Int32 nAlpha = aColor.GetAlpha() * oox::drawingml::MAX_PERCENT / 255; + mpFS->singleElementNS(XML_a, XML_alpha, XML_val, OUString::number(nAlpha)); + + mpFS->endElementNS(XML_a, XML_srgbClr); + } mpFS->endElementNS(XML_a, nToken); } }
