diff options
| author | Andreas Heinisch <andreas.heinisch@yahoo.de> | 2021-05-16 11:02:32 +0200 |
|---|---|---|
| committer | Andreas Heinisch <andreas.heinisch@yahoo.de> | 2021-05-19 09:31:24 +0200 |
| commit | b238522ca121ca8f863fe4d3394ade088a65ad01 (patch) | |
| tree | 3e7e32fb6002b50698060985fc74d3f118464283 /chart2/source/controller/dialogs/tp_ChartType.cxx | |
| parent | Document that setting gb_CXX03FLAGS for clang-cl doesn't work (diff) | |
| download | core-b238522ca121ca8f863fe4d3394ade088a65ad01.tar.gz core-b238522ca121ca8f863fe4d3394ade088a65ad01.zip | |
tdf#124295 - Always select a 3D scheme in the chart wizard
Change-Id: Ic0a39b4cb6f7af6fbdd99fc93677a0c2d966234d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115671
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
Diffstat (limited to 'chart2/source/controller/dialogs/tp_ChartType.cxx')
| -rw-r--r-- | chart2/source/controller/dialogs/tp_ChartType.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index e209f508e3cc..19084e9e5180 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -178,7 +178,11 @@ void ChartTypeTabPage::stateChanged() //detect the new ThreeDLookScheme uno::Reference<XDiagram> xDiagram = ChartModelHelper::findDiagram(m_xChartModel); - aParameter.eThreeDLookScheme = ThreeDHelper::detectScheme(xDiagram); + // tdf#124295 - select always a 3D scheme + if (ThreeDLookScheme aThreeDLookScheme = ThreeDHelper::detectScheme(xDiagram); + aThreeDLookScheme != ThreeDLookScheme::ThreeDLookScheme_Unknown) + aParameter.eThreeDLookScheme = aThreeDLookScheme; + try { uno::Reference<beans::XPropertySet> xPropSet(xDiagram, uno::UNO_QUERY_THROW); @@ -240,8 +244,9 @@ void ChartTypeTabPage::selectMainType() commitToModel( aParameter ); //detect the new ThreeDLookScheme aParameter.eThreeDLookScheme = ThreeDHelper::detectScheme( ChartModelHelper::findDiagram( m_xChartModel ) ); - if(!aParameter.b3DLook && aParameter.eThreeDLookScheme!=ThreeDLookScheme_Realistic ) - aParameter.eThreeDLookScheme=ThreeDLookScheme_Realistic; + if (!aParameter.b3DLook + && aParameter.eThreeDLookScheme != ThreeDLookScheme::ThreeDLookScheme_Realistic) + aParameter.eThreeDLookScheme = ThreeDLookScheme::ThreeDLookScheme_Realistic; uno::Reference<XDiagram> xDiagram = ChartModelHelper::findDiagram(m_xChartModel); try @@ -320,8 +325,9 @@ void ChartTypeTabPage::initializePage() //set ThreeDLookScheme aParameter.eThreeDLookScheme = ThreeDHelper::detectScheme( xDiagram ); - if(!aParameter.b3DLook && aParameter.eThreeDLookScheme!=ThreeDLookScheme_Realistic ) - aParameter.eThreeDLookScheme=ThreeDLookScheme_Realistic; + if (!aParameter.b3DLook + && aParameter.eThreeDLookScheme != ThreeDLookScheme::ThreeDLookScheme_Realistic) + aParameter.eThreeDLookScheme = ThreeDLookScheme::ThreeDLookScheme_Realistic; try { |