Skip to content

C
core
Kaydet (Commit) 0c06f9c5 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Further fallout from git mis-merge? 

...in a80f74ad "Put SeriesPlotterContainer into
CreateShapeParam2D."

Change-Id: I9e2f700a1999070069ff87fc3030c00a045372c6
üst 9e0d79b0
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
chart2/source/view/main/ChartView.cxx
Dosyayı görüntüle @ 0c06f9c5
...@@ -360,11 +360,10 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( ...@@ -360,11 +360,10 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
xDiaProp->getPropertyValue( "IncludeHiddenCells" ) >>= bIncludeHiddenCells; xDiaProp->getPropertyValue( "IncludeHiddenCells" ) >>= bIncludeHiddenCells;
xDiaProp->getPropertyValue( "StartingAngle" ) >>= nStartingAngle; xDiaProp->getPropertyValue( "StartingAngle" ) >>= nStartingAngle;
if( m_pDrawModelWrapper.get() ) if (nDimensionCount == 3)
{ {
SolarMutexGuard aSolarGuard; xDiaProp->getPropertyValue( "3DRelativeHeight" ) >>= n3DRelativeHeight;
EndListening( m_pDrawModelWrapper->getSdrModel(), false /*bAllDups*/ ); }
m_pDrawModelWrapper.reset();
} }
catch( const uno::Exception & ex ) catch( const uno::Exception & ex )
{ {
...@@ -1106,10 +1105,11 @@ ChartView::~ChartView() ...@@ -1106,10 +1105,11 @@ ChartView::~ChartView()
if ( xComp.is() ) if ( xComp.is() )
xComp->dispose(); xComp->dispose();
if (nDimensionCount == 3) if( m_pDrawModelWrapper.get() )
{ {
xDiaProp->getPropertyValue( "3DRelativeHeight" ) >>= n3DRelativeHeight; SolarMutexGuard aSolarGuard;
} 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