diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-21 19:01:26 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-02-10 21:38:33 +0100 |
| commit | 33e77ccd730278fd04d14be4f49b62eba1242d23 (patch) | |
| tree | f7102a1f1c7e75194cf485ea1c27ff5896edcd9f /svx | |
| parent | baa0de864b3252e3aa912437d69f99a07899d6ca (diff) | |
avoid crash with color listbox for now
(cherry picked from commit 5ee0e6ab93ad791f5e79506efafd16cb7364ffb1)
Change-Id: I36ac6513546961ec8d8d1e9437a8ef88574acbf4
Reviewed-on: https://gerrit.libreoffice.org/22121
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 939941d63493a38bb10c72ebf7084b636458459a)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 766ba52f0821..05f1af9d100b 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -236,7 +236,7 @@ IMPL_LINK(AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox) mpLbFillAttr->Hide(); mpToolBoxColor->Show(); const OUString aTmpStr; - const Color aColor = mpColorItem->GetColorValue(); + const Color aColor = mpColorItem ? mpColorItem->GetColorValue() : COL_AUTO; const XFillColorItem aXFillColorItem( aTmpStr, aColor ); // #i122676# change FillStyle and Color in one call |