diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-24 11:22:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-28 10:17:47 +0000 |
| commit | 198c41c4fe8be4ce8a6ddab43ae0c5f17a4889ac (patch) | |
| tree | 041d55126e9770b81f68fadfaaa69e82313786b3 /oox/source/shape | |
| parent | d3981b3e8c021ee03a2ca7103a73e56cca18df81 (diff) | |
new loplugin unoany
Change-Id: I5d6c4a67cb2a09e7cd5bd620c6b262d188701b89
Reviewed-on: https://gerrit.libreoffice.org/34714
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source/shape')
| -rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 8 | ||||
| -rw-r--r-- | oox/source/shape/WpsContext.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 9af13d245f0c..a84171949e1f 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -452,13 +452,13 @@ ShapeContextHandler::getShape() sal_Int32 length = aValue.getLength(); aValue.realloc(length+1); - diagramDrawing[0] = uno::makeAny( mxFilterBase->importFragment( aFragmentPath ) ); - diagramDrawing[1] = uno::makeAny( pShapePtr->resolveRelationshipsOfTypeFromOfficeDoc( - *mxFilterBase, aFragmentPath, "image" ) ); + diagramDrawing[0] <<= mxFilterBase->importFragment( aFragmentPath ); + diagramDrawing[1] <<= pShapePtr->resolveRelationshipsOfTypeFromOfficeDoc( + *mxFilterBase, aFragmentPath, "image" ); beans::PropertyValue* pValue = aValue.getArray(); pValue[length].Name = "OOXDrawing"; - pValue[length].Value = uno::makeAny( diagramDrawing ); + pValue[length].Value <<= diagramDrawing; pShapePtr->setDiagramDoms( aValue ); diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index bfc2f5c4e43b..0ed5f9024ccc 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -107,7 +107,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken if (static_cast<long>(basegfx::rad2deg(fRotate)) != NormAngle360(static_cast<long>(nRotation) * 100) / 100) { comphelper::SequenceAsHashMap aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry")); - aCustomShapeGeometry["TextPreRotateAngle"] = uno::makeAny(nRotation); + aCustomShapeGeometry["TextPreRotateAngle"] <<= nRotation; xPropertySet->setPropertyValue("CustomShapeGeometry", uno::makeAny(aCustomShapeGeometry.getAsConstPropertyValueList())); } } @@ -181,7 +181,7 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken oox::OptValue<OUString> presetShapeName = rAttribs.getString(XML_prst); const OUString& preset = presetShapeName.get(); comphelper::SequenceAsHashMap aCustomShapeGeometry(xPropertySet->getPropertyValue("CustomShapeGeometry")); - aCustomShapeGeometry["PresetTextWarp"] = uno::makeAny(preset); + aCustomShapeGeometry["PresetTextWarp"] <<= preset; xPropertySet->setPropertyValue("CustomShapeGeometry", uno::makeAny(aCustomShapeGeometry.getAsConstPropertyValueList())); } break; |