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

[Stephan Bergmann]

 chart2/source/view/main/ChartView.cxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 0c06f9c5bb002c0aac1811ea973787f6f94d4758
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 10 08:35:58 2014 +0200

    Further fallout from git mis-merge?
    
    ...in a80f74add22c303327dd3203d9be5eeb901a73a4 "Put SeriesPlotterContainer into
    CreateShapeParam2D."
    
    Change-Id: I9e2f700a1999070069ff87fc3030c00a045372c6

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index f5ef610..9d3b54c 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -360,11 +360,10 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
         xDiaProp->getPropertyValue( "IncludeHiddenCells" ) >>= bIncludeHiddenCells;
         xDiaProp->getPropertyValue( "StartingAngle" ) >>= nStartingAngle;
 
-    if( m_pDrawModelWrapper.get() )
-    {
-        SolarMutexGuard aSolarGuard;
-        EndListening( m_pDrawModelWrapper->getSdrModel(), false /*bAllDups*/ );
-        m_pDrawModelWrapper.reset();
+        if (nDimensionCount == 3)
+        {
+            xDiaProp->getPropertyValue( "3DRelativeHeight" ) >>= n3DRelativeHeight;
+        }
     }
     catch( const uno::Exception & ex )
     {
@@ -1106,10 +1105,11 @@ ChartView::~ChartView()
     if ( xComp.is() )
         xComp->dispose();
 
-        if (nDimensionCount == 3)
-        {
-             xDiaProp->getPropertyValue( "3DRelativeHeight" ) >>= n3DRelativeHeight;
-        }
+    if( m_pDrawModelWrapper.get() )
+    {
+        SolarMutexGuard aSolarGuard;
+        EndListening( m_pDrawModelWrapper->getSdrModel(), false /*bAllDups*/ );
+        m_pDrawModelWrapper.reset();
     }
     m_xDrawPage = NULL;
     impl_deleteCoordinateSystems();