diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-07-08 14:15:12 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-07-11 13:44:01 +0200 |
| commit | a3f0fa79f2ec8ed6fd8c66d1a95e4ababdbc9c0c (patch) | |
| tree | f9815024f5fc2ad8aed791ca44d432ad51165444 /sd | |
| parent | 7734fb9a6fe851291a6664ed84ebf422c1c2273e (diff) | |
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>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/drviewsj.cxx | 3 |
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)); } |