mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cppcheck reduce scope of var in oox/...shapes.cxx

Browse Source
This commit is contained in:
Pierre-André Jacquod
2011-10-03 14:25:27 +02:00
parent 1fc34c75a8
commit cbc1c6f082
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
oox/source/export/shapes.cxx
View File

@@ -525,7 +525,6 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
DBG(printf("custom shape type: %s ==> %s\n", USS( sShapeType ), sPresetShape)); DBG(printf("custom shape type: %s ==> %s\n", USS( sShapeType ), sPresetShape));
Sequence< PropertyValue > aGeometrySeq; Sequence< PropertyValue > aGeometrySeq;
sal_Int32 nAdjustmentValuesIndex = -1; sal_Int32 nAdjustmentValuesIndex = -1;
sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
if( GETA( CustomShapeGeometry ) ) { if( GETA( CustomShapeGeometry ) ) {
DBG(printf("got custom shape geometry\n")); DBG(printf("got custom shape geometry\n"));
@@ -564,7 +563,11 @@ ShapeExport& ShapeExport::WriteCustomShape( Reference< XShape > xShape )
pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND ); pFS->startElementNS( mnXmlNamespace, XML_spPr, FSEND );
WriteShapeTransformation( xShape, XML_a ); WriteShapeTransformation( xShape, XML_a );
if( nAdjustmentValuesIndex != -1 ) if( nAdjustmentValuesIndex != -1 )
WritePresetShape( sPresetShape, eShapeType, bPredefinedHandlesUsed, nAdjustmentsWhichNeedsToBeConverted, aGeometrySeq[ nAdjustmentValuesIndex ] ); {
sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0;
WritePresetShape( sPresetShape, eShapeType, bPredefinedHandlesUsed,
nAdjustmentsWhichNeedsToBeConverted, aGeometrySeq[ nAdjustmentValuesIndex ] );
}
else else
WritePresetShape( sPresetShape ); WritePresetShape( sPresetShape );
if( rXPropSet.is() ) if( rXPropSet.is() )