sw/source/core/unocore/unocrsrhelper.cxx | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit d08c7fecd6b38442ea7a4ac79315603cc7084208
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Apr 27 05:38:32 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Apr 27 05:35:43 2021 +0200
tdf#141924: SwFormatAutoFormat::GetStyleHandle may return nullptr
Change-Id: Id1b6fe687f5b328fa0743036a287bacfefe5e5fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114685
Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx
b/sw/source/core/unocore/unocrsrhelper.cxx
index 7536e49cce4c..32b449b97403 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -312,17 +312,19 @@ static uno::Any GetParaListAutoFormat(SwTextNode const&
rNode)
{
return uno::Any();
}
- SfxItemSet const& rSet(*pFormat->GetStyleHandle());
+ const auto pSet(pFormat->GetStyleHandle());
+ if (!pSet)
+ return {};
SfxItemPropertySet const&
rPropSet(*aSwMapProvider.GetPropertySet(PROPERTY_MAP_CHAR_AUTO_STYLE));
SfxItemPropertyMap const& rMap(rPropSet.getPropertyMap());
std::vector<beans::NamedValue> props;
// have to iterate the map, not the item set?
for (auto const pEntry : rMap.getPropertyEntries())
{
- if (rPropSet.getPropertyState(*pEntry, rSet) ==
PropertyState_DIRECT_VALUE)
+ if (rPropSet.getPropertyState(*pEntry, *pSet) ==
PropertyState_DIRECT_VALUE)
{
Any value;
- rPropSet.getPropertyValue(*pEntry, rSet, value);
+ rPropSet.getPropertyValue(*pEntry, *pSet, value);
props.emplace_back(pEntry->aName, value);
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
