[Libreoffice-commits] core.git: xmloff/source
Julien Nabet
serval2412 at yahoo.fr
Sun Nov 26 12:43:14 UTC 2017
xmloff/source/chart/SchXMLChartContext.cxx | 30 +++----
xmloff/source/chart/SchXMLChartContext.hxx | 5 -
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 16 ++--
xmloff/source/chart/SchXMLPlotAreaContext.hxx | 8 +-
xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx | 8 +-
xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx | 4 -
xmloff/source/chart/SchXMLSeries2Context.cxx | 50 ++++++-------
xmloff/source/chart/SchXMLSeries2Context.hxx | 10 +-
8 files changed, 66 insertions(+), 65 deletions(-)
New commits:
commit 459caa059d75260ba1e83ce4ef47cd901b2dbfbf
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Sun Nov 26 12:13:41 2017 +0100
Replace some lists by vectors in xmloff
Change-Id: Ib321b4716ee95507b9d51ad8320bc7eb7cf35c93
Reviewed-on: https://gerrit.libreoffice.org/45284
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index c4894273020c..0bc45256a597 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -472,9 +472,9 @@ struct NewDonutSeries
m_aPointStyles[nPointIndex]=rStyleName;
}
- ::std::list< DataRowPointStyle > creatStyleList()
+ ::std::vector< DataRowPointStyle > creatStyleVector()
{
- ::std::list< DataRowPointStyle > aRet;
+ ::std::vector< DataRowPointStyle > aRet;
DataRowPointStyle aSeriesStyle( DataRowPointStyle::DATA_SERIES
, m_xSeries, -1, 1, msStyleName, mnAttachedAxis );
@@ -502,11 +502,11 @@ struct NewDonutSeries
}
};
-void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle >& rStyleList
+void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::vector< DataRowPointStyle >& rStyleVector
, const ::std::map< css::uno::Reference< css::chart2::XDataSeries> , sal_Int32 >& rSeriesMap )
{
- ::std::list< DataRowPointStyle >::iterator aIt(rStyleList.begin());
- ::std::list< DataRowPointStyle >::iterator aEnd(rStyleList.end());
+ ::std::vector< DataRowPointStyle >::iterator aIt(rStyleVector.begin());
+ ::std::vector< DataRowPointStyle >::iterator aEnd(rStyleVector.end());
//detect old series count
//and add old series to aSeriesMap
@@ -516,7 +516,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle
{
sal_Int32 nMaxOldSeriesIndex = 0;
sal_Int32 nOldSeriesIndex = 0;
- for( aIt = rStyleList.begin(); aIt != aEnd; ++aIt )
+ for( aIt = rStyleVector.begin(); aIt != aEnd; ++aIt )
{
DataRowPointStyle aStyle(*aIt);
if(aStyle.meType == DataRowPointStyle::DATA_SERIES &&
@@ -552,7 +552,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle
}
//overwrite attached axis information according to old series styles
- for( aIt = rStyleList.begin(); aIt != aEnd; ++aIt )
+ for( aIt = rStyleVector.begin(); aIt != aEnd; ++aIt )
{
DataRowPointStyle aStyle(*aIt);
if(aStyle.meType == DataRowPointStyle::DATA_SERIES )
@@ -564,7 +564,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle
}
//overwrite new series style names with old series style name information
- for( aIt = rStyleList.begin(); aIt != aEnd; ++aIt )
+ for( aIt = rStyleVector.begin(); aIt != aEnd; ++aIt )
{
DataRowPointStyle aStyle(*aIt);
if( aStyle.meType == DataRowPointStyle::DATA_SERIES )
@@ -584,7 +584,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle
}
//overwrite new series style names with point style name information
- for( aIt = rStyleList.begin(); aIt != aEnd; ++aIt )
+ for( aIt = rStyleVector.begin(); aIt != aEnd; ++aIt )
{
DataRowPointStyle aStyle(*aIt);
if( aStyle.meType == DataRowPointStyle::DATA_POINT )
@@ -608,15 +608,15 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle
}
}
- //put information from aNewSeriesVector to output parameter rStyleList
- rStyleList.clear();
+ //put information from aNewSeriesVector to output parameter rStyleVector
+ rStyleVector.clear();
::std::vector< NewDonutSeries >::iterator aNewSeriesIt( aNewSeriesVector.begin() );
::std::vector< NewDonutSeries >::iterator aNewSeriesEnd( aNewSeriesVector.end() );
for( ;aNewSeriesIt!=aNewSeriesEnd; ++aNewSeriesIt)
{
- ::std::list< DataRowPointStyle > aList( aNewSeriesIt->creatStyleList() );
- rStyleList.insert(rStyleList.end(),aList.begin(),aList.end());
+ ::std::vector< DataRowPointStyle > aVector( aNewSeriesIt->creatStyleVector() );
+ rStyleVector.insert(rStyleVector.end(),aVector.begin(),aVector.end());
}
}
@@ -895,7 +895,7 @@ void SchXMLChartContext::EndElement()
if( bSpecialHandlingForDonutChart )
{
uno::Reference< chart2::XDiagram > xNewDiagram( xNewDoc->getFirstDiagram() );
- lcl_swapPointAndSeriesStylesForDonutCharts( maSeriesDefaultsAndStyles.maSeriesStyleList
+ lcl_swapPointAndSeriesStylesForDonutCharts( maSeriesDefaultsAndStyles.maSeriesStyleVector
, SchXMLSeriesHelper::getDataSeriesIndexMapFromDiagram(xNewDiagram) );
}
@@ -911,7 +911,7 @@ void SchXMLChartContext::EndElement()
if( maChartTypeServiceName == "com.sun.star.chart2.ScatterChartType" )
{
bSwitchOffLinesForScatter = true;
- SchXMLSeries2Context::switchSeriesLinesOff( maSeriesDefaultsAndStyles.maSeriesStyleList );
+ SchXMLSeries2Context::switchSeriesLinesOff( maSeriesDefaultsAndStyles.maSeriesStyleVector );
}
}
}
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index c816b4492305..bde9b787831b 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -28,6 +28,7 @@
#include "transporttypes.hxx"
#include <list>
+#include <vector>
class SchXMLImportHelper;
@@ -69,8 +70,8 @@ struct SeriesDefaultsAndStyles
css::uno::Any maLinesOnProperty;
//styles for series and datapoints
- ::std::list< DataRowPointStyle > maSeriesStyleList;
- ::std::list< RegressionStyle > maRegressionStyleList;
+ ::std::vector< DataRowPointStyle > maSeriesStyleVector;
+ ::std::vector< RegressionStyle > maRegressionStyleVector;
};
class SchXMLChartContext : public SvXMLImportContext
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 875d3468fb49..b59843e03844 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -463,8 +463,8 @@ SvXMLImportContextRef SchXMLPlotAreaContext::CreateChildContext(
pContext = new SchXMLSeries2Context(
mrImportHelper, GetImport(), rLocalName,
mxNewDoc, maAxes,
- mrSeriesDefaultsAndStyles.maSeriesStyleList,
- mrSeriesDefaultsAndStyles.maRegressionStyleList,
+ mrSeriesDefaultsAndStyles.maSeriesStyleVector,
+ mrSeriesDefaultsAndStyles.maRegressionStyleVector,
mnSeries,
mbStockHasVolume,
m_aGlobalSeriesImportInfo,
@@ -596,12 +596,12 @@ void SchXMLPlotAreaContext::EndElement()
}
SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName,
- ::std::list< DataRowPointStyle >& rStyleList,
+ ::std::vector< DataRowPointStyle >& rStyleVector,
const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
sal_Int32& rIndex,
bool bSymbolSizeForSeriesIsMissingInFile ) :
SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
- mrStyleList( rStyleList ),
+ mrStyleVector( rStyleVector ),
m_xSeries( xSeries ),
mrIndex( rIndex ),
mbSymbolSizeForSeriesIsMissingInFile( bSymbolSizeForSeriesIsMissingInFile )
@@ -639,7 +639,7 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
DataRowPointStyle::DATA_POINT,
m_xSeries, mrIndex, nRepeat, sAutoStyleName );
aStyle.mbSymbolSizeForSeriesIsMissingInFile = mbSymbolSizeForSeriesIsMissingInFile;
- mrStyleList.push_back( aStyle );
+ mrStyleVector.push_back( aStyle );
}
mrIndex += nRepeat;
}
@@ -917,14 +917,14 @@ SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext(
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString &rSeriesStyleName,
- ::std::list< DataRowPointStyle >& rStyleList,
+ ::std::vector< DataRowPointStyle >& rStyleVector,
const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
ContextType eContextType,
tSchXMLLSequencesPerIndex & rLSequencesPerIndex) :
SvXMLImportContext( rImport, nPrefix, rLocalName ),
mrImportHelper( rImpHelper ),
- mrStyleList( rStyleList ),
+ mrStyleVector( rStyleVector ),
m_xSeries( xSeries ),
meContextType( eContextType ),
maSeriesStyleName( rSeriesStyleName),
@@ -1142,7 +1142,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
break;
}
- mrStyleList.push_back( aStyle );
+ mrStyleVector.push_back( aStyle );
}
}
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index aaff32b8670f..63c841a3c9f7 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -139,14 +139,14 @@ private:
class SchXMLDataPointContext : public SvXMLImportContext
{
private:
- ::std::list< DataRowPointStyle >& mrStyleList;
+ ::std::vector< DataRowPointStyle >& mrStyleVector;
css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
sal_Int32& mrIndex;
bool mbSymbolSizeForSeriesIsMissingInFile;
public:
SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName,
- ::std::list< DataRowPointStyle >& rStyleList,
+ ::std::vector< DataRowPointStyle >& rStyleVector,
const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
sal_Int32& rIndex,
bool bSymbolSizeForSeriesIsMissingInFile );
@@ -236,7 +236,7 @@ public:
sal_uInt16 nPrefix,
const OUString& rLocalName,
const OUString &rSeriesStyleName,
- ::std::list< DataRowPointStyle >& rStyleList,
+ ::std::vector< DataRowPointStyle >& rStyleVector,
const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
ContextType eContextType,
tSchXMLLSequencesPerIndex & rLSequencesPerIndex );
@@ -247,7 +247,7 @@ public:
private:
SchXMLImportHelper & mrImportHelper;
- ::std::list< DataRowPointStyle > & mrStyleList;
+ ::std::vector< DataRowPointStyle > & mrStyleVector;
css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
ContextType meContextType;
OUString maSeriesStyleName;
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
index a7cf77f69fd7..19031dffc63e 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
@@ -41,7 +41,7 @@ SchXMLRegressionCurveObjectContext::SchXMLRegressionCurveObjectContext(
SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
- std::list< RegressionStyle >& rRegressionStyleList,
+ std::vector< RegressionStyle >& rRegressionStyleVector,
const css::uno::Reference<
css::chart2::XDataSeries >& xSeries,
const awt::Size & rChartSize) :
@@ -49,7 +49,7 @@ SchXMLRegressionCurveObjectContext::SchXMLRegressionCurveObjectContext(
mrImportHelper( rImpHelper ),
mxSeries( xSeries ),
maChartSize( rChartSize ),
- mrRegressionStyleList( rRegressionStyleList )
+ mrRegressionStyleVector( rRegressionStyleVector )
{
}
@@ -79,7 +79,7 @@ void SchXMLRegressionCurveObjectContext::StartElement( const uno::Reference< xml
}
RegressionStyle aStyle( mxSeries, sAutoStyleName );
- mrRegressionStyleList.push_back( aStyle );
+ mrRegressionStyleVector.push_back( aStyle );
}
SvXMLImportContextRef SchXMLRegressionCurveObjectContext::CreateChildContext(
@@ -92,7 +92,7 @@ SvXMLImportContextRef SchXMLRegressionCurveObjectContext::CreateChildContext(
if( nPrefix == XML_NAMESPACE_CHART && IsXMLToken( rLocalName, XML_EQUATION ) )
{
xContext = new SchXMLEquationContext(
- mrImportHelper, GetImport(), nPrefix, rLocalName, maChartSize, mrRegressionStyleList.back());
+ mrImportHelper, GetImport(), nPrefix, rLocalName, maChartSize, mrRegressionStyleVector.back());
}
else
{
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
index 5e2ec494428c..e19fa83d8f40 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
@@ -35,7 +35,7 @@ public:
SvXMLImport& rImport,
sal_uInt16 nPrefix,
const OUString& rLocalName,
- std::list< RegressionStyle >& rRegressionStyleList,
+ std::vector< RegressionStyle >& rRegressionStyleVector,
const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
const css::awt::Size & rChartSize );
@@ -52,7 +52,7 @@ private:
SchXMLImportHelper& mrImportHelper;
css::uno::Reference<css::chart2::XDataSeries > mxSeries;
css::awt::Size maChartSize;
- std::list< RegressionStyle >& mrRegressionStyleList;
+ std::vector< RegressionStyle >& mrRegressionStyleVector;
};
class SchXMLEquationContext : public SvXMLImportContext
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 5cec14465e34..8072cf49ba52 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -244,8 +244,8 @@ SchXMLSeries2Context::SchXMLSeries2Context(
SvXMLImport& rImport, const OUString& rLocalName,
const Reference< chart2::XChartDocument > & xNewDoc,
std::vector< SchXMLAxis >& rAxes,
- ::std::list< DataRowPointStyle >& rStyleList,
- ::std::list< RegressionStyle >& rRegressionStyleList,
+ ::std::vector< DataRowPointStyle >& rStyleVector,
+ ::std::vector< RegressionStyle >& rRegressionStyleVector,
sal_Int32 nSeriesIndex,
bool bStockHasVolume,
GlobalSeriesImportInfo& rGlobalSeriesImportInfo,
@@ -257,8 +257,8 @@ SchXMLSeries2Context::SchXMLSeries2Context(
mrImportHelper( rImpHelper ),
mxNewDoc( xNewDoc ),
mrAxes( rAxes ),
- mrStyleList( rStyleList ),
- mrRegressionStyleList( rRegressionStyleList ),
+ mrStyleVector( rStyleVector ),
+ mrRegressionStyleVector( rRegressionStyleVector ),
m_xSeries(nullptr),
mnSeriesIndex( nSeriesIndex ),
mnDataPointIndex( 0 ),
@@ -604,7 +604,7 @@ void SchXMLSeries2Context::EndElement()
-1, 1,
msAutoStyleName, mnAttachedAxis );
aStyle.mbSymbolSizeForSeriesIsMissingInFile=mbSymbolSizeIsMissingInFile;
- mrStyleList.push_back( aStyle );
+ mrStyleVector.push_back( aStyle );
}
}
@@ -660,28 +660,28 @@ SvXMLImportContextRef SchXMLSeries2Context::CreateChildContext(
pContext = new SchXMLStatisticsObjectContext(
mrImportHelper, GetImport(),
nPrefix, rLocalName, msAutoStyleName,
- mrStyleList, m_xSeries,
+ mrStyleVector, m_xSeries,
SchXMLStatisticsObjectContext::CONTEXT_TYPE_MEAN_VALUE_LINE,
mrLSequencesPerIndex );
break;
case XML_TOK_SERIES_REGRESSION_CURVE:
pContext = new SchXMLRegressionCurveObjectContext(
mrImportHelper, GetImport(),
- nPrefix, rLocalName, mrRegressionStyleList,
+ nPrefix, rLocalName, mrRegressionStyleVector,
m_xSeries, maChartSize );
break;
case XML_TOK_SERIES_ERROR_INDICATOR:
pContext = new SchXMLStatisticsObjectContext(
mrImportHelper, GetImport(),
nPrefix, rLocalName, msAutoStyleName,
- mrStyleList, m_xSeries,
+ mrStyleVector, m_xSeries,
SchXMLStatisticsObjectContext::CONTEXT_TYPE_ERROR_INDICATOR,
mrLSequencesPerIndex );
break;
case XML_TOK_SERIES_DATA_POINT:
pContext = new SchXMLDataPointContext( GetImport(), rLocalName,
- mrStyleList, m_xSeries, mnDataPointIndex, mbSymbolSizeIsMissingInFile );
+ mrStyleVector, m_xSeries, mnDataPointIndex, mbSymbolSizeIsMissingInFile );
break;
case XML_TOK_SERIES_PROPERTY_MAPPING:
pContext = new SchXMLPropertyMappingContext( mrImportHelper,
@@ -700,12 +700,12 @@ SvXMLImportContextRef SchXMLSeries2Context::CreateChildContext(
void SchXMLSeries2Context::initSeriesPropertySets( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles
, const uno::Reference< frame::XModel >& xChartModel )
{
- ::std::list< DataRowPointStyle >::iterator iStyle;
+ ::std::vector< DataRowPointStyle >::iterator iStyle;
// iterate over series first and remind propertysets in map
// new api <-> old api wrapper
::std::map< Reference< chart2::XDataSeries >, Reference< beans::XPropertySet > > aSeriesMap;
- for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleList.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleList.end(); ++iStyle )
+ for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleVector.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleVector.end(); ++iStyle )
{
if( iStyle->meType != DataRowPointStyle::DATA_SERIES )
continue;
@@ -718,7 +718,7 @@ void SchXMLSeries2Context::initSeriesPropertySets( SeriesDefaultsAndStyles& rSer
}
//initialize m_xOldAPISeries for all other styles also
- for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleList.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleList.end(); ++iStyle )
+ for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleVector.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleVector.end(); ++iStyle )
{
if( iStyle->meType == DataRowPointStyle::DATA_SERIES )
continue;
@@ -729,11 +729,11 @@ void SchXMLSeries2Context::initSeriesPropertySets( SeriesDefaultsAndStyles& rSer
//static
void SchXMLSeries2Context::setDefaultsToSeries( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles )
{
- ::std::list< DataRowPointStyle >::iterator iStyle;
+ ::std::vector< DataRowPointStyle >::iterator iStyle;
// iterate over series
// call initSeriesPropertySets first
- for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleList.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleList.end(); ++iStyle )
+ for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleVector.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleVector.end(); ++iStyle )
{
if( iStyle->meType != DataRowPointStyle::DATA_SERIES )
continue;
@@ -784,10 +784,10 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe
, bool bIsStockChart
, tSchXMLLSequencesPerIndex & rInOutLSequencesPerIndex )
{
- ::std::list< DataRowPointStyle >::iterator iStyle;
+ ::std::vector< DataRowPointStyle >::iterator iStyle;
// iterate over series
- for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleList.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleList.end(); ++iStyle )
+ for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleVector.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleVector.end(); ++iStyle )
{
if( iStyle->meType == DataRowPointStyle::DATA_SERIES )
{
@@ -872,10 +872,10 @@ void SchXMLSeries2Context::setStylesToRegressionCurves(
const SvXMLStyleContext*& rpStyle,
OUString const & rCurrentStyleName )
{
- std::list< RegressionStyle >::iterator iStyle;
+ std::vector< RegressionStyle >::iterator iStyle;
// iterate over regession etc
- for( iStyle = rSeriesDefaultsAndStyles.maRegressionStyleList.begin(); iStyle != rSeriesDefaultsAndStyles.maRegressionStyleList.end(); ++iStyle )
+ for( iStyle = rSeriesDefaultsAndStyles.maRegressionStyleVector.begin(); iStyle != rSeriesDefaultsAndStyles.maRegressionStyleVector.end(); ++iStyle )
{
try
{
@@ -942,10 +942,10 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles
, const SvXMLStyleContext*& rpStyle
, OUString& rCurrStyleName )
{
- ::std::list< DataRowPointStyle >::iterator iStyle;
+ ::std::vector< DataRowPointStyle >::iterator iStyle;
// iterate over regession etc
- for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleList.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleList.end(); ++iStyle )
+ for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleVector.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleVector.end(); ++iStyle )
{
if( iStyle->meType == DataRowPointStyle::ERROR_INDICATOR ||
iStyle->meType == DataRowPointStyle::MEAN_VALUE )
@@ -1016,8 +1016,8 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri
, const SvXMLImport& rImport
, bool bIsStockChart, bool bIsDonutChart, bool bSwitchOffLinesForScatter )
{
- ::std::list< DataRowPointStyle >::iterator iStyle;
- for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleList.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleList.end(); ++iStyle )
+ ::std::vector< DataRowPointStyle >::iterator iStyle;
+ for( iStyle = rSeriesDefaultsAndStyles.maSeriesStyleVector.begin(); iStyle != rSeriesDefaultsAndStyles.maSeriesStyleVector.end(); ++iStyle )
{
if( iStyle->meType != DataRowPointStyle::DATA_POINT )
continue;
@@ -1104,12 +1104,12 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri
}
//static
-void SchXMLSeries2Context::switchSeriesLinesOff( ::std::list< DataRowPointStyle >& rSeriesStyleList )
+void SchXMLSeries2Context::switchSeriesLinesOff( ::std::vector< DataRowPointStyle >& rSeriesStyleVector )
{
- ::std::list< DataRowPointStyle >::iterator iStyle;
+ ::std::vector< DataRowPointStyle >::iterator iStyle;
// iterate over series
- for( iStyle = rSeriesStyleList.begin(); iStyle != rSeriesStyleList.end(); ++iStyle )
+ for( iStyle = rSeriesStyleVector.begin(); iStyle != rSeriesStyleVector.end(); ++iStyle )
{
if( iStyle->meType != DataRowPointStyle::DATA_SERIES )
continue;
diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx
index 82a5542f8a9f..880b8313e172 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.hxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.hxx
@@ -45,8 +45,8 @@ private:
SchXMLImportHelper& mrImportHelper;
css::uno::Reference< css::chart2::XChartDocument > mxNewDoc;
::std::vector< SchXMLAxis >& mrAxes;
- ::std::list< DataRowPointStyle >& mrStyleList;
- ::std::list< RegressionStyle >& mrRegressionStyleList;
+ ::std::vector< DataRowPointStyle >& mrStyleVector;
+ ::std::vector< RegressionStyle >& mrRegressionStyleVector;
css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
sal_Int32 mnSeriesIndex;
@@ -74,8 +74,8 @@ public:
SvXMLImport& rImport, const OUString& rLocalName,
const css::uno::Reference< css::chart2::XChartDocument > & xNewDoc,
std::vector< SchXMLAxis >& rAxes,
- ::std::list< DataRowPointStyle >& rStyleList,
- ::std::list< RegressionStyle >& rRegressionStyleList,
+ ::std::vector< DataRowPointStyle >& rStyleVector,
+ ::std::vector< RegressionStyle >& rRegressionStyleVector,
sal_Int32 nSeriesIndex,
bool bStockHasVolume,
GlobalSeriesImportInfo& rGlobalSeriesImportInfo,
@@ -125,7 +125,7 @@ public:
, const SvXMLImport& rImport
, bool bIsStockChart, bool bIsDonutChart, bool bSwitchOffLinesForScatter );
- static void switchSeriesLinesOff( ::std::list< DataRowPointStyle >& rSeriesStyleList );
+ static void switchSeriesLinesOff( ::std::vector< DataRowPointStyle >& rSeriesStyleVector );
};
// INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLSERIES2CONTEXT_HXX
More information about the Libreoffice-commits
mailing list