diff options
| author | Pierre-André Jacquod <pjacquod@alumni.ethz.ch> | 2011-10-03 14:25:27 +0200 |
|---|---|---|
| committer | Pierre-André Jacquod <pjacquod@alumni.ethz.ch> | 2011-10-07 15:57:55 +0200 |
| commit | cbc1c6f0824f95a8d271edfdf4a6fe522388042b (patch) | |
| tree | 2a5b4e27f4fe5390241e933f5f01d2f8a7f2543c | |
| parent | 1fc34c75a8a2356ed03c52ca839a7ad771c51ba1 (diff) | |
cppcheck reduce scope of var in oox/...shapes.cxx
| -rw-r--r-- | oox/source/export/shapes.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index be720432624c..edb8e2003d37 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -525,7 +525,6 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape ) DBG(printf("custom shape type: %s ==> %s\n", USS( sShapeType ), sPresetShape)); Sequence< PropertyValue > aGeometrySeq; sal_Int32 nAdjustmentValuesIndex = -1; - sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0; if( GETA( CustomShapeGeometry ) ) { DBG(printf("got custom shape geometry\n")); @@ -564,7 +563,11 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape ) pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND ); WriteShapeTransformation( xShape, XML_a ); if( nAdjustmentValuesIndex != -1 ) - WritePresetShape( sPresetShape, eShapeType, bPredefinedHandlesUsed, nAdjustmentsWhichNeedsToBeConverted, aGeometrySeq[ nAdjustmentValuesIndex ] ); + { + sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0; + WritePresetShape( sPresetShape, eShapeType, bPredefinedHandlesUsed, + nAdjustmentsWhichNeedsToBeConverted, aGeometrySeq[ nAdjustmentValuesIndex ] ); + } else WritePresetShape( sPresetShape ); if( rXPropSet.is() ) |