[Libreoffice-commits] .: 2 commits - sc/source

[Markus Mohrhard]

 sc/source/core/data/colorscale.cxx        |    4 ++--
 sc/source/filter/oox/condformatbuffer.cxx |    1 +
 sc/source/filter/oox/extlstcontext.cxx    |    2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit aaf0b2faab845c624e568d6e1acbc501f5f355cb
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Mon May 21 13:50:32 2012 +0200

    this needs to be the upper limit
    
    Change-Id: I4b6f826f8f87b2c4a4bb73d9b6246505d2632b23

diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 3361d72..8306107 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -654,10 +654,10 @@ double ScDataBarFormat::getMax(double nMin, double nMax) 
const
 
     if(mpFormatData->mpUpperLimit->GetPercent())
     {
-        return nMin + (nMax-nMin)/100*mpFormatData->mpLowerLimit->GetValue();
+        return nMin + (nMax-nMin)/100*mpFormatData->mpUpperLimit->GetValue();
     }
 
-    return mpFormatData->mpLowerLimit->GetValue();
+    return mpFormatData->mpUpperLimit->GetValue();
 }
 
 ScDataBarInfo* ScDataBarFormat::GetDataBarInfo(const ScAddress& rAddr) const
commit e8d4b5b6c39d2d0abcd9e814b9fe9ce8c3e2150f
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date:   Mon May 21 11:11:19 2012 +0200

    better import for excel 2007 data bar files
    
    Change-Id: I0d32a82aa4829ae635967f24293b2f32a71a4cbe

diff --git a/sc/source/filter/oox/condformatbuffer.cxx 
b/sc/source/filter/oox/condformatbuffer.cxx
index 8792546..05681b8 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -264,6 +264,7 @@ DataBarRule::DataBarRule( const CondFormat& rFormat ):
     mrCondFormat( rFormat ),
     mpFormat(new ScDataBarFormatData)
 {
+    mpFormat->meAxisPosition = databar::NONE;
 }
 
 void DataBarRule::importColor( const AttributeList& rAttribs )
diff --git a/sc/source/filter/oox/extlstcontext.cxx 
b/sc/source/filter/oox/extlstcontext.cxx
index d8c2d1f..3f6991e 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -31,6 +31,8 @@
 #include <oox/core/contexthandler.hxx>
 #include "colorscale.hxx"
 
+#include <iostream>
+
 using ::oox::core::ContextHandlerRef;
 
 namespace oox {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits