summaryrefslogtreecommitdiff
path: root/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-03-27 22:04:28 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-03-29 00:47:20 -0400
commitef15c946998af91a88896d29903cb997a5e78ede (patch)
treebb9c418097901050c8ee16441a376f7bdaab748d /chart2/source/controller/dialogs/ChartTypeDialogController.cxx
parent91e1497abc4fd2817b56eb1e77ddd8fd2691a199 (diff)
Trying to move this RoundedEdge property from Diagram to GL3DBarChartType.
Then things stop working. Go figure. Change-Id: I38893b20104537a64d279063c7b7dd708efb0d2f
Diffstat (limited to 'chart2/source/controller/dialogs/ChartTypeDialogController.cxx')
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.cxx18
1 files changed, 16 insertions, 2 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index 031c46806a5d..c31ffc88ee79 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -162,9 +162,15 @@ ChartTypeParameter ChartTypeDialogController::getChartTypeParameterForService(
}
catch( uno::Exception& ex )
{
- //not all templates need to support CGeometry3D
+ //not all templates need to support Geometry3D
ex.Context.is();//to have debug information without compilation warnings
}
+
+ try
+ {
+ xTemplateProps->getPropertyValue(CHART_UNONAME_ROUNDED_EDGE) >>= aRet.mbRoundedEdge;
+ }
+ catch ( const uno::Exception& ) {}
}
return aRet;
}
@@ -303,6 +309,15 @@ uno::Reference< XChartTypeTemplate > ChartTypeDialogController::getCurrentTempla
//not all templates need to support Geometry3D
ex.Context.is();//to have debug information without compilation warnings
}
+
+ try
+ {
+ xTemplateProps->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, uno::makeAny(rParameter.mbRoundedEdge));
+ }
+ catch ( const uno::Exception& )
+ {
+ }
+
try
{
this->setTemplateProperties( xTemplateProps );
@@ -343,7 +358,6 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame
if (xDiaProp.is())
{
xDiaProp->setPropertyValue(CHART_UNONAME_SORT_BY_XVALUES, uno::makeAny(rParameter.bSortByXValues));
- xDiaProp->setPropertyValue(CHART_UNONAME_ROUNDED_EDGE, uno::makeAny(rParameter.mbRoundedEdge));
}
}
return false;