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

[Kohei Yoshida]

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

New commits:
commit 9dfc5fe09a8561600175fba77b1533c8db3e9f8f
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Thu Oct 9 23:09:59 2014 -0400

    Fix git's wrong 3-way merge.
    
    Change-Id: I30520ff78f47bcfa487cea6f40904bf718610967

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index aeb16fa..f5ef610 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1106,11 +1106,10 @@ ChartView::~ChartView()
     if ( xComp.is() )
         xComp->dispose();
 
-    if( m_pDrawModelWrapper.get() )
-    {
-        SolarMutexGuard aSolarGuard;
-        EndListening( m_pDrawModelWrapper->getSdrModel(), false /*bAllDups*/ );
-        m_pDrawModelWrapper.reset();
+        if (nDimensionCount == 3)
+        {
+             xDiaProp->getPropertyValue( "3DRelativeHeight" ) >>= n3DRelativeHeight;
+        }
     }
     m_xDrawPage = NULL;
     impl_deleteCoordinateSystems();