diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-08-10 21:58:27 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-08-16 10:15:15 +0200 |
| commit | d16276bb5e717a4c4e61117694b9acb6bf25d96f (patch) | |
| tree | fce0f6437e28e91a24f07a8e3d5a64cbaa594615 /svx | |
| parent | eaf7e188e1f695e4d165838b4b40414601d28591 (diff) | |
tdf#143769 don't crash on null XFillColorItem
use same solution as:
commit 5ee0e6ab93ad791f5e79506efafd16cb7364ffb1
Author: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Tue Jul 21 19:01:26 2015 +0200
avoid crash with color listbox for now
Change-Id: I36ac6513546961ec8d8d1e9437a8ef88574acbf4
Change-Id: I46c55461e5867431a6e9c838b5ef462f9581eb28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120248
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 788a8fe1c1a1..e327be070b16 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -700,10 +700,11 @@ IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillTypeHdl, weld::ComboBox&, void) { mpLbFillAttr->hide(); mpToolBoxColor->show(); - const ::Color aColor = mpColorItem->GetColorValue(); - const XFillColorItem aXFillColorItem( "", aColor ); if (pSh) { + const ::Color aColor = mpColorItem ? mpColorItem->GetColorValue() : COL_AUTO; + const XFillColorItem aXFillColorItem( "", aColor ); + // #i122676# change FillStyle and Color in one call pSh->GetDispatcher()->ExecuteList( SID_ATTR_FILL_COLOR, SfxCallMode::RECORD, |