sd/source/ui/dlg/sdtreelb.cxx | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
New commits: commit 96834fab67ab4719ab276b6edf67ecc2f2899bee Author: Noel Grandin <[email protected]> AuthorDate: Mon Oct 6 12:02:53 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Oct 6 14:54:26 2025 +0200 crashtesting fix regression from commit 170a1dfe9b01ffea49328a3abbaeb70c725f4c90 Author: Noel Grandin <[email protected]> Date: Thu Sep 25 10:47:48 2025 +0200 simplify use of EnhancedCustomShapeEngine Change-Id: Ic7f17e8bf05bc0462cf28c0420f4e58b6ec1c579 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191957 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 9877054ee700..b753458d30d7 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -910,17 +910,17 @@ OUString SdPageObjsTLV::GetObjectName( OUString sObjName; if (pObject->GetObjIdentifier() == SdrObjKind::CustomShape) { -#ifndef NDEBUG - OUString aEngine(pObject->GetMergedItem(SDRATTR_CUSTOMSHAPE_ENGINE).GetValue()); - assert(aEngine.isEmpty() || aEngine == "com.sun.star.drawing.EnhancedCustomShapeEngine"); -#endif // taken from SdrObjCustomShape::GetCustomShapeName - OUString sShapeType; - const SdrCustomShapeGeometryItem& rGeometryItem - = pObject->GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY); - const uno::Any* pAny = rGeometryItem.GetPropertyValueByName(u"Type"_ustr); - if (pAny && (*pAny >>= sShapeType)) - sObjName = SdResId(STR_NAVIGATOR_CUSTOMSHAPE) + u": " + sShapeType; + OUString aEngine(pObject->GetMergedItem(SDRATTR_CUSTOMSHAPE_ENGINE).GetValue()); + if(aEngine.isEmpty() || aEngine == "com.sun.star.drawing.EnhancedCustomShapeEngine") + { + OUString sShapeType; + const SdrCustomShapeGeometryItem& rGeometryItem + = pObject->GetMergedItem(SDRATTR_CUSTOMSHAPE_GEOMETRY); + const uno::Any* pAny = rGeometryItem.GetPropertyValueByName(u"Type"_ustr); + if (pAny && (*pAny >>= sShapeType)) + sObjName = SdResId(STR_NAVIGATOR_CUSTOMSHAPE) + u": " + sShapeType; + } } else sObjName = pObject->TakeObjNameSingul();
