From fcfb42808464ea909ace4a892803c2e8e9e3bd1d Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Thu, 10 Oct 2013 02:55:47 +0200
Subject: we only support 2D Bubble Charts anyway

Change-Id: I3e1ac100c3c217e194f2b58c2dadcec370560d51
---
 chart2/source/view/charttypes/BubbleChart.cxx | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'chart2')

diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index fd6306d58586..1db4d838431e 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -52,6 +52,9 @@ BubbleChart::BubbleChart( const uno::Reference<XChartType>& xChartTypeModel
         , m_fMaxLogicBubbleSize( 0.0 )
         , m_fBubbleSizeFactorToScreen( 1.0 )
 {
+    // We only support 2 dimensional bubble charts
+    assert(nDimensionCount == 2);
+
     if( !m_pMainPosHelper )
         m_pMainPosHelper = new PlottingPositionHelper();
     PlotterBase::m_pPosHelper = m_pMainPosHelper;
@@ -253,9 +256,6 @@ void BubbleChart::createShapes()
                         pPosHelper = m_pMainPosHelper;
                     PlotterBase::m_pPosHelper = pPosHelper;
 
-                    if(m_nDimension==3)
-                        fLogicZ = nZ+0.5;
-
                     //collect data point information (logic coordinates, style ):
                     double fLogicX = pSeries->getXValue(nIndex);
                     double fLogicY = pSeries->getYValue(nIndex);
@@ -311,18 +311,15 @@ void BubbleChart::createShapes()
 
                         //create data point
                         drawing::Direction3D aSymbolSize = transformToScreenBubbleSize( fBubbleSize );
-                        if(m_nDimension!=3)
-                        {
-                            uno::Reference<drawing::XShape> xShape;
-                            xShape = m_pShapeFactory->createCircle2D( xPointGroupShape_Shapes
-                                                                      , aScenePosition, aSymbolSize );
+                        uno::Reference<drawing::XShape> xShape;
+                        xShape = m_pShapeFactory->createCircle2D( xPointGroupShape_Shapes
+                                , aScenePosition, aSymbolSize );
 
-                            this->setMappedProperties( xShape
-                                                       , pSeries->getPropertiesOfPoint( nIndex )
-                                                       , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() );
+                        this->setMappedProperties( xShape
+                                , pSeries->getPropertiesOfPoint( nIndex )
+                                , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() );
 
-                            m_pShapeFactory->setShapeName( xShape, "MarkHandles" );
-                        }
+                        m_pShapeFactory->setShapeName( xShape, "MarkHandles" );
 
                         //create data point label
                         if( (**aSeriesIter).getDataPointLabelIfLabel(nIndex) )
-- 
cgit v1.2.3