chart2/source/controller/dialogs/tp_ChartType.cxx | 3 ++- chart2/source/tools/ReferenceSizeProvider.cxx | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)
New commits: commit e2e78a45c8fa119467660239c170454543e836d9 Author: Noel Grandin <[email protected]> AuthorDate: Thu May 11 11:30:46 2023 +0200 Commit: Xisco Fauli <[email protected]> CommitDate: Mon May 15 10:03:43 2023 +0200 tdf#155231 CRASH: with embedded OLE chart regressions from commits like commit 70595c0291e4cc137158c77f6136025b10ce6728 Author: Noel Grandin <[email protected]> Date: Thu Mar 16 09:20:17 2023 +0200 move setDimension/getDimension inside chart2::Diagram Change-Id: I535d8e74d621821bde7d31894fe7f0350e91c941 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151664 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151735 diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 3a8859820c92..779d3f7bfeaf 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -253,7 +253,8 @@ void ChartTypeTabPage::selectMainType() rtl::Reference< Diagram > xDiagram = ChartModelHelper::findDiagram(m_xChartModel); try { - xDiagram->getPropertyValue(CHART_UNONAME_SORT_BY_XVALUES) >>= aParameter.bSortByXValues; + if (xDiagram) + xDiagram->getPropertyValue(CHART_UNONAME_SORT_BY_XVALUES) >>= aParameter.bSortByXValues; } catch ( const uno::Exception& ) { diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx index 40edf87d2f30..960642c0b367 100644 --- a/chart2/source/tools/ReferenceSizeProvider.cxx +++ b/chart2/source/tools/ReferenceSizeProvider.cxx @@ -92,6 +92,8 @@ void ReferenceSizeProvider::setValuesAtTitle( void ReferenceSizeProvider::setValuesAtAllDataSeries() { rtl::Reference< Diagram > xDiagram( ChartModelHelper::findDiagram( m_xChartDoc )); + if (!xDiagram) + return; // DataSeries/Points std::vector< rtl::Reference< DataSeries > > aSeries =
