diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-26 20:52:16 -0400 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-03-26 23:14:58 -0400 |
commit | f6f179c502506ecc6bdbd689e1cd0c1972a628c2 (patch) | |
tree | f5060483f8490999fb2c9ab3978db13e5a0f77ab /chart2/source/controller/dialogs/ChartTypeDialogController.cxx | |
parent | cea725111c239216324604c430e6084a828cf5f7 (diff) |
Pass the rounded edge property to the diagram object.
Change-Id: I71fa1bf82b879a1da69ca78d53bcf8072bdfa9ae
Diffstat (limited to 'chart2/source/controller/dialogs/ChartTypeDialogController.cxx')
-rw-r--r-- | chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 835de9e63929..4ade1fd7a118 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -60,7 +60,7 @@ ChartTypeParameter::ChartTypeParameter() , nGeometry3D(DataPointGeometry3D::CUBOID) , eThreeDLookScheme(ThreeDLookScheme_Realistic) , bSortByXValues(false) - , mbGLRoundedEdge(false) + , mbRoundedEdge(false) { } @@ -80,7 +80,7 @@ ChartTypeParameter::ChartTypeParameter( sal_Int32 SubTypeIndex, bool HasXAxisWit , nGeometry3D(DataPointGeometry3D::CUBOID) , eThreeDLookScheme(ThreeDLookScheme_Realistic) , bSortByXValues(false) - , mbGLRoundedEdge(false) + , mbRoundedEdge(false) { } ChartTypeParameter::~ChartTypeParameter() @@ -214,7 +214,7 @@ void ChartTypeDialogController::adjustParameterToMainType( ChartTypeParameter& r CurveStyle eCurveStyle = rParameter.eCurveStyle; sal_Int32 nGeometry3D = rParameter.nGeometry3D; bool bSortByXValues = rParameter.bSortByXValues; - bool bGLRoundedEdge = rParameter.mbGLRoundedEdge; + bool bRoundedEdge = rParameter.mbRoundedEdge; rParameter = (*aIter).second; @@ -225,7 +225,7 @@ void ChartTypeDialogController::adjustParameterToMainType( ChartTypeParameter& r rParameter.eCurveStyle = eCurveStyle; rParameter.nGeometry3D = nGeometry3D; rParameter.bSortByXValues = bSortByXValues; - rParameter.mbGLRoundedEdge = bGLRoundedEdge; + rParameter.mbRoundedEdge = bRoundedEdge; bFoundSomeMatch = true; break; @@ -338,11 +338,11 @@ bool ChartTypeDialogController::commitToModel( const ChartTypeParameter& rParame if( rParameter.b3DLook ) ThreeDHelper::setScheme( xDiagram, rParameter.eThreeDLookScheme ); - //SortByXValues + uno::Reference<beans::XPropertySet> xDiaProp(xDiagram, uno::UNO_QUERY); + if (xDiaProp.is()) { - uno::Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY ); - if( xDiaProp.is() ) - xDiaProp->setPropertyValue( "SortByXValues" , uno::makeAny( rParameter.bSortByXValues ) ); + xDiaProp->setPropertyValue("SortByXValues" , uno::makeAny(rParameter.bSortByXValues)); + xDiaProp->setPropertyValue("RoundedEdge", uno::makeAny(rParameter.mbRoundedEdge)); } } return false; |