oox/source/vml/vmlshapecontainer.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 3226e5d4084dab74db3514e541af080ed10da784 Author: Mike Kaganski <[email protected]> AuthorDate: Sun Jun 8 12:53:08 2025 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sun Jun 8 14:10:43 2025 +0200 Reduce noise for "duplicating" type ids Type ids may legitimately repeat, so no need to warn when the types are actually the same. I assume, that for actual error (e.g., shape ids duplicating), the objects will be different. Change-Id: I96bffeda584e80e81b9ef856cd438f2213d0e824 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186260 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx index d9aa7d9aab6b..c099c7211502 100644 --- a/oox/source/vml/vmlshapecontainer.cxx +++ b/oox/source/vml/vmlshapecontainer.cxx @@ -41,7 +41,8 @@ void lclMapShapesById( RefMap< OUString, ShapeType >& orMap, const RefVector< Sh OSL_ENSURE( !rShapeId.isEmpty(), "lclMapShapesById - missing shape identifier" ); if( !rShapeId.isEmpty() ) { - OSL_ENSURE( orMap.find( rShapeId ) == orMap.end(), "lclMapShapesById - shape identifier already used " ); + OSL_ENSURE(orMap.find(rShapeId) == orMap.end() || orMap[rShapeId] == elem, + "lclMapShapesById - shape identifier already used"); orMap[ rShapeId ] = elem; } }
