Kaydet (Commit) e80c8630 authored tarafından Katarina Behrens's avatar Katarina Behrens

So much for confusing variable with even more confusing name

which, at the end of the day, isn't needed at all

Change-Id: I5ce0f7aa8a9476dfa96aa955abb819af3eedfdd5
üst ce705ac5
...@@ -219,11 +219,10 @@ private: ...@@ -219,11 +219,10 @@ private:
struct ExCfRuleModel struct ExCfRuleModel
{ {
ExCfRuleModel() : mbGradient( false ), mbNegativeBarColorSameAsPositive( true ), mnAxisColor( API_RGB_TRANSPARENT ), mnNegativeColor( API_RGB_TRANSPARENT ), mbIsLower( true ) {} ExCfRuleModel() : mbGradient( false ), mnAxisColor( API_RGB_TRANSPARENT ), mnNegativeColor( API_RGB_TRANSPARENT ), mbIsLower( true ) {}
// DataBar // DataBar
bool mbGradient; bool mbGradient;
OUString maAxisPosition; OUString maAxisPosition;
bool mbNegativeBarColorSameAsPositive;
// AxisColor // AxisColor
sal_Int32 mnAxisColor; sal_Int32 mnAxisColor;
// NegativeFillColor // NegativeFillColor
......
...@@ -1114,7 +1114,6 @@ void ExtCfRule::finalizeImport() ...@@ -1114,7 +1114,6 @@ void ExtCfRule::finalizeImport()
else else
pDataBar->meAxisPosition = databar::AUTOMATIC; pDataBar->meAxisPosition = databar::AUTOMATIC;
pDataBar->mbGradient = maModel.mbGradient; pDataBar->mbGradient = maModel.mbGradient;
pDataBar->mbNeg = !maModel.mbNegativeBarColorSameAsPositive;
break; break;
} }
case AXISCOLOR: case AXISCOLOR:
...@@ -1127,6 +1126,7 @@ void ExtCfRule::finalizeImport() ...@@ -1127,6 +1126,7 @@ void ExtCfRule::finalizeImport()
{ {
ScDataBarFormatData* pDataBar = mpTarget; ScDataBarFormatData* pDataBar = mpTarget;
pDataBar->mpNegativeColor.reset( new ::Color( RgbToRgbComponents(maModel.mnNegativeColor) ) ); pDataBar->mpNegativeColor.reset( new ::Color( RgbToRgbComponents(maModel.mnNegativeColor) ) );
pDataBar->mbNeg = true;
break; break;
} }
case CFVO: case CFVO:
...@@ -1171,7 +1171,6 @@ void ExtCfRule::importNegativeFillColor( const AttributeList& rAttribs ) ...@@ -1171,7 +1171,6 @@ void ExtCfRule::importNegativeFillColor( const AttributeList& rAttribs )
{ {
mnRuleType = NEGATIVEFILLCOLOR; mnRuleType = NEGATIVEFILLCOLOR;
maModel.mnNegativeColor = rAttribs.getIntegerHex( XML_rgb, API_RGB_TRANSPARENT ); maModel.mnNegativeColor = rAttribs.getIntegerHex( XML_rgb, API_RGB_TRANSPARENT );
maModel.mbNegativeBarColorSameAsPositive = false;
} }
void ExtCfRule::importAxisColor( const AttributeList& rAttribs ) void ExtCfRule::importAxisColor( const AttributeList& rAttribs )
......
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