From 4e4ef13452f3aa5494ff9babc6784155caee9e11 Mon Sep 17 00:00:00 2001 From: Jaume Pujantell Date: Tue, 24 Feb 2026 11:01:12 +0100 Subject: [PATCH] tdf#170968 avoid unnecessary soft edge reset This fixes a regression from 85dbb4dc81bed0b55a1bfbc5dce221b98eaf70d1 (tdf#170095 override soft edge if there are 3D effects) where a shape might stop showing if the soft edge value is set to zero when it wasn't set to begin with. Change-Id: I0a886711cef199e4eb3a89a034732e6ef0b1e4c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200155 Reviewed-by: Jaume Pujantell Tested-by: Jenkins --- oox/source/drawingml/shape.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 26d3a903aa1c..e34237c24eda 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -1632,10 +1632,10 @@ Reference< XShape > const & Shape::createAndInsert( = get3DProperties().getShape3DAttributes(rGraphicHelper, nFillPhClr); bool bHas3DProps = aCamera3DEffects.hasElements() || aLightRig3DEffects.hasElements() || aShape3DEffects.hasElements(); - if (bHas3DProps) + if (bHas3DProps && getEffectProperties().maSoftEdge.moRad.has_value()) { // 3D properties override softeEdge - getEffectProperties().maSoftEdge.moRad = 0; + getEffectProperties().maSoftEdge.moRad.reset(); } // applying properties