diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-23 21:01:00 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2015-07-26 00:26:58 +0200 |
| commit | dbeba7e2aa2effee5f73382573b6523d70e0f4d2 (patch) | |
| tree | 2ad47874f5be8e6ac4f1aae99765040d3d980778 | |
| parent | b3a52304593328b8950602535ef03d026ee27bf0 (diff) | |
we should not disable items because they are set twice
Change-Id: I73130922a773df353db509b0ea62d0013a1df292
| -rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 3b94efcc4aa4..9db2ad51b96d 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -473,7 +473,7 @@ void AreaPropertyPanelBase::DataChanged( void AreaPropertyPanelBase::ImpUpdateTransparencies() { - if(mpTransparanceItem.get() && mpFloatTransparenceItem.get()) + if(mpTransparanceItem.get() || mpFloatTransparenceItem.get()) { bool bZeroValue(false); @@ -601,7 +601,7 @@ void AreaPropertyPanelBase::updateFillTransparence(bool bDisabled, bool bDefault } else if(bDefault) { - if(pItem && (!mpTransparanceItem || *pItem != *mpTransparanceItem)) + if(pItem) { mpTransparanceItem.reset(static_cast<SfxUInt16Item*>(pItem->Clone())); } @@ -629,7 +629,7 @@ void AreaPropertyPanelBase::updateFillFloatTransparence(bool bDisabled, bool bDe if(bDefault) { - if(pItem && (!mpFloatTransparenceItem || *pItem != *mpFloatTransparenceItem)) + if(pItem) { mpFloatTransparenceItem.reset(static_cast<XFillFloatTransparenceItem*>(pItem->Clone())); } |