summaryrefslogtreecommitdiff
path: root/oox/source/vml
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-11 16:41:56 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-09-12 08:03:01 +0200
commitbaa5f32c21185025b64c01fc589c69961528b0c5 (patch)
tree74cac2c06c169986ca89c446fd69c745305bcc82 /oox/source/vml
parent7e2a6709d9511f983f9981258c38ccc125bcd3fe (diff)
clang-tidy modernize-use-emplace in oox
Change-Id: I9ea063b7f6c63ae1ad039859efeebb292d44c6e2 Reviewed-on: https://gerrit.libreoffice.org/42172 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source/vml')
-rw-r--r--oox/source/vml/vmlformatting.cxx46
-rw-r--r--oox/source/vml/vmlshape.cxx28
-rw-r--r--oox/source/vml/vmlshapecontext.cxx2
-rw-r--r--oox/source/vml/vmltextbox.cxx2
4 files changed, 39 insertions, 39 deletions
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index e2b4583ff7a2..86443dd5c298 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -305,8 +305,8 @@ void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& r
LINE_REL, LINE_ABS, CLOSE, END, UNSUPPORTED };
VML_State state = START;
- rPointLists.push_back( ::std::vector< Point>() );
- rFlagLists.push_back( ::std::vector< PolygonFlags >() );
+ rPointLists.emplace_back( );
+ rFlagLists.emplace_back( );
for ( sal_Int32 i = 0; i < rPath.getLength(); i++ )
{
@@ -340,10 +340,10 @@ void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& r
case MOVE_REL: // 2* params -> param count reset
if ( rPointLists.size() > 0 && rPointLists.back().size() > 0 )
{
- rPointLists.push_back( ::std::vector< Point >() );
- rFlagLists.push_back( ::std::vector< PolygonFlags >() );
+ rPointLists.emplace_back( );
+ rFlagLists.emplace_back( );
}
- rPointLists.back().push_back( Point( aCoordList[ 0 ], aCoordList[ 1 ] ) );
+ rPointLists.back().emplace_back( aCoordList[ 0 ], aCoordList[ 1 ] );
rFlagLists.back().push_back( PolygonFlags_NORMAL );
aCurrentPoint = rPointLists.back().back();
nParamCount = 2;
@@ -352,21 +352,21 @@ void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& r
case MOVE_ABS: // 2 params -> no param count reset
if ( rPointLists.size() > 0 && rPointLists.back().size() > 0 )
{
- rPointLists.push_back( ::std::vector< Point >() );
- rFlagLists.push_back( ::std::vector< PolygonFlags >() );
+ rPointLists.emplace_back( );
+ rFlagLists.emplace_back( );
}
- rPointLists.back().push_back( Point( (aCoordList[ 0 ]), (aCoordList.size() > 1 ? aCoordList[ 1 ] : 0) ) );
+ rPointLists.back().emplace_back( (aCoordList[ 0 ]), (aCoordList.size() > 1 ? aCoordList[ 1 ] : 0) );
rFlagLists.back().push_back( PolygonFlags_NORMAL );
aCurrentPoint = rPointLists.back().back();
break;
case BEZIER_REL: // 6* params -> param count reset
- rPointLists.back().push_back( Point( aCurrentPoint.X + aCoordList[ 0 ],
- aCurrentPoint.Y + aCoordList[ 1 ] ) );
- rPointLists.back().push_back( Point( aCurrentPoint.X + aCoordList[ 2 ],
- aCurrentPoint.Y + aCoordList[ 3 ] ) );
- rPointLists.back().push_back( Point( aCurrentPoint.X + aCoordList[ 4 ],
- aCurrentPoint.Y + aCoordList[ 5 ] ) );
+ rPointLists.back().emplace_back( aCurrentPoint.X + aCoordList[ 0 ],
+ aCurrentPoint.Y + aCoordList[ 1 ] );
+ rPointLists.back().emplace_back( aCurrentPoint.X + aCoordList[ 2 ],
+ aCurrentPoint.Y + aCoordList[ 3 ] );
+ rPointLists.back().emplace_back( aCurrentPoint.X + aCoordList[ 4 ],
+ aCurrentPoint.Y + aCoordList[ 5 ] );
rFlagLists.back().push_back( PolygonFlags_CONTROL );
rFlagLists.back().push_back( PolygonFlags_CONTROL );
rFlagLists.back().push_back( PolygonFlags_NORMAL );
@@ -375,9 +375,9 @@ void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& r
break;
case BEZIER_ABS: // 6* params -> param count reset
- rPointLists.back().push_back( Point( aCoordList[ 0 ], aCoordList[ 1 ] ) );
- rPointLists.back().push_back( Point( aCoordList[ 2 ], aCoordList[ 3 ] ) );
- rPointLists.back().push_back( Point( aCoordList[ 4 ], aCoordList[ 5 ] ) );
+ rPointLists.back().emplace_back( aCoordList[ 0 ], aCoordList[ 1 ] );
+ rPointLists.back().emplace_back( aCoordList[ 2 ], aCoordList[ 3 ] );
+ rPointLists.back().emplace_back( aCoordList[ 4 ], aCoordList[ 5 ] );
rFlagLists.back().push_back( PolygonFlags_CONTROL );
rFlagLists.back().push_back( PolygonFlags_CONTROL );
rFlagLists.back().push_back( PolygonFlags_NORMAL );
@@ -386,15 +386,15 @@ void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& r
break;
case LINE_REL: // 2* params -> param count reset
- rPointLists.back().push_back( Point( aCurrentPoint.X + aCoordList[ 0 ],
- aCurrentPoint.Y + aCoordList[ 1 ] ) );
+ rPointLists.back().emplace_back( aCurrentPoint.X + aCoordList[ 0 ],
+ aCurrentPoint.Y + aCoordList[ 1 ] );
rFlagLists.back().push_back( PolygonFlags_NORMAL );
aCurrentPoint = rPointLists.back().back();
nParamCount = 2;
break;
case LINE_ABS: // 2* params -> param count reset
- rPointLists.back().push_back( Point( aCoordList[ 0 ], (aCoordList.size() > 1 ? aCoordList[ 1 ] : 0) ) );
+ rPointLists.back().emplace_back( aCoordList[ 0 ], (aCoordList.size() > 1 ? aCoordList[ 1 ] : 0) );
rFlagLists.back().push_back( PolygonFlags_NORMAL );
aCurrentPoint = rPointLists.back().back();
nParamCount = 2;
@@ -411,8 +411,8 @@ void ConversionHelper::decodeVmlPath( ::std::vector< ::std::vector< Point > >& r
break;
case END: // 0 param
- rPointLists.push_back( ::std::vector< Point >() );
- rFlagLists.push_back( ::std::vector< PolygonFlags >() );
+ rPointLists.emplace_back( );
+ rFlagLists.emplace_back( );
break;
case START:
@@ -559,7 +559,7 @@ void lclGetDmlLineDash( OptValue< sal_Int32 >& oroPresetDash, LineProperties::Da
aValues.push_back( rDashStyle.getToken( 0, ' ', nIndex ).toInt32() );
size_t nPairs = aValues.size() / 2; // ignore last value if size is odd
for( size_t nPairIdx = 0; nPairIdx < nPairs; ++nPairIdx )
- orCustomDash.push_back( LineProperties::DashStop( aValues[ 2 * nPairIdx ], aValues[ 2 * nPairIdx + 1 ] ) );
+ orCustomDash.emplace_back( aValues[ 2 * nPairIdx ], aValues[ 2 * nPairIdx + 1 ] );
}
}
}
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index d6a14caf16b5..420b92f595cc 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -1019,25 +1019,25 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes
// Curve defined by to, from, control1 and control2 attributes
if ( maShapeModel.maVmlPath.isEmpty() )
{
- aCoordLists.push_back( ::std::vector< awt::Point >() );
- aFlagLists.push_back( ::std::vector< PolygonFlags >() );
+ aCoordLists.emplace_back( );
+ aFlagLists.emplace_back( );
// Start point
- aCoordLists[ 0 ].push_back(
- awt::Point(ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maFrom.getToken( 0, ',', nIndex ), 0, true, true ),
- ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maFrom.getToken( 0, ',', nIndex ), 0, false, true ) ) );
+ aCoordLists[ 0 ].emplace_back(
+ ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maFrom.getToken( 0, ',', nIndex ), 0, true, true ),
+ ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maFrom.getToken( 0, ',', nIndex ), 0, false, true ) );
// Control point 1
- aCoordLists[ 0 ].push_back(
- awt::Point( ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl1.getToken( 0, ',', nIndex ), 0, true, true ),
- ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl1.getToken( 0, ',', nIndex ), 0, false, true ) ) );
+ aCoordLists[ 0 ].emplace_back(
+ ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl1.getToken( 0, ',', nIndex ), 0, true, true ),
+ ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl1.getToken( 0, ',', nIndex ), 0, false, true ) );
// Control point 2
- aCoordLists[ 0 ].push_back(
- awt::Point( ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl2.getToken( 0, ',', nIndex ), 0, true, true ),
- ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl2.getToken( 0, ',', nIndex ), 0, false, true ) ) );
+ aCoordLists[ 0 ].emplace_back(
+ ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl2.getToken( 0, ',', nIndex ), 0, true, true ),
+ ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maControl2.getToken( 0, ',', nIndex ), 0, false, true ) );
// End point
- aCoordLists[ 0 ].push_back(
- awt::Point( ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maTo.getToken( 0, ',', nIndex ), 0, true, true ),
- ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maTo.getToken( 0, ',', nIndex ), 0, false, true ) ) );
+ aCoordLists[ 0 ].emplace_back(
+ ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maTo.getToken( 0, ',', nIndex ), 0, true, true ),
+ ConversionHelper::decodeMeasureToHmm( rGraphicHelper, maShapeModel.maTo.getToken( 0, ',', nIndex ), 0, false, true ) );
// First and last points are normals, points 2 and 4 are controls
aFlagLists[ 0 ].resize( aCoordLists[ 0 ].size(), PolygonFlags_CONTROL );
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 4ddd8c5d8e0a..84185d40ecfd 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -501,7 +501,7 @@ void ShapeContext::setPoints( const OUString& rPoints )
{
sal_Int32 nX = rPoints.getToken( 0, ',', nIndex ).toInt32();
sal_Int32 nY = rPoints.getToken( 0, ',', nIndex ).toInt32();
- mrShapeModel.maPoints.push_back( awt::Point( nX, nY ) );
+ mrShapeModel.maPoints.emplace_back( nX, nY );
}
}
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index cfa07b0546db..810b7fd7cc46 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -57,7 +57,7 @@ TextBox::TextBox(ShapeTypeModel& rTypeModel)
void TextBox::appendPortion( const TextParagraphModel& rParagraph, const TextFontModel& rFont, const OUString& rText )
{
- maPortions.push_back( TextPortionModel( rParagraph, rFont, rText ) );
+ maPortions.emplace_back( rParagraph, rFont, rText );
}
const TextFontModel* TextBox::getFirstFont() const