diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-21 19:01:26 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-04 16:31:02 +0000 |
| commit | 939941d63493a38bb10c72ebf7084b636458459a (patch) | |
| tree | 579820cffc5c36804f9fb40fc57f2b28a97dd7d6 | |
| parent | 004f24fcb12bc9f43e6c812ef2751b777dc44031 (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>
| -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 |