From 9dfc5fe09a8561600175fba77b1533c8db3e9f8f Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@collabora.com>
Date: Thu, 9 Oct 2014 23:09:59 -0400
Subject: Fix git's wrong 3-way merge.

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

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index aeb16fa4c3cd..f5ef6101571e 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();
-- 
cgit