svx/source/unodraw/unoshape.cxx | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 76a2cb7385f578c1596b3228d016647f00723721
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jun 8 12:13:03 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Jun 8 15:47:04 2025 +0200
Report property name for in the warning, for easier debugging
Change-Id: I3863475f46bac78ebc85792bd47cd23906f39784
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186259
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index d89f822a2cbf..5aad40042f12 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1870,8 +1870,9 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet const &
aSet, const SfxItemProperty
&& !(pMap->nWID == XATTR_FILLBITMAP &&
pMap->nMemberId == MID_BITMAP
&& aAny.getValueType() ==
cppu::UnoType<css::awt::XBitmap>::get()),
"svx",
- "SvxShape::GetAnyForItem() Return value has wrong
Type, "
- << pMap->aType << " != " <<
aAny.getValueType());
+ "SvxShape::GetAnyForItem() Return value for
property "
+ << pMap->aName << " has wrong Type, " <<
pMap->aType
+ << " != " << aAny.getValueType());
}
}
commit 8976d3b4fbbedefa3be53b81688417f01369ac68
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jun 8 12:07:19 2025 +0500
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Jun 8 15:46:52 2025 +0200
Reduce SAL_WARN noise for FillBitmapURL
See commit 3341986547b69bcb4c38e4ccb2f0853a3a569bb5 (tdf#93998 toolkit:
restore support for setting dialog background from shape, 2019-08-26),
which restored getting value for URL properties, passing XBitmap there.
Change-Id: Idd8f939f441c7245fc9c4bc457d268b8778b1256
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186258
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 8df801737f28..d89f822a2cbf 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1866,7 +1866,9 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet const &
aSet, const SfxItemProperty
else
{
SAL_WARN_IF(!pMap->aType.isAssignableFrom(aAny.getValueType())
- && aAny.getValueType() !=
cppu::UnoType<void>::get(),
+ && aAny.getValueType() !=
cppu::UnoType<void>::get()
+ && !(pMap->nWID == XATTR_FILLBITMAP &&
pMap->nMemberId == MID_BITMAP
+ && aAny.getValueType() ==
cppu::UnoType<css::awt::XBitmap>::get()),
"svx",
"SvxShape::GetAnyForItem() Return value has wrong
Type, "
<< pMap->aType << " != " <<
aAny.getValueType());
