svx/source/sidebar/area/AreaPropertyPanel.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 939941d63493a38bb10c72ebf7084b636458459a Author: Markus Mohrhard <[email protected]> Date: Tue Jul 21 19:01:26 2015 +0200 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 <[email protected]> Tested-by: Michael Stahl <[email protected]> diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index 766ba52..05f1af9 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 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
