oox/source/drawingml/textparagraphproperties.cxx | 3 ++- sd/source/core/stlsheet.cxx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
New commits: commit 754470f30f0cb8f7cd2bdda0156d9f94901c6187 Author: Noel Grandin <[email protected]> AuthorDate: Tue Nov 11 18:27:58 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Nov 12 08:38:05 2025 +0100 improve SAL_WARN message Change-Id: I582606c9c90b512a9227ef14f0430481503c61af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193816 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 9d1a75672f3b..db809a31c346 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -1182,7 +1182,8 @@ css::uno::Any SdStyleSheet::getPropertyValue_Impl(const OUString& PropertyName) } else { - SAL_WARN_IF(aAny.hasValue(), "sd", "SvxShape::GetAnyForItem() Returnvalue has wrong Type!"); + SAL_WARN_IF(aAny.hasValue(), "sd", "SvxShape::GetAnyForItem() Return value has wrong type, expected " + << pEntry->aType << " but got " << aAny.getValueType()); } } commit c46c402eb909de66242b83cb911fde45f08b0df0 Author: Noel Grandin <[email protected]> AuthorDate: Tue Nov 11 18:26:39 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Nov 12 08:37:57 2025 +0100 reduce log spam Change-Id: I507b6a465d2bb3c67def686f8214a56e512b6ce8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193815 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 820568e39050..8394e431e747 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -422,7 +422,8 @@ void TextParagraphProperties::pushToPropSet( const ::oox::core::XmlFilterBase* p if ( maBulletList.mnNumberingType.hasValue() ) { maBulletList.mnNumberingType >>= nNumberingType; - aPropSet.setProperty< sal_Int16 >( PROP_NumberingLevel, getLevel() ); + if (aPropSet.hasProperty(PROP_NumberingLevel)) + aPropSet.setProperty< sal_Int16 >( PROP_NumberingLevel, getLevel() ); } else if ( pMasterBuList && pMasterBuList->mnNumberingType.hasValue() ) pMasterBuList->mnNumberingType >>= nNumberingType;
