diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2022-01-02 14:51:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-01-03 07:46:26 +0100 |
| commit | 5f41e5741fa3abe59dd14a50e692d425eed472d5 (patch) | |
| tree | e71275672b68b2f4d6bff47ca0404e22a7fbdf6e /chart2/source/view/main | |
| parent | 2678e4467f2d7d193b93e4cdd1b96b12d3ff53f1 (diff) | |
use more SvxShape in chart2
Change-Id: I7fb23da1ad60d07ac8c3165f70dafefcfaf5ab8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127872
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/view/main')
| -rw-r--r-- | chart2/source/view/main/ShapeFactory.cxx | 7 | ||||
| -rw-r--r-- | chart2/source/view/main/VLegendSymbolFactory.cxx | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 24d58da73e26..45c63c425646 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -388,7 +388,7 @@ rtl::Reference<Svx3DExtrudeObject> } rtl::Reference<Svx3DExtrudeObject> xShape = impl_createCube( xTarget, rPosition, rSize, nRotateZAngleHundredthDegree, bRounded ); if( xSourceProp.is()) - PropertyMapper::setMappedProperties( xShape, xSourceProp, rPropertyNameMap ); + PropertyMapper::setMappedProperties( *xShape, xSourceProp, rPropertyNameMap ); return xShape; } @@ -1017,7 +1017,7 @@ rtl::Reference<Svx3DPolygonObject> if (xSourceProp) { - PropertyMapper::setMappedProperties(xShape, xSourceProp, rPropertyNameMap); + PropertyMapper::setMappedProperties(*xShape, xSourceProp, rPropertyNameMap); } } catch( const uno::Exception& ) @@ -2018,8 +2018,7 @@ rtl::Reference<SvxShapeRect> ShapeFactory::createRectangle( xShape->setPosition( rPosition ); xShape->setSize( rSize ); - uno::Reference< beans::XPropertySet > xPropSet( static_cast<cppu::OWeakObject*>(xShape.get()), uno::UNO_QUERY_THROW ); - PropertyMapper::setMultiProperties( rPropNames, rPropValues, xPropSet ); + PropertyMapper::setMultiProperties( rPropNames, rPropValues, *xShape ); return xShape; } diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index 91415f66d008..d70a5e09af1d 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -82,7 +82,7 @@ void lcl_setPropertiesToShape( getPropNamesAndValues( xProp, aPropNames, aPropValues, ePropertyType, aMaxSymbolExtent ); - ::chart::PropertyMapper::setMultiProperties( aPropNames, aPropValues, xShape ); + ::chart::PropertyMapper::setMultiProperties( aPropNames, aPropValues, *xShape ); } } // anonymous namespace |