cui/source/tabpages/tparea.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 4bf2b6b2e6641c82e2b714e394482f1a1620b436
Author: Oliver Specht <oliver.spe...@cib.de>
Date: Fri Mar 18 16:14:14 2016 +0100
tdf#98405: apply color value when switching from 'none' to 'color'
Change-Id: I8e04160774dd7555cc872f1df65b310c8b8f8485
Reviewed-on: https://gerrit.libreoffice.org/23360
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.spe...@cib.de>
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 6dac434..a85632c 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -1494,7 +1494,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
bool isMissingHatching(false);
bool isMissingGradient(false);
bool isMissingBitmap(false);
- drawing::FillStyle eXFS;
+ drawing::FillStyle eXFS = drawing::FillStyle_NONE;
if( rAttrs->GetItemState( XATTR_FILLSTYLE ) != SfxItemState::DONTCARE )
{
eXFS = (drawing::FillStyle) ( static_cast<const XFillStyleItem&>(
rAttrs->
@@ -1796,7 +1796,8 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
ClickBitmapHdl_Impl();
m_pTypeLB->SaveValue();
- m_pLbColor->SaveValue();
+ if(eXFS == drawing::FillStyle_SOLID)
+ m_pLbColor->SaveValue();
if (!isMissingGradient)
m_pLbGradient->SaveValue();
if (!isMissingHatching)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
