diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-02 09:36:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-02 10:53:07 +0200 |
| commit | 1b56843a77f0c86f483e96032b5b6ff2214968b0 (patch) | |
| tree | f65dd01a29527c877cc0a6057bd51b90dbdb2fb3 /filter/source/msfilter/escherex.cxx | |
| parent | c87da778e35214655c8cf825ea46cb720426c5d7 (diff) | |
loplugin:reducevarscope in filter
Change-Id: I665531de5b8a94c4646e2a85373a6f67a60f1c08
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103812
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter/source/msfilter/escherex.cxx')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 24dcabe0277e..f9f3f7197f21 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1484,10 +1484,8 @@ bool EscherPropertyContainer::CreateGraphicProperties(const uno::Reference<beans bool bCreateFillStyles = false; std::unique_ptr<GraphicAttr> pGraphicAttr; - OUString aGraphicUrl; uno::Reference<graphic::XGraphic> xGraphic; - drawing::BitmapMode eBitmapMode(drawing::BitmapMode_NO_REPEAT); uno::Any aAny; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, rXPropSet, rSource ) ) @@ -1500,6 +1498,8 @@ bool EscherPropertyContainer::CreateGraphicProperties(const uno::Reference<beans sal_Int16 nGreen(0); sal_Int16 nBlue(0); double fGamma(1.0); + drawing::BitmapMode eBitmapMode(drawing::BitmapMode_NO_REPEAT); + OUString aGraphicUrl; sal_uInt16 nAngle = 0; if ( rSource == "MetaFile" ) @@ -2194,7 +2194,6 @@ bool EscherPropertyContainer::CreateConnectorProperties( if ( rXShape.is() ) { - awt::Point aStartPoint, aEndPoint; uno::Reference<beans::XPropertySet> aXPropSet; uno::Reference<drawing::XShape> aShapeA, aShapeB; uno::Any aAny( rXShape->queryInterface( cppu::UnoType<beans::XPropertySet>::get())); @@ -2206,10 +2205,10 @@ bool EscherPropertyContainer::CreateConnectorProperties( aAny >>= eCt; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, "EdgeStartPoint" ) ) { - aStartPoint = *o3tl::doAccess<awt::Point>(aAny); + awt::Point aStartPoint = *o3tl::doAccess<awt::Point>(aAny); if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, "EdgeEndPoint" ) ) { - aEndPoint = *o3tl::doAccess<awt::Point>(aAny); + awt::Point aEndPoint = *o3tl::doAccess<awt::Point>(aAny); rShapeFlags = ShapeFlag::HaveAnchor | ShapeFlag::HaveShapeProperty | ShapeFlag::Connector; rGeoRect = awt::Rectangle( aStartPoint.X, aStartPoint.Y, |