diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-26 14:44:17 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-10-26 21:35:13 +0200 |
commit | 637d29fa8e0f5b04129244f993c6bb487e8510d8 (patch) | |
tree | 5c150d28cdade5a01bce670146339560d2e4dd5b /oox | |
parent | 277d05a7188be77162e4a388c7c825daf8d6e326 (diff) |
Drop ContainerHelper::vectorToSequence and use comphelper::containerToSequence
Change-Id: I987c56feab147cdbeb4ad58bd5ebb23dce6dbbca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124215
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r-- | oox/source/docprop/ooxmldocpropimport.cxx | 3 | ||||
-rw-r--r-- | oox/source/drawingml/chart/seriesconverter.cxx | 6 | ||||
-rw-r--r-- | oox/source/drawingml/chart/titleconverter.cxx | 6 | ||||
-rw-r--r-- | oox/source/drawingml/chart/typegroupconverter.cxx | 4 | ||||
-rw-r--r-- | oox/source/drawingml/lineproperties.cxx | 7 | ||||
-rw-r--r-- | oox/source/vml/vmlshape.cxx | 6 |
6 files changed, 21 insertions, 11 deletions
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index 621173b6bdea..4de14e0fca9f 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -32,6 +32,7 @@ #include <oox/helper/containerhelper.hxx> #include "docprophandler.hxx" +#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -82,7 +83,7 @@ Sequence< InputSource > lclGetRelatedStreams( const Reference< XStorage >& rxSto } } - return ContainerHelper::vectorToSequence( aResult ); + return comphelper::containerToSequence( aResult ); } } // namespace diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index 3f03e1e5c2a6..324f3817d6f1 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -35,6 +35,8 @@ #include <com/sun/star/chart2/data/LabeledDataSequence.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/drawing/FillStyle.hpp> + +#include <comphelper/sequence.hxx> #include <osl/diagnose.h> #include <drawingml/chart/datasourceconverter.hxx> #include <drawingml/chart/seriesmodel.hxx> @@ -530,7 +532,7 @@ void ErrorBarConverter::convertFromModel( const Reference< XDataSeries >& rxData if( aLabeledSeqVec.empty() ) xErrorBar.clear(); else - xDataSink->setData( ContainerHelper::vectorToSequence( aLabeledSeqVec ) ); + xDataSink->setData( comphelper::containerToSequence( aLabeledSeqVec ) ); } } break; @@ -810,7 +812,7 @@ Reference< XDataSeries > SeriesConverter::createDataSeries( const TypeGroupConve } // attach labeled data sequences to series if( !aLabeledSeqVec.empty() ) - xDataSink->setData( ContainerHelper::vectorToSequence( aLabeledSeqVec ) ); + xDataSink->setData( comphelper::containerToSequence( aLabeledSeqVec ) ); } // error bars diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index f39929134b63..0faf8aa5f79e 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -29,6 +29,8 @@ #include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XDataSeriesContainer.hpp> + +#include <comphelper/sequence.hxx> #include <osl/diagnose.h> #include <drawingml/textbody.hxx> #include <drawingml/textparagraph.hxx> @@ -114,7 +116,7 @@ Sequence< Reference< XFormattedString > > TextConverter::createStringSequence( } } - return ContainerHelper::vectorToSequence( aStringVec ); + return comphelper::containerToSequence( aStringVec ); } Reference< XFormattedString > TextConverter::appendFormattedString( @@ -336,7 +338,7 @@ void LegendConverter::legendEntriesFormatting(const Reference<XDiagram>& rxDiagr j += nDataSeqSize; } if (deletedLegendEntries.size() > 0) - aSeriesProp.setProperty(PROP_DeletedLegendEntries, ContainerHelper::vectorToSequence(deletedLegendEntries)); + aSeriesProp.setProperty(PROP_DeletedLegendEntries, comphelper::containerToSequence(deletedLegendEntries)); } else { diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index d6982192a4f5..9a0b9342ac56 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -34,6 +34,8 @@ #include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> #include <com/sun/star/drawing/LineStyle.hpp> + +#include <comphelper/sequence.hxx> #include <osl/diagnose.h> #include <drawingml/lineproperties.hxx> #include <drawingml/chart/seriesconverter.hxx> @@ -395,7 +397,7 @@ void TypeGroupConverter::convertFromModel( const Reference< XDiagram >& rxDiagra } // attach labeled data sequences to series and insert series into chart type - xDataSink->setData( ContainerHelper::vectorToSequence( aLabeledSeqVec ) ); + xDataSink->setData( comphelper::containerToSequence( aLabeledSeqVec ) ); // formatting of high/low lines aTypeProp.setProperty( PROP_ShowHighLow, true ); diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx index 451da4c6aa26..63e768a08c3f 100644 --- a/oox/source/drawingml/lineproperties.cxx +++ b/oox/source/drawingml/lineproperties.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <comphelper/sequence.hxx> #include <drawingml/lineproperties.hxx> #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> @@ -369,11 +372,11 @@ void lclPushMarkerProperties( ShapePropertyMap& rPropMap, { PolyPolygonBezierCoords aMarkerCoords; aMarkerCoords.Coordinates.realloc( 1 ); - aMarkerCoords.Coordinates[ 0 ] = ContainerHelper::vectorToSequence( aPoints ); + aMarkerCoords.Coordinates[ 0 ] = comphelper::containerToSequence( aPoints ); ::std::vector< PolygonFlags > aFlags( aPoints.size(), PolygonFlags_NORMAL ); aMarkerCoords.Flags.realloc( 1 ); - aMarkerCoords.Flags[ 0 ] = ContainerHelper::vectorToSequence( aFlags ); + aMarkerCoords.Flags[ 0 ] = comphelper::containerToSequence( aFlags ); aNamedMarker.Name = aMarkerName; aNamedMarker.Value <<= aMarkerCoords; diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 4d99a0014e88..f197bd009af6 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -1058,7 +1058,7 @@ Reference< XShape > PolyLineShape::implConvertAndInsert( const Reference< XShape if (!aAbsPoints.empty()) { PointSequenceSequence aPointSeq( 1 ); - aPointSeq[ 0 ] = ContainerHelper::vectorToSequence( aAbsPoints ); + aPointSeq[ 0 ] = comphelper::containerToSequence( aAbsPoints ); PropertySet aPropSet( xShape ); aPropSet.setProperty( PROP_PolyPolygon, aPointSeq ); } @@ -1226,11 +1226,11 @@ Reference< XShape > BezierShape::implConvertAndInsert( const Reference< XShapes aBezierCoords.Coordinates.realloc( aCoordLists.size() ); for ( size_t i = 0; i < aCoordLists.size(); i++ ) - aBezierCoords.Coordinates[i] = ContainerHelper::vectorToSequence( aCoordLists[i] ); + aBezierCoords.Coordinates[i] = comphelper::containerToSequence( aCoordLists[i] ); aBezierCoords.Flags.realloc( aFlagLists.size() ); for ( size_t i = 0; i < aFlagLists.size(); i++ ) - aBezierCoords.Flags[i] = ContainerHelper::vectorToSequence( aFlagLists[i] ); + aBezierCoords.Flags[i] = comphelper::containerToSequence( aFlagLists[i] ); if( !aCoordLists.front().empty() && !aCoordLists.back().empty() && aCoordLists.front().front().X == aCoordLists.back().back().X |