diff options
| author | Katarina Behrens <bubli@bubli.org> | 2015-02-10 23:18:07 +0100 |
|---|---|---|
| committer | Katarina Behrens <bubli@bubli.org> | 2015-02-10 23:25:56 +0100 |
| commit | 6ee0bc42a944e3101eb4c73716ecc6acf12f77cb (patch) | |
| tree | fe9dae252a1b14a2b5cb941729bdeb1aff61b6f2 /sc | |
| parent | 317967af601797b3b1193db691330fcf6cb100e5 (diff) | |
ExtCfRule::maModel and CondFormatRule::mpDataBar are 2 distinct things
so do it right on 2nd attempt
Change-Id: I2c51943ec831591a47afc16599e2e7246407b31a
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/inc/condformatbuffer.hxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/oox/condformatbuffer.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx index f983f7e1f4c1..c8d8bfb222c3 100644 --- a/sc/source/filter/inc/condformatbuffer.hxx +++ b/sc/source/filter/inc/condformatbuffer.hxx @@ -219,7 +219,7 @@ private: struct ExCfRuleModel { - ExCfRuleModel() : mbGradient( false ), mbNegativeBarColorSameAsPositive( false ), mnAxisColor( API_RGB_TRANSPARENT ), mnNegativeColor( API_RGB_TRANSPARENT ), mbIsLower( true ) {} + ExCfRuleModel() : mbGradient( false ), mbNegativeBarColorSameAsPositive( true ), mnAxisColor( API_RGB_TRANSPARENT ), mnNegativeColor( API_RGB_TRANSPARENT ), mbIsLower( true ) {} // DataBar bool mbGradient; OUString maAxisPosition; diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index a984202a50cd..5d5f32b8cbf4 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -1112,6 +1112,7 @@ void ExtCfRule::finalizeImport() else pDataBar->meAxisPosition = databar::AUTOMATIC; pDataBar->mbGradient = maModel.mbGradient; + pDataBar->mbNeg = !maModel.mbNegativeBarColorSameAsPositive; break; } case AXISCOLOR: @@ -1168,7 +1169,7 @@ void ExtCfRule::importNegativeFillColor( const AttributeList& rAttribs ) { mnRuleType = NEGATIVEFILLCOLOR; maModel.mnNegativeColor = rAttribs.getIntegerHex( XML_rgb, API_RGB_TRANSPARENT ); - maModel.mbNeg = true; + maModel.mbNegativeBarColorSameAsPositive = false; } void ExtCfRule::importAxisColor( const AttributeList& rAttribs ) |