mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avoid crashes on broken charts, related tdf#98690

Browse Source 
Change-Id: If81f963babc15fc549d9daa904fd9836ea02ecef
This commit is contained in:
Markus Mohrhard 2016-10-09 00:57:13 +02:00
parent e2f6c7f0d0
commit c3cc9429d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chart2/source/controller/main/ChartController.cxx
View File

@ -309,7 +309,7 @@ OUString ChartController::GetContextName()
ObjectType eObjectID = ObjectIdentifier::getObjectType(aCID); ObjectType eObjectID = ObjectIdentifier::getObjectType(aCID);
css::uno::Reference<css::chart2::XChartType> xChartType = getChartType(css::uno::Reference<css::chart2::XChartDocument>(getModel(), uno::UNO_QUERY_THROW)); css::uno::Reference<css::chart2::XChartType> xChartType = getChartType(css::uno::Reference<css::chart2::XChartDocument>(getModel(), uno::UNO_QUERY));
switch (eObjectID) switch (eObjectID)
{ {
case OBJECTTYPE_DATA_SERIES: case OBJECTTYPE_DATA_SERIES:
@ -324,7 +324,7 @@ OUString ChartController::GetContextName()
case OBJECTTYPE_GRID: case OBJECTTYPE_GRID:
return OUString("Grid"); return OUString("Grid");
case OBJECTTYPE_DIAGRAM: case OBJECTTYPE_DIAGRAM:
if (xChartType->getChartType() == "com.sun.star.chart2.PieChartType") if (xChartType.is() && xChartType->getChartType() == "com.sun.star.chart2.PieChartType")
return OUString("ChartElements"); return OUString("ChartElements");
break; break;
case OBJECTTYPE_DATA_CURVE: case OBJECTTYPE_DATA_CURVE: