summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-07-08 14:15:12 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-07-12 10:03:09 +0200
commite7a086fcd10031a15d1bfda32c306834ba8a7526 (patch)
treeb9f880f12bbc024640eb0f9765ceb0b942445805
parenttdf#143146 copy functor and arg before calling function that can delete this (diff)
downloadcore-e7a086fcd10031a15d1bfda32c306834ba8a7526.tar.gz
core-e7a086fcd10031a15d1bfda32c306834ba8a7526.zip
Resolves: tdf#143153 null-deref on grouping fit-to-frame obj with another
Change-Id: I134d15ac980aa34ff274abd03966cd7948390542 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118628 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit f2290187dcd59f159c560a47629b5d3897be1864) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118630 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sd/source/ui/view/drviewsj.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 47cbb175ddf4..9eebdbc57c29 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -271,7 +271,8 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
if( SfxItemState::DEFAULT == rSet.GetItemState( SID_OUTLINE_TEXT_AUTOFIT ) )
{
const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- const bool bSet = pObj->GetMergedItemSet().GetItem<SdrTextFitToSizeTypeItem>(SDRATTR_TEXT_FITTOSIZE)->GetValue() != drawing::TextFitToSizeType_NONE;
+ const SdrTextFitToSizeTypeItem* pItem = pObj->GetMergedItemSet().GetItem<SdrTextFitToSizeTypeItem>(SDRATTR_TEXT_FITTOSIZE);
+ const bool bSet = pItem && pItem->GetValue() != drawing::TextFitToSizeType_NONE;
rSet.Put(SfxBoolItem(SID_OUTLINE_TEXT_AUTOFIT, bSet));
}