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

[xukai]

 chart2/source/view/charttypes/GL3DBarChart.cxx |   11 +++++++++--
 chart2/source/view/inc/GL3DBarChart.hxx        |    1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit bc1b8dd63e74c255a989ac51a92d7db0bba75bc3
Author: xukai <xukai at multicorewareinc.com>
Date:   Fri Sep 19 15:26:34 2014 +0800

    use environment AUTO_FLY to control if autofly
    
    Change-Id: Ie47dfdc5f3b07f6e1a6336fc235ac6ccd5d53cab
    Reviewed-on: https://gerrit.libreoffice.org/11540
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 9b44421..7eefac6 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -494,7 +494,8 @@ GL3DBarChart::GL3DBarChart(
     mnColorRate(0),
     mbBenchMarkMode(false),
     mnHistoryCounter(0),
-    mnBarsInRow(0)
+    mnBarsInRow(0),
+    mbAutoFly(false)
 {
     maFPSRenderStartTime.Seconds = maFPSRenderStartTime.Nanosec = 0;
     maFPSRenderEndTime.Seconds = maFPSRenderEndTime.Nanosec = 0;
@@ -518,6 +519,11 @@ GL3DBarChart::GL3DBarChart(
                 mpRenderer->SetScroll();
             }
         }
+        char *aAutoFly = getenv("AUTO_FLY");
+        if (aAutoFly)
+        {
+            mbAutoFly = atoi(aAutoFly);
+        }
         maTimer.SetTimeout(DATA_UPDATE_TIME);
         maTimer.SetTimeoutHdl(LINK(this, GL3DBarChart, updateTimer));
         maTimer.Start();
@@ -676,7 +682,8 @@ void GL3DBarChart::create3DShapes(const boost::ptr_vector<VDataSeries>& rDataSer
                 }
                 else
                 {
-                    processAutoFly(nId, nColor);
+                    if(mbAutoFly)
+                        processAutoFly(nId, nColor);
                 }
             }
             maShapes.push_back(new opengl3D::Bar(mpRenderer.get(), aBarPosition, nColor, nId));
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx
index bebca58..4ae2385 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2/source/view/inc/GL3DBarChart.hxx
@@ -192,6 +192,7 @@ private:
     bool mbBenchMarkMode;
     sal_uInt32 mnHistoryCounter;
     sal_uInt32 mnBarsInRow;
+    bool mbAutoFly;
 
 
     // these form a pair: