Kaydet (Commit) c17ea618 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

fix some small regressions in no-chart area panel

Change-Id: I04239c0bcf78ee9029a2a17514d10d28c3b99d58
üst 9ba833f0
......@@ -97,13 +97,13 @@ public:
virtual void setFillStyleAndHatch(const XFillStyleItem* pStyleItem, const XFillHatchItem& aHatchItem) = 0;
virtual void setFillStyleAndBitmap(const XFillStyleItem* pStyleItem, const XFillBitmapItem& aHatchItem) = 0;
void updateFillTransparence(bool bDisabled, bool bDefault, const SfxUInt16Item* pItem);
void updateFillFloatTransparence(bool bDisabled, bool bDefault, const XFillFloatTransparenceItem* pItem);
void updateFillStyle(bool bDisabled, bool bDefault, const XFillStyleItem* pItem);
void updateFillGradient(bool bDisabled, bool bDefault, const XFillGradientItem* pItem);
void updateFillHatch(bool bDisabled, bool bDefault, const XFillHatchItem* pItem);
void updateFillColor(bool bDefault, const XFillColorItem* pItem);
void updateFillBitmap(bool BDisabled, bool bDefault, const XFillBitmapItem* pItem);
void updateFillTransparence(bool bDisabled, bool bDefaultOrSet, const SfxUInt16Item* pItem);
void updateFillFloatTransparence(bool bDisabled, bool bDefaultOrSet, const XFillFloatTransparenceItem* pItem);
void updateFillStyle(bool bDisabled, bool bDefaultOrSet, const XFillStyleItem* pItem);
void updateFillGradient(bool bDisabled, bool bDefaultOrSet, const XFillGradientItem* pItem);
void updateFillHatch(bool bDisabled, bool bDefaultOrSet, const XFillHatchItem* pItem);
void updateFillColor(bool bDefaultOrSet, const XFillColorItem* pItem);
void updateFillBitmap(bool BDisabled, bool bDefaultOrSet, const XFillBitmapItem* pItem);
protected:
sal_uInt16 meLastXFS;
......
......@@ -799,36 +799,37 @@ void AreaPropertyPanelBase::NotifyItemUpdate(
const bool /*bIsEnabled*/)
{
const bool bDisabled(SfxItemState::DISABLED == eState);
const bool bDefaultOrSet(SfxItemState::DEFAULT <= eState);
const bool bDefault(SfxItemState::DEFAULT == eState);
switch(nSID)
{
case SID_ATTR_FILL_TRANSPARENCE:
updateFillTransparence(bDisabled, bDefault,
updateFillTransparence(bDisabled, bDefaultOrSet,
static_cast<const SfxUInt16Item*>(pState));
break;
case SID_ATTR_FILL_FLOATTRANSPARENCE:
updateFillFloatTransparence(bDisabled, bDefault,
updateFillFloatTransparence(bDisabled, bDefaultOrSet,
static_cast<const XFillFloatTransparenceItem*>(pState));
break;
case SID_ATTR_FILL_STYLE:
updateFillStyle(bDisabled, bDefault,
updateFillStyle(bDisabled, bDefaultOrSet,
static_cast<const XFillStyleItem*>(pState));
break;
case SID_ATTR_FILL_COLOR:
updateFillColor(bDefault,
updateFillColor(bDefaultOrSet,
static_cast<const XFillColorItem*>(pState));
break;
case SID_ATTR_FILL_GRADIENT:
updateFillGradient(bDisabled, bDefault,
updateFillGradient(bDisabled, bDefaultOrSet,
static_cast<const XFillGradientItem*>(pState));
break;
case SID_ATTR_FILL_HATCH:
updateFillHatch(bDisabled, bDefault,
updateFillHatch(bDisabled, bDefaultOrSet,
static_cast<const XFillHatchItem*>(pState));
break;
case SID_ATTR_FILL_BITMAP:
updateFillBitmap(bDisabled, bDefault,
updateFillBitmap(bDisabled, bDefaultOrSet,
static_cast<const XFillBitmapItem*>(pState));
break;
case SID_GRADIENT_LIST:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment