diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-03-18 16:14:14 +0100 |
|---|---|---|
| committer | Oliver Specht <oliver.specht@cib.de> | 2016-03-21 08:29:47 +0000 |
| commit | 4bf2b6b2e6641c82e2b714e394482f1a1620b436 (patch) | |
| tree | f2477bfc8af20f34c737e895f497b3a0b76edcc7 /cui | |
| parent | sw: MAN_ANZ_PLCF -> MAN_PLCF_COUNT (diff) | |
| download | core-4bf2b6b2e6641c82e2b714e394482f1a1620b436.tar.gz core-4bf2b6b2e6641c82e2b714e394482f1a1620b436.zip | |
tdf#98405: apply color value when switching from 'none' to 'color'
Change-Id: I8e04160774dd7555cc872f1df65b310c8b8f8485
Reviewed-on: https://gerrit.libreoffice.org/23360
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/tparea.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 6dac43413d9e..a85632c341fa 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) |