chart2/source/controller/main/ChartController.cxx | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 1af159c20c7e3b4b27251cf5736d64c217ce7565
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Fri Oct 21 15:02:59 2016 +0200
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 <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index 3992def..048be23 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
