diff options
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_View3D.cxx | 7 | ||||
| -rw-r--r-- | chart2/source/model/template/StockChartTypeTemplate.cxx | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx index 8c7e97122f08..e4db6f6a2818 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.cxx +++ b/chart2/source/controller/dialogs/dlg_View3D.cxx @@ -80,11 +80,8 @@ void View3DDialog::dispose() short View3DDialog::Execute() { short nResult = TabDialog::Execute(); - if( nResult == RET_OK ) - { - if( m_pGeometry ) - m_pGeometry->commitPendingChanges(); - } + if( nResult == RET_OK && m_pGeometry ) + m_pGeometry->commitPendingChanges(); return nResult; } diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index 3a592071169f..1e452770fb4c 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -219,11 +219,8 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( bool bHasVolume = false; getFastPropertyValue( PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME ) >>= bHasVolume; - if( bHasVolume ) - { - if( nChartTypeIndex != 0 ) - nNewAxisIndex = 1; - } + if( bHasVolume && nChartTypeIndex != 0 ) + nNewAxisIndex = 1; Reference< beans::XPropertySet > xProp( xSeries, uno::UNO_QUERY ); if( xProp.is() ) |