summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2022-07-28 19:58:49 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2022-07-30 04:23:23 +0200
commit0e2882d3e226118f74d4c9095913861e31829b8e (patch)
treea3cd89b4134f59203d6c34ae03f6318c316d2f0a
parent0a3f3efd55e427ec622e875990b1591fd3df2bf9 (diff)
tdf#150187: Crash in Presentation Styles - Background objects - Modify
Regression from e85b482df3fa01e5a2b549df63db96cc49f1ca78 (use SfxItemSet::GetItemIfSet in cui) Change-Id: I74889f21f2bda248946269b0caf5ddc629002ae0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137580 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit baf433a2f77082b12e111bfd4d60ba372e339be1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137594 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--cui/source/tabpages/numpages.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 215e59b38a58..050e8c7c0ec8 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -418,6 +418,12 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet* rSet )
{
nNumItemId = rSet->GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
pItem = rSet->GetItemIfSet(nNumItemId, false);
+
+ if( !pItem )
+ {
+ pItem = & rSet->Get( nNumItemId );
+ }
+
}
pSaveNum.reset( new SvxNumRule(pItem->GetNumRule()) );