diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-03 08:54:47 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-03 08:50:50 +0000 |
commit | 83721f4365d234b62f9e3517345c8d3fda19f2c6 (patch) | |
tree | af77c202dbdf0b969559441c724020e5d7a9da92 /chart2/source/tools/DiagramHelper.cxx | |
parent | 9007cc7bcaa8bc1b38c54f167349f71373f02dec (diff) |
makeAny->Any in basctl..chart2
Change-Id: Ief1cdffbfc59ab4e35ac945d020772ff84c50d61
Reviewed-on: https://gerrit.libreoffice.org/33867
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/tools/DiagramHelper.cxx')
-rw-r--r-- | chart2/source/tools/DiagramHelper.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index ac19d718f1f9..54e1b52ecf93 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -177,7 +177,7 @@ void DiagramHelper::setVertical( else if( bVertical && nDimIndex == 0 ) fNewAngleDegree = 90.0; - xTitleProps->setPropertyValue("TextRotation", uno::makeAny(fNewAngleDegree)); + xTitleProps->setPropertyValue("TextRotation", uno::Any(fNewAngleDegree)); } } } @@ -248,7 +248,7 @@ void DiagramHelper::setStackMode( else if( eStackMode == StackMode_Z_STACKED ) eNewDirection = StackingDirection_Z_STACKING; - uno::Any aNewDirection( uno::makeAny(eNewDirection) ); + uno::Any aNewDirection( eNewDirection ); bool bPercent = false; if( eStackMode == StackMode_Y_STACKED_PERCENT ) @@ -593,7 +593,7 @@ bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis { try { - xProp->setPropertyValue( "AttachedAxisIndex", uno::makeAny( nNewAxisIndex ) ); + xProp->setPropertyValue( "AttachedAxisIndex", uno::Any( nNewAxisIndex ) ); bChanged = true; } catch( const uno::Exception & ex ) @@ -915,7 +915,7 @@ Reference< data::XLabeledDataSequence > { try { - xProp->setPropertyValue( "Role", uno::makeAny( OUString("categories") ) ); + xProp->setPropertyValue( "Role", uno::Any( OUString("categories") ) ); } catch( const uno::Exception & ex ) { @@ -1021,7 +1021,7 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c Any& rAny = rCat[0]; if( !(rAny>>=fTest) ) { - rAny = uno::makeAny(fNan); + rAny <<= fNan; } } } @@ -1058,7 +1058,7 @@ void lcl_switchToDateCategories( const Reference< XChartDocument >& xChartDoc, c Sequence<sal_Int32> aKeySeq = xNumberFormats->queryKeys( util::NumberFormat::DATE, rLocaleDataWrapper.getLanguageTag().getLocale(), bCreate ); if( aKeySeq.getLength() ) { - xAxisProps->setPropertyValue(CHART_UNONAME_NUMFMT, uno::makeAny(aKeySeq[0])); + xAxisProps->setPropertyValue(CHART_UNONAME_NUMFMT, uno::Any(aKeySeq[0])); } } } @@ -1557,7 +1557,7 @@ void DiagramHelper::setGeometry3D( aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt ) { DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( - *aIt, "Geometry3D", uno::makeAny( nNewGeometry )); + *aIt, "Geometry3D", uno::Any( nNewGeometry )); } } @@ -1653,8 +1653,8 @@ bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel > if( (aNewPos.Secondary + aNewSize.Secondary) > 1.0 ) aNewPos.Secondary = 1.0 - aNewSize.Secondary; - xDiaProps->setPropertyValue( "RelativePosition", uno::makeAny(aNewPos) ); - xDiaProps->setPropertyValue( "RelativeSize", uno::makeAny(aNewSize) ); + xDiaProps->setPropertyValue( "RelativePosition", uno::Any(aNewPos) ); + xDiaProps->setPropertyValue( "RelativeSize", uno::Any(aNewSize) ); bChanged = (aOldPos.Anchor!=aNewPos.Anchor) || (aOldPos.Primary!=aNewPos.Primary) || |