diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2019-03-14 23:01:33 +0900 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-16 07:17:45 +0100 |
| commit | 97b78d77ebaf6ba676d777454c6c957a87324f12 (patch) | |
| tree | be79ec368d8fbec37b27ffcacc866f7aef4ba25e /filter | |
| parent | 45968141934ac4ea10ad7fe4c2b074152aa2e635 (diff) | |
filter: Replace needless std::deque with simpler std::vector
Change-Id: I95ffde095909b925531a9bb1a3f0d394ba8d5c80
Reviewed-on: https://gerrit.libreoffice.org/69267
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/config/cache/cacheitem.hxx | 1 | ||||
| -rw-r--r-- | filter/source/graphicfilter/idxf/dxf2mtf.cxx | 6 | ||||
| -rw-r--r-- | filter/source/graphicfilter/idxf/dxfentrd.cxx | 2 | ||||
| -rw-r--r-- | filter/source/graphicfilter/idxf/dxfentrd.hxx | 3 |
4 files changed, 5 insertions, 7 deletions
diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index 2b205b7f1b24..7934251fd6ce 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX -#include <deque> #include <unordered_map> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.cxx b/filter/source/graphicfilter/idxf/dxf2mtf.cxx index d4335024c26d..d7e6b61fd7a8 100644 --- a/filter/source/graphicfilter/idxf/dxf2mtf.cxx +++ b/filter/source/graphicfilter/idxf/dxf2mtf.cxx @@ -572,7 +572,7 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity & rE, const DXFTransf tools::PolyPolygon aPolyPoly; for ( j = 0; j < rE.nBoundaryPathCount; j++ ) { - std::deque< Point > aPtAry; + std::vector< Point > aPtAry; const DXFBoundaryPathData& rPathData = rE.pBoundaryPathData[ j ]; if ( rPathData.bIsPolyLine ) { @@ -585,9 +585,9 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity & rE, const DXFTransf } else { - for ( std::deque<DXFEdgeType*>::size_type i = 0; i < rPathData.aEdges.size(); i++ ) + for ( auto& rEdge : rPathData.aEdges ) { - const DXFEdgeType* pEdge = rPathData.aEdges[ i ].get(); + const DXFEdgeType* pEdge = rEdge.get(); switch( pEdge->nEdgeType ) { case 1 : diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx b/filter/source/graphicfilter/idxf/dxfentrd.cxx index a830ce0c8fee..a35cea0fb240 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.cxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx @@ -634,7 +634,7 @@ bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader & rDGR ) } } else if ( !aEdges.empty() ) - aEdges[ aEdges.size() - 1 ]->EvaluateGroup( rDGR ); + aEdges.back()->EvaluateGroup( rDGR ); else bExecutingGroupCode = false; } diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx index 3f6c4e46fa2e..8c56ba6317c1 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx @@ -23,7 +23,6 @@ #include "dxfgrprd.hxx" #include "dxfvec.hxx" -#include <deque> #include <memory> #include <vector> @@ -413,7 +412,7 @@ public: sal_Int32 nPointIndex; std::vector<DXFVector> aP; - std::deque<std::unique_ptr<DXFEdgeType>> aEdges; + std::vector<std::unique_ptr<DXFEdgeType>> aEdges; DXFBoundaryPathData(); ~DXFBoundaryPathData(); |