summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-10-21 17:10:25 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-10-21 17:10:25 +0200
commit3a0c25d65f7c034eace5dd0aee7d36e24277bfa7 (patch)
tree25d58d1cfc84990dbf65cd14f2cc076f15740031 /chart2
parentd1b3a33d995ff28fd3fd05c66f4358f522edc126 (diff)
Only call getChartType when the return value is actually used
Change-Id: I687ef0ce7013bce08caa25e1e6035507b814e20a
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/main/ChartController.cxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index ce70a165c3af..c79a917ba285 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -311,8 +311,6 @@ OUString ChartController::GetContextName()
return OUString("Chart");
ObjectType eObjectID = ObjectIdentifier::getObjectType(aCID);
-
- css::uno::Reference<css::chart2::XChartType> xChartType = getChartType(css::uno::Reference<css::chart2::XChartDocument>(getModel(), uno::UNO_QUERY));
switch (eObjectID)
{
case OBJECTTYPE_DATA_SERIES:
@@ -327,9 +325,12 @@ OUString ChartController::GetContextName()
case OBJECTTYPE_GRID:
return OUString("Grid");
case OBJECTTYPE_DIAGRAM:
- if (xChartType.is() && xChartType->getChartType() == "com.sun.star.chart2.PieChartType")
- return OUString("ChartElements");
- break;
+ {
+ css::uno::Reference<css::chart2::XChartType> xChartType = getChartType(css::uno::Reference<css::chart2::XChartDocument>(getModel(), uno::UNO_QUERY));
+ if (xChartType.is() && xChartType->getChartType() == "com.sun.star.chart2.PieChartType")
+ return OUString("ChartElements");
+ break;
+ }
case OBJECTTYPE_DATA_CURVE:
case OBJECTTYPE_DATA_AVERAGE_LINE:
return OUString("Trendline");