Kaydet (Commit) 97b78d77 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Noel Grandin

filter: Replace needless std::deque with simpler std::vector

Change-Id: I95ffde095909b925531a9bb1a3f0d394ba8d5c80
Reviewed-on: https://gerrit.libreoffice.org/69267
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 45968141
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX #ifndef INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX
#define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX #define INCLUDED_FILTER_SOURCE_CONFIG_CACHE_CACHEITEM_HXX
#include <deque>
#include <unordered_map> #include <unordered_map>
#include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
......
...@@ -572,7 +572,7 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity & rE, const DXFTransf ...@@ -572,7 +572,7 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity & rE, const DXFTransf
tools::PolyPolygon aPolyPoly; tools::PolyPolygon aPolyPoly;
for ( j = 0; j < rE.nBoundaryPathCount; j++ ) for ( j = 0; j < rE.nBoundaryPathCount; j++ )
{ {
std::deque< Point > aPtAry; std::vector< Point > aPtAry;
const DXFBoundaryPathData& rPathData = rE.pBoundaryPathData[ j ]; const DXFBoundaryPathData& rPathData = rE.pBoundaryPathData[ j ];
if ( rPathData.bIsPolyLine ) if ( rPathData.bIsPolyLine )
{ {
...@@ -585,9 +585,9 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity & rE, const DXFTransf ...@@ -585,9 +585,9 @@ void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity & rE, const DXFTransf
} }
else 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 ) switch( pEdge->nEdgeType )
{ {
case 1 : case 1 :
......
...@@ -634,7 +634,7 @@ bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader & rDGR ) ...@@ -634,7 +634,7 @@ bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader & rDGR )
} }
} }
else if ( !aEdges.empty() ) else if ( !aEdges.empty() )
aEdges[ aEdges.size() - 1 ]->EvaluateGroup( rDGR ); aEdges.back()->EvaluateGroup( rDGR );
else else
bExecutingGroupCode = false; bExecutingGroupCode = false;
} }
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "dxfgrprd.hxx" #include "dxfgrprd.hxx"
#include "dxfvec.hxx" #include "dxfvec.hxx"
#include <deque>
#include <memory> #include <memory>
#include <vector> #include <vector>
...@@ -413,7 +412,7 @@ public: ...@@ -413,7 +412,7 @@ public:
sal_Int32 nPointIndex; sal_Int32 nPointIndex;
std::vector<DXFVector> aP; std::vector<DXFVector> aP;
std::deque<std::unique_ptr<DXFEdgeType>> aEdges; std::vector<std::unique_ptr<DXFEdgeType>> aEdges;
DXFBoundaryPathData(); DXFBoundaryPathData();
~DXFBoundaryPathData(); ~DXFBoundaryPathData();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment