[Libreoffice-commits] core.git: Branch 'private/moggi/chart-opengl-window-version2' - 2 commits - chart2/source sc/source

[Markus Mohrhard]

 chart2/source/view/charttypes/GL3DBarChart.cxx |    6 +++++-
 chart2/source/view/inc/3DChartObjects.hxx      |    2 +-
 chart2/source/view/main/3DChartObjects.cxx     |    3 ++-
 sc/source/ui/drawfunc/fuins2.cxx               |    2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 98aa0b2f0893e1fb02849e2b867c424bf2efc455
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed May 7 20:37:15 2014 +0200

    provide bar color for 3D OGL chart
    
    Change-Id: Ia41748cabba89a0257c62f66a280810adc56960e

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx
index e21a34b..12a5417 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -17,6 +17,8 @@
 #include "3DChartObjects.hxx"
 #include "GL3DRenderer.hxx"
 
+using namespace com::sun::star;
+
 namespace chart {
 
 GL3DBarChart::GL3DBarChart(const std::vector<VDataSeries*>& rDataSeries,
@@ -53,11 +55,13 @@ void GL3DBarChart::create3DShapes()
             float nXPos = nIndex * (nBarSizeX + nBarDistanceX);
             float nYPos = nSeriesIndex * (nBarSizeY + nBarDistanceY);
 
+            sal_Int32 nColor = COL_BLUE;
+
             glm::mat4 aBarPosition;
             aBarPosition = glm::scale(aBarPosition, nBarSizeX, nBarSizeY, nVal);
             aBarPosition = glm::translate(aBarPosition, nXPos, nYPos, nVal/2);
 
-            maShapes.push_back(new opengl3D::Bar(mpRenderer.get(), aBarPosition, nId++));
+            maShapes.push_back(new opengl3D::Bar(mpRenderer.get(), aBarPosition, nColor, nId++));
         }
 
         ++nSeriesIndex;
diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx
index e9490e3..666d097 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -37,7 +37,7 @@ protected:
 class Bar : public Renderable3DObject
 {
 public:
-    Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_uInt32 nId);
+    Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_Int32 nColor, sal_uInt32 nId);
 
     virtual void render() SAL_OVERRIDE;
 private:
diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx
index 86f9c63..c43b999 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -24,10 +24,11 @@ void Renderable3DObject::render()
     (void) mnUniqueId;
 }
 
-Bar::Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_uInt32 nId)
+Bar::Bar(OpenGL3DRenderer* pRenderer, const glm::mat4& rPosition, sal_Int32 aColor, sal_uInt32 nId)
     : Renderable3DObject(pRenderer, nId)
     , mbRoundedCorners(false)
     , maPos(rPosition)
+    , maColor(aColor)
 {
 }
 
commit 65109f43338f2ee7b5b295cd28123f04d51f96e3
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Wed May 7 20:35:42 2014 +0200

    fix crash when canceling the chart wizard
    
    Change-Id: Iebd9db279e9db22bc273509cf480737d7c7a1dd6

diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 873588d..0c941b2 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -724,7 +724,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
                         sal_Int16 nDialogRet = xDialog->execute();
                         if( nDialogRet == ui::dialogs::ExecutableDialogResults::CANCEL )
                         {
-                            delete pWindow;
+                            delete pChildWindow;
                             // leave OLE inplace mode and unmark
                             OSL_ASSERT( pViewShell );
                             OSL_ASSERT( pView );