Skip to content

C
core
Kaydet (Commit) 9dfc5fe0 authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

Fix git's wrong 3-way merge. 

Change-Id: I30520ff78f47bcfa487cea6f40904bf718610967
üst a80f74ad
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
chart2/source/view/main/ChartView.cxx
Dosyayı görüntüle @ 9dfc5fe0
...@@ -1106,11 +1106,10 @@ ChartView::~ChartView() ...@@ -1106,11 +1106,10 @@ ChartView::~ChartView()
if ( xComp.is() ) if ( xComp.is() )
xComp->dispose(); xComp->dispose();
if( m_pDrawModelWrapper.get() ) if (nDimensionCount == 3)
{ {
SolarMutexGuard aSolarGuard; xDiaProp->getPropertyValue( "3DRelativeHeight" ) >>= n3DRelativeHeight;
EndListening( m_pDrawModelWrapper->getSdrModel(), false /*bAllDups*/ ); }
m_pDrawModelWrapper.reset();
} }
m_xDrawPage = NULL; m_xDrawPage = NULL;
impl_deleteCoordinateSystems(); impl_deleteCoordinateSystems();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment