diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-28 13:43:50 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-29 09:38:51 +0200 |
commit | 80343351c9444bba7a5ac98f22fddbbecf5abb9f (patch) | |
tree | 4341e3ba5903482c45971bac14c74c2caee10045 /oox | |
parent | 37f9fdc11c4e95d6a34cb515a454503256a82c63 (diff) |
loplugin:constantparam (2)
Change-Id: I528f22876497f87159e3b9453362ebbfb55b7092
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/export/drawingml.cxx | 3 | ||||
-rw-r--r-- | oox/source/export/shapes.cxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index b42bdb67caad..2b74cb83ce85 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2568,7 +2568,7 @@ std::map< OString, std::vector<OString> > lcl_getAdjNames() return aRet; } -void DrawingML::WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, const PropertyValue& rProp ) +void DrawingML::WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool bPredefinedHandlesUsed, const PropertyValue& rProp ) { static std::map< OString, std::vector<OString> > aAdjMap = lcl_getAdjNames(); // If there are predefined adj names for this shape type, look them up now. @@ -2589,6 +2589,7 @@ void DrawingML::WritePresetShape( const char* pShape, MSO_SPT eShapeType, bool b ) { SAL_INFO("oox.shape", "adj seq len: " << aAdjustmentSeq.getLength()); + sal_Int32 nAdjustmentsWhichNeedsToBeConverted = 0; if ( bPredefinedHandlesUsed ) EscherPropertyContainer::LookForPolarHandles( eShapeType, nAdjustmentsWhichNeedsToBeConverted ); diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 37f5d38aa3fe..33266663d794 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1002,7 +1002,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const Reference< XShape >& xShape ) if( nAdjustmentValuesIndex != -1 ) { WritePresetShape( sPresetShape, eShapeType, bPredefinedHandlesUsed, - 0/*nAdjustmentsWhichNeedsToBeConverted*/, aGeometrySeq[ nAdjustmentValuesIndex ] ); + aGeometrySeq[ nAdjustmentValuesIndex ] ); } else WritePresetShape( sPresetShape ); |