From 429e4dc671f03e0c4d50e8f8aa055f4aaca761da Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 21 Oct 2016 18:00:03 +0200 Subject: Avoid further crash with empty Chart document following up on 8b5f8c26f007c8e67bc46b1b09340cae660d0b8b "Avoid crash with empty Chart document", when you then close the Writer doc (discarding the changes), it crashes in a chart::sidebar::ChartSidebarModifyListener::disposing call whose mpParent (that was a ChartElementsPanel) is already destroyed. The problem is that the ChartElementsPanel ctor creates an mxListener pointing to this, then calls Initialize, which calls xBroadcaster->addModifyListener(mxListener) and then, during updateData, throws a RuntimeException when xDiagram is null in getChartType, causing the ChartElementsPanel object to immediately be destroyed, but the listener still registered. This apparently needs fixing independently of the immediate problem. (The immediate problem is a regression introduced with d7748842e96536daeb0c638c6f8d01d99b9a3e08 "hide grid and axes options in chart elements if not supported, tdf#94297".) Change-Id: I2fe4f2a59600664f6210456c65e033f9453f4cc9 --- chart2/source/controller/sidebar/ChartElementsPanel.cxx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'chart2') diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index 11e99561bcee..c037feadd012 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -391,6 +391,9 @@ css::uno::Reference getChartType(const css::uno::Refere { css::uno::Reference xChartDoc(xModel, css::uno::UNO_QUERY_THROW); css::uno::Reference xDiagram = xChartDoc->getFirstDiagram(); + if (!xDiagram.is()) { + return css::uno::Reference(); + } css::uno::Reference xCooSysContainer( xDiagram, css::uno::UNO_QUERY_THROW ); -- cgit