diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-21 15:02:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-10-25 11:33:35 +0000 |
| commit | 1af159c20c7e3b4b27251cf5736d64c217ce7565 (patch) | |
| tree | d83df77c29ecd22e6d6d625d931d1fefee767019 /chart2 | |
| parent | bc5c51e547e8ea971f90003657509848cc358724 (diff) | |
Avoid crash with empty Chart document
In a fresh Writer document, "Insert - Object - OLE Object... - Create new -
LibreOffice 5.3 Chart - OK", then left-clicking into the empty Chart are, caused
an unhandled (or rather, handled by desktop's FatalError) RuntimeException since
749a0845500d69f99bf1901bab82361f67b5e4f6 "don't show area and line panel in pie
chart Chart selection, tdf#94320".
(cherry picked from commit 8b5f8c26f007c8e67bc46b1b09340cae660d0b8b plus
c5feb9ad79c9c830ca824e29277ff41c5cc24e7d "Minor improvement of previous commit")
Change-Id: I7ff53a84e4b06b20409d09e6010bac80e5a7c4b2
Reviewed-on: https://gerrit.libreoffice.org/30137
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/ChartController.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 3992def14f98..048be2341da9 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -284,6 +284,9 @@ css::uno::Reference<css::chart2::XChartType> getChartType( const css::uno::Reference<css::chart2::XChartDocument>& xChartDoc) { Reference <chart2::XDiagram > xDiagram = xChartDoc->getFirstDiagram(); + if (!xDiagram.is()) { + return css::uno::Reference<css::chart2::XChartType>(); + } Reference< chart2::XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY_THROW ); |