[Libreoffice-commits] core.git: sc/source

[Katarina Behrens]

 sc/source/filter/inc/condformatbuffer.hxx |    3 +--
 sc/source/filter/oox/condformatbuffer.cxx |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit e80c86301be02004e96a936a17ea99acf8a9db96
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Mon Apr 13 13:45:58 2015 +0200

    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

diff --git a/sc/source/filter/inc/condformatbuffer.hxx b/sc/source/filter/inc/condformatbuffer.hxx
index e0539e1..c3154ea 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -219,11 +219,10 @@ private:
 
 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
     bool mbGradient;
     OUString maAxisPosition;
-    bool mbNegativeBarColorSameAsPositive;
     // AxisColor
     sal_Int32 mnAxisColor;
     // NegativeFillColor
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index 9fa0b14..2c04142 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -1114,7 +1114,6 @@ void ExtCfRule::finalizeImport()
             else
                 pDataBar->meAxisPosition = databar::AUTOMATIC;
             pDataBar->mbGradient = maModel.mbGradient;
-            pDataBar->mbNeg = !maModel.mbNegativeBarColorSameAsPositive;
             break;
         }
         case AXISCOLOR:
@@ -1127,6 +1126,7 @@ void ExtCfRule::finalizeImport()
         {
             ScDataBarFormatData* pDataBar = mpTarget;
             pDataBar->mpNegativeColor.reset( new ::Color( RgbToRgbComponents(maModel.mnNegativeColor) ) );
+            pDataBar->mbNeg = true;
             break;
         }
         case CFVO:
@@ -1171,7 +1171,6 @@ void ExtCfRule::importNegativeFillColor( const AttributeList& rAttribs )
 {
      mnRuleType = NEGATIVEFILLCOLOR;
      maModel.mnNegativeColor = rAttribs.getIntegerHex( XML_rgb, API_RGB_TRANSPARENT );
-     maModel.mbNegativeBarColorSameAsPositive = false;
 }
 
 void ExtCfRule::importAxisColor( const AttributeList& rAttribs )