chart2/inc/ChartModel.hxx | 3 +++ chart2/source/controller/main/ChartController_Tools.cxx | 6 +++--- chart2/source/model/main/ChartModel.cxx | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-)
New commits: commit 83a0e11957864554bb43ec207701339c0d7e0398 Author: Xisco Fauli <[email protected]> AuthorDate: Mon Jan 12 11:28:55 2026 +0100 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Wed Jan 14 23:41:30 2026 +0100 crashreporting: fix crash in impl_createReferenceSizeProvider() Seen in https://crashreport.libreoffice.org/stats/crash_details/deb8f144-001b-4f79-9a7b-c0e8dd7d8c55 Most likely after commit 76d296f7600bddf0b52fe2bd5522594551f10218 Author: Noel Grandin <[email protected]> Date: Thu Apr 10 20:02:01 2025 +0200 fold ChartModelHelper functions into ChartModel Change-Id: I959b1210254e741ac9dca492f2e70d86e86f3929 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197083 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> (cherry picked from commit 76ef93a709bde90518b3809f35926aa284082ded) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197130 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 762807c73b72..d9b5a82d617f 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -60,6 +60,9 @@ typedef struct _xmlTextWriter* xmlTextWriterPtr; +#define DEFAULT_PAGE_WIDTH 16000 +#define DEFAULT_PAGE_HEIGHT 9000 + namespace com::sun::star::awt { class XRequestCallback; } namespace com::sun::star::chart2::data { class XDataProvider; } namespace com::sun::star::document { class XFilter; } diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index abb4c338f461..6bd186be692c 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -212,9 +212,9 @@ css::uno::Reference<css::beans::XPropertySet> getSelectedGraphObject(ChartContro ReferenceSizeProvider ChartController::impl_createReferenceSizeProvider() { - awt::Size aPageSize( getChartModel()->getPageSize() ); - - return ReferenceSizeProvider(aPageSize, getChartModel()); + rtl::Reference<::chart::ChartModel> xChartModel = getChartModel(); + awt::Size aPageSize = xChartModel.is() ? xChartModel->getPageSize() : awt::Size(DEFAULT_PAGE_WIDTH, DEFAULT_PAGE_HEIGHT ); + return ReferenceSizeProvider(aPageSize, xChartModel); } void ChartController::impl_adaptDataSeriesAutoResize() diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 1ff6b842189d..d0e19082dd49 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1404,7 +1404,7 @@ rtl::Reference< ChartType > ChartModel::getChartTypeOfSeries( const rtl::Referen // static awt::Size ChartModel::getDefaultPageSize() { - return awt::Size( 16000, 9000 ); + return awt::Size( DEFAULT_PAGE_WIDTH, DEFAULT_PAGE_HEIGHT ); } awt::Size ChartModel::getPageSize()
