Kaydet (Commit) 459caa05 authored tarafından Julien Nabet's avatar Julien Nabet

Replace some lists by vectors in xmloff

Change-Id: Ib321b4716ee95507b9d51ad8320bc7eb7cf35c93
Reviewed-on: https://gerrit.libreoffice.org/45284Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJulien Nabet <serval2412@yahoo.fr>
üst d8c0051c
...@@ -472,9 +472,9 @@ struct NewDonutSeries ...@@ -472,9 +472,9 @@ struct NewDonutSeries
m_aPointStyles[nPointIndex]=rStyleName; 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 DataRowPointStyle aSeriesStyle( DataRowPointStyle::DATA_SERIES
, m_xSeries, -1, 1, msStyleName, mnAttachedAxis ); , m_xSeries, -1, 1, msStyleName, mnAttachedAxis );
...@@ -502,11 +502,11 @@ struct NewDonutSeries ...@@ -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 ) , const ::std::map< css::uno::Reference< css::chart2::XDataSeries> , sal_Int32 >& rSeriesMap )
{ {
::std::list< DataRowPointStyle >::iterator aIt(rStyleList.begin()); ::std::vector< DataRowPointStyle >::iterator aIt(rStyleVector.begin());
::std::list< DataRowPointStyle >::iterator aEnd(rStyleList.end()); ::std::vector< DataRowPointStyle >::iterator aEnd(rStyleVector.end());
//detect old series count //detect old series count
//and add old series to aSeriesMap //and add old series to aSeriesMap
...@@ -516,7 +516,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle ...@@ -516,7 +516,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle
{ {
sal_Int32 nMaxOldSeriesIndex = 0; sal_Int32 nMaxOldSeriesIndex = 0;
sal_Int32 nOldSeriesIndex = 0; sal_Int32 nOldSeriesIndex = 0;
for( aIt = rStyleList.begin(); aIt != aEnd; ++aIt ) for( aIt = rStyleVector.begin(); aIt != aEnd; ++aIt )
{ {
DataRowPointStyle aStyle(*aIt); DataRowPointStyle aStyle(*aIt);
if(aStyle.meType == DataRowPointStyle::DATA_SERIES && if(aStyle.meType == DataRowPointStyle::DATA_SERIES &&
...@@ -552,7 +552,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle ...@@ -552,7 +552,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle
} }
//overwrite attached axis information according to old series styles //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); DataRowPointStyle aStyle(*aIt);
if(aStyle.meType == DataRowPointStyle::DATA_SERIES ) if(aStyle.meType == DataRowPointStyle::DATA_SERIES )
...@@ -564,7 +564,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle ...@@ -564,7 +564,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle
} }
//overwrite new series style names with old series style name information //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); DataRowPointStyle aStyle(*aIt);
if( aStyle.meType == DataRowPointStyle::DATA_SERIES ) if( aStyle.meType == DataRowPointStyle::DATA_SERIES )
...@@ -584,7 +584,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle ...@@ -584,7 +584,7 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle
} }
//overwrite new series style names with point style name information //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); DataRowPointStyle aStyle(*aIt);
if( aStyle.meType == DataRowPointStyle::DATA_POINT ) if( aStyle.meType == DataRowPointStyle::DATA_POINT )
...@@ -608,15 +608,15 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle ...@@ -608,15 +608,15 @@ void lcl_swapPointAndSeriesStylesForDonutCharts( ::std::list< DataRowPointStyle
} }
} }
//put information from aNewSeriesVector to output parameter rStyleList //put information from aNewSeriesVector to output parameter rStyleVector
rStyleList.clear(); rStyleVector.clear();
::std::vector< NewDonutSeries >::iterator aNewSeriesIt( aNewSeriesVector.begin() ); ::std::vector< NewDonutSeries >::iterator aNewSeriesIt( aNewSeriesVector.begin() );
::std::vector< NewDonutSeries >::iterator aNewSeriesEnd( aNewSeriesVector.end() ); ::std::vector< NewDonutSeries >::iterator aNewSeriesEnd( aNewSeriesVector.end() );
for( ;aNewSeriesIt!=aNewSeriesEnd; ++aNewSeriesIt) for( ;aNewSeriesIt!=aNewSeriesEnd; ++aNewSeriesIt)
{ {
::std::list< DataRowPointStyle > aList( aNewSeriesIt->creatStyleList() ); ::std::vector< DataRowPointStyle > aVector( aNewSeriesIt->creatStyleVector() );
rStyleList.insert(rStyleList.end(),aList.begin(),aList.end()); rStyleVector.insert(rStyleVector.end(),aVector.begin(),aVector.end());
} }
} }
...@@ -895,7 +895,7 @@ void SchXMLChartContext::EndElement() ...@@ -895,7 +895,7 @@ void SchXMLChartContext::EndElement()
if( bSpecialHandlingForDonutChart ) if( bSpecialHandlingForDonutChart )
{ {
uno::Reference< chart2::XDiagram > xNewDiagram( xNewDoc->getFirstDiagram() ); uno::Reference< chart2::XDiagram > xNewDiagram( xNewDoc->getFirstDiagram() );
lcl_swapPointAndSeriesStylesForDonutCharts( maSeriesDefaultsAndStyles.maSeriesStyleList lcl_swapPointAndSeriesStylesForDonutCharts( maSeriesDefaultsAndStyles.maSeriesStyleVector
, SchXMLSeriesHelper::getDataSeriesIndexMapFromDiagram(xNewDiagram) ); , SchXMLSeriesHelper::getDataSeriesIndexMapFromDiagram(xNewDiagram) );
} }
...@@ -911,7 +911,7 @@ void SchXMLChartContext::EndElement() ...@@ -911,7 +911,7 @@ void SchXMLChartContext::EndElement()
if( maChartTypeServiceName == "com.sun.star.chart2.ScatterChartType" ) if( maChartTypeServiceName == "com.sun.star.chart2.ScatterChartType" )
{ {
bSwitchOffLinesForScatter = true; bSwitchOffLinesForScatter = true;
SchXMLSeries2Context::switchSeriesLinesOff( maSeriesDefaultsAndStyles.maSeriesStyleList ); SchXMLSeries2Context::switchSeriesLinesOff( maSeriesDefaultsAndStyles.maSeriesStyleVector );
} }
} }
} }
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "transporttypes.hxx" #include "transporttypes.hxx"
#include <list> #include <list>
#include <vector>
class SchXMLImportHelper; class SchXMLImportHelper;
...@@ -69,8 +70,8 @@ struct SeriesDefaultsAndStyles ...@@ -69,8 +70,8 @@ struct SeriesDefaultsAndStyles
css::uno::Any maLinesOnProperty; css::uno::Any maLinesOnProperty;
//styles for series and datapoints //styles for series and datapoints
::std::list< DataRowPointStyle > maSeriesStyleList; ::std::vector< DataRowPointStyle > maSeriesStyleVector;
::std::list< RegressionStyle > maRegressionStyleList; ::std::vector< RegressionStyle > maRegressionStyleVector;
}; };
class SchXMLChartContext : public SvXMLImportContext class SchXMLChartContext : public SvXMLImportContext
......
...@@ -463,8 +463,8 @@ SvXMLImportContextRef SchXMLPlotAreaContext::CreateChildContext( ...@@ -463,8 +463,8 @@ SvXMLImportContextRef SchXMLPlotAreaContext::CreateChildContext(
pContext = new SchXMLSeries2Context( pContext = new SchXMLSeries2Context(
mrImportHelper, GetImport(), rLocalName, mrImportHelper, GetImport(), rLocalName,
mxNewDoc, maAxes, mxNewDoc, maAxes,
mrSeriesDefaultsAndStyles.maSeriesStyleList, mrSeriesDefaultsAndStyles.maSeriesStyleVector,
mrSeriesDefaultsAndStyles.maRegressionStyleList, mrSeriesDefaultsAndStyles.maRegressionStyleVector,
mnSeries, mnSeries,
mbStockHasVolume, mbStockHasVolume,
m_aGlobalSeriesImportInfo, m_aGlobalSeriesImportInfo,
...@@ -596,12 +596,12 @@ void SchXMLPlotAreaContext::EndElement() ...@@ -596,12 +596,12 @@ void SchXMLPlotAreaContext::EndElement()
} }
SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName, SchXMLDataPointContext::SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName,
::std::list< DataRowPointStyle >& rStyleList, ::std::vector< DataRowPointStyle >& rStyleVector,
const css::uno::Reference< css::chart2::XDataSeries >& xSeries, const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
sal_Int32& rIndex, sal_Int32& rIndex,
bool bSymbolSizeForSeriesIsMissingInFile ) : bool bSymbolSizeForSeriesIsMissingInFile ) :
SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ), SvXMLImportContext( rImport, XML_NAMESPACE_CHART, rLocalName ),
mrStyleList( rStyleList ), mrStyleVector( rStyleVector ),
m_xSeries( xSeries ), m_xSeries( xSeries ),
mrIndex( rIndex ), mrIndex( rIndex ),
mbSymbolSizeForSeriesIsMissingInFile( bSymbolSizeForSeriesIsMissingInFile ) mbSymbolSizeForSeriesIsMissingInFile( bSymbolSizeForSeriesIsMissingInFile )
...@@ -639,7 +639,7 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr ...@@ -639,7 +639,7 @@ void SchXMLDataPointContext::StartElement( const uno::Reference< xml::sax::XAttr
DataRowPointStyle::DATA_POINT, DataRowPointStyle::DATA_POINT,
m_xSeries, mrIndex, nRepeat, sAutoStyleName ); m_xSeries, mrIndex, nRepeat, sAutoStyleName );
aStyle.mbSymbolSizeForSeriesIsMissingInFile = mbSymbolSizeForSeriesIsMissingInFile; aStyle.mbSymbolSizeForSeriesIsMissingInFile = mbSymbolSizeForSeriesIsMissingInFile;
mrStyleList.push_back( aStyle ); mrStyleVector.push_back( aStyle );
} }
mrIndex += nRepeat; mrIndex += nRepeat;
} }
...@@ -917,14 +917,14 @@ SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext( ...@@ -917,14 +917,14 @@ SchXMLStatisticsObjectContext::SchXMLStatisticsObjectContext(
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const OUString &rSeriesStyleName, const OUString &rSeriesStyleName,
::std::list< DataRowPointStyle >& rStyleList, ::std::vector< DataRowPointStyle >& rStyleVector,
const css::uno::Reference< css::chart2::XDataSeries >& xSeries, const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
ContextType eContextType, ContextType eContextType,
tSchXMLLSequencesPerIndex & rLSequencesPerIndex) : tSchXMLLSequencesPerIndex & rLSequencesPerIndex) :
SvXMLImportContext( rImport, nPrefix, rLocalName ), SvXMLImportContext( rImport, nPrefix, rLocalName ),
mrImportHelper( rImpHelper ), mrImportHelper( rImpHelper ),
mrStyleList( rStyleList ), mrStyleVector( rStyleVector ),
m_xSeries( xSeries ), m_xSeries( xSeries ),
meContextType( eContextType ), meContextType( eContextType ),
maSeriesStyleName( rSeriesStyleName), maSeriesStyleName( rSeriesStyleName),
...@@ -1142,7 +1142,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax ...@@ -1142,7 +1142,7 @@ void SchXMLStatisticsObjectContext::StartElement( const uno::Reference< xml::sax
break; break;
} }
mrStyleList.push_back( aStyle ); mrStyleVector.push_back( aStyle );
} }
} }
......
...@@ -139,14 +139,14 @@ private: ...@@ -139,14 +139,14 @@ private:
class SchXMLDataPointContext : public SvXMLImportContext class SchXMLDataPointContext : public SvXMLImportContext
{ {
private: private:
::std::list< DataRowPointStyle >& mrStyleList; ::std::vector< DataRowPointStyle >& mrStyleVector;
css::uno::Reference< css::chart2::XDataSeries > m_xSeries; css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
sal_Int32& mrIndex; sal_Int32& mrIndex;
bool mbSymbolSizeForSeriesIsMissingInFile; bool mbSymbolSizeForSeriesIsMissingInFile;
public: public:
SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName, SchXMLDataPointContext( SvXMLImport& rImport, const OUString& rLocalName,
::std::list< DataRowPointStyle >& rStyleList, ::std::vector< DataRowPointStyle >& rStyleVector,
const css::uno::Reference< css::chart2::XDataSeries >& xSeries, const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
sal_Int32& rIndex, sal_Int32& rIndex,
bool bSymbolSizeForSeriesIsMissingInFile ); bool bSymbolSizeForSeriesIsMissingInFile );
...@@ -236,7 +236,7 @@ public: ...@@ -236,7 +236,7 @@ public:
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
const OUString &rSeriesStyleName, const OUString &rSeriesStyleName,
::std::list< DataRowPointStyle >& rStyleList, ::std::vector< DataRowPointStyle >& rStyleVector,
const css::uno::Reference< css::chart2::XDataSeries >& xSeries, const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
ContextType eContextType, ContextType eContextType,
tSchXMLLSequencesPerIndex & rLSequencesPerIndex ); tSchXMLLSequencesPerIndex & rLSequencesPerIndex );
...@@ -247,7 +247,7 @@ public: ...@@ -247,7 +247,7 @@ public:
private: private:
SchXMLImportHelper & mrImportHelper; SchXMLImportHelper & mrImportHelper;
::std::list< DataRowPointStyle > & mrStyleList; ::std::vector< DataRowPointStyle > & mrStyleVector;
css::uno::Reference< css::chart2::XDataSeries > m_xSeries; css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
ContextType meContextType; ContextType meContextType;
OUString maSeriesStyleName; OUString maSeriesStyleName;
......
...@@ -41,7 +41,7 @@ SchXMLRegressionCurveObjectContext::SchXMLRegressionCurveObjectContext( ...@@ -41,7 +41,7 @@ SchXMLRegressionCurveObjectContext::SchXMLRegressionCurveObjectContext(
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
std::list< RegressionStyle >& rRegressionStyleList, std::vector< RegressionStyle >& rRegressionStyleVector,
const css::uno::Reference< const css::uno::Reference<
css::chart2::XDataSeries >& xSeries, css::chart2::XDataSeries >& xSeries,
const awt::Size & rChartSize) : const awt::Size & rChartSize) :
...@@ -49,7 +49,7 @@ SchXMLRegressionCurveObjectContext::SchXMLRegressionCurveObjectContext( ...@@ -49,7 +49,7 @@ SchXMLRegressionCurveObjectContext::SchXMLRegressionCurveObjectContext(
mrImportHelper( rImpHelper ), mrImportHelper( rImpHelper ),
mxSeries( xSeries ), mxSeries( xSeries ),
maChartSize( rChartSize ), maChartSize( rChartSize ),
mrRegressionStyleList( rRegressionStyleList ) mrRegressionStyleVector( rRegressionStyleVector )
{ {
} }
...@@ -79,7 +79,7 @@ void SchXMLRegressionCurveObjectContext::StartElement( const uno::Reference< xml ...@@ -79,7 +79,7 @@ void SchXMLRegressionCurveObjectContext::StartElement( const uno::Reference< xml
} }
RegressionStyle aStyle( mxSeries, sAutoStyleName ); RegressionStyle aStyle( mxSeries, sAutoStyleName );
mrRegressionStyleList.push_back( aStyle ); mrRegressionStyleVector.push_back( aStyle );
} }
SvXMLImportContextRef SchXMLRegressionCurveObjectContext::CreateChildContext( SvXMLImportContextRef SchXMLRegressionCurveObjectContext::CreateChildContext(
...@@ -92,7 +92,7 @@ SvXMLImportContextRef SchXMLRegressionCurveObjectContext::CreateChildContext( ...@@ -92,7 +92,7 @@ SvXMLImportContextRef SchXMLRegressionCurveObjectContext::CreateChildContext(
if( nPrefix == XML_NAMESPACE_CHART && IsXMLToken( rLocalName, XML_EQUATION ) ) if( nPrefix == XML_NAMESPACE_CHART && IsXMLToken( rLocalName, XML_EQUATION ) )
{ {
xContext = new SchXMLEquationContext( xContext = new SchXMLEquationContext(
mrImportHelper, GetImport(), nPrefix, rLocalName, maChartSize, mrRegressionStyleList.back()); mrImportHelper, GetImport(), nPrefix, rLocalName, maChartSize, mrRegressionStyleVector.back());
} }
else else
{ {
......
...@@ -35,7 +35,7 @@ public: ...@@ -35,7 +35,7 @@ public:
SvXMLImport& rImport, SvXMLImport& rImport,
sal_uInt16 nPrefix, sal_uInt16 nPrefix,
const OUString& rLocalName, const OUString& rLocalName,
std::list< RegressionStyle >& rRegressionStyleList, std::vector< RegressionStyle >& rRegressionStyleVector,
const css::uno::Reference< css::chart2::XDataSeries >& xSeries, const css::uno::Reference< css::chart2::XDataSeries >& xSeries,
const css::awt::Size & rChartSize ); const css::awt::Size & rChartSize );
...@@ -52,7 +52,7 @@ private: ...@@ -52,7 +52,7 @@ private:
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
css::uno::Reference<css::chart2::XDataSeries > mxSeries; css::uno::Reference<css::chart2::XDataSeries > mxSeries;
css::awt::Size maChartSize; css::awt::Size maChartSize;
std::list< RegressionStyle >& mrRegressionStyleList; std::vector< RegressionStyle >& mrRegressionStyleVector;
}; };
class SchXMLEquationContext : public SvXMLImportContext class SchXMLEquationContext : public SvXMLImportContext
......
...@@ -244,8 +244,8 @@ SchXMLSeries2Context::SchXMLSeries2Context( ...@@ -244,8 +244,8 @@ SchXMLSeries2Context::SchXMLSeries2Context(
SvXMLImport& rImport, const OUString& rLocalName, SvXMLImport& rImport, const OUString& rLocalName,
const Reference< chart2::XChartDocument > & xNewDoc, const Reference< chart2::XChartDocument > & xNewDoc,
std::vector< SchXMLAxis >& rAxes, std::vector< SchXMLAxis >& rAxes,
::std::list< DataRowPointStyle >& rStyleList, ::std::vector< DataRowPointStyle >& rStyleVector,
::std::list< RegressionStyle >& rRegressionStyleList, ::std::vector< RegressionStyle >& rRegressionStyleVector,
sal_Int32 nSeriesIndex, sal_Int32 nSeriesIndex,
bool bStockHasVolume, bool bStockHasVolume,
GlobalSeriesImportInfo& rGlobalSeriesImportInfo, GlobalSeriesImportInfo& rGlobalSeriesImportInfo,
...@@ -257,8 +257,8 @@ SchXMLSeries2Context::SchXMLSeries2Context( ...@@ -257,8 +257,8 @@ SchXMLSeries2Context::SchXMLSeries2Context(
mrImportHelper( rImpHelper ), mrImportHelper( rImpHelper ),
mxNewDoc( xNewDoc ), mxNewDoc( xNewDoc ),
mrAxes( rAxes ), mrAxes( rAxes ),
mrStyleList( rStyleList ), mrStyleVector( rStyleVector ),
mrRegressionStyleList( rRegressionStyleList ), mrRegressionStyleVector( rRegressionStyleVector ),
m_xSeries(nullptr), m_xSeries(nullptr),
mnSeriesIndex( nSeriesIndex ), mnSeriesIndex( nSeriesIndex ),
mnDataPointIndex( 0 ), mnDataPointIndex( 0 ),
...@@ -604,7 +604,7 @@ void SchXMLSeries2Context::EndElement() ...@@ -604,7 +604,7 @@ void SchXMLSeries2Context::EndElement()
-1, 1, -1, 1,
msAutoStyleName, mnAttachedAxis ); msAutoStyleName, mnAttachedAxis );
aStyle.mbSymbolSizeForSeriesIsMissingInFile=mbSymbolSizeIsMissingInFile; aStyle.mbSymbolSizeForSeriesIsMissingInFile=mbSymbolSizeIsMissingInFile;
mrStyleList.push_back( aStyle ); mrStyleVector.push_back( aStyle );
} }
} }
...@@ -660,28 +660,28 @@ SvXMLImportContextRef SchXMLSeries2Context::CreateChildContext( ...@@ -660,28 +660,28 @@ SvXMLImportContextRef SchXMLSeries2Context::CreateChildContext(
pContext = new SchXMLStatisticsObjectContext( pContext = new SchXMLStatisticsObjectContext(
mrImportHelper, GetImport(), mrImportHelper, GetImport(),
nPrefix, rLocalName, msAutoStyleName, nPrefix, rLocalName, msAutoStyleName,
mrStyleList, m_xSeries, mrStyleVector, m_xSeries,
SchXMLStatisticsObjectContext::CONTEXT_TYPE_MEAN_VALUE_LINE, SchXMLStatisticsObjectContext::CONTEXT_TYPE_MEAN_VALUE_LINE,
mrLSequencesPerIndex ); mrLSequencesPerIndex );
break; break;
case XML_TOK_SERIES_REGRESSION_CURVE: case XML_TOK_SERIES_REGRESSION_CURVE:
pContext = new SchXMLRegressionCurveObjectContext( pContext = new SchXMLRegressionCurveObjectContext(
mrImportHelper, GetImport(), mrImportHelper, GetImport(),
nPrefix, rLocalName, mrRegressionStyleList, nPrefix, rLocalName, mrRegressionStyleVector,
m_xSeries, maChartSize ); m_xSeries, maChartSize );
break; break;
case XML_TOK_SERIES_ERROR_INDICATOR: case XML_TOK_SERIES_ERROR_INDICATOR:
pContext = new SchXMLStatisticsObjectContext( pContext = new SchXMLStatisticsObjectContext(
mrImportHelper, GetImport(), mrImportHelper, GetImport(),
nPrefix, rLocalName, msAutoStyleName, nPrefix, rLocalName, msAutoStyleName,
mrStyleList, m_xSeries, mrStyleVector, m_xSeries,
SchXMLStatisticsObjectContext::CONTEXT_TYPE_ERROR_INDICATOR, SchXMLStatisticsObjectContext::CONTEXT_TYPE_ERROR_INDICATOR,
mrLSequencesPerIndex ); mrLSequencesPerIndex );
break; break;
case XML_TOK_SERIES_DATA_POINT: case XML_TOK_SERIES_DATA_POINT:
pContext = new SchXMLDataPointContext( GetImport(), rLocalName, pContext = new SchXMLDataPointContext( GetImport(), rLocalName,
mrStyleList, m_xSeries, mnDataPointIndex, mbSymbolSizeIsMissingInFile ); mrStyleVector, m_xSeries, mnDataPointIndex, mbSymbolSizeIsMissingInFile );
break; break;
case XML_TOK_SERIES_PROPERTY_MAPPING: case XML_TOK_SERIES_PROPERTY_MAPPING:
pContext = new SchXMLPropertyMappingContext( mrImportHelper, pContext = new SchXMLPropertyMappingContext( mrImportHelper,
...@@ -700,12 +700,12 @@ SvXMLImportContextRef SchXMLSeries2Context::CreateChildContext( ...@@ -700,12 +700,12 @@ SvXMLImportContextRef SchXMLSeries2Context::CreateChildContext(
void SchXMLSeries2Context::initSeriesPropertySets( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles void SchXMLSeries2Context::initSeriesPropertySets( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles
, const uno::Reference< frame::XModel >& xChartModel ) , 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 // iterate over series first and remind propertysets in map
// new api <-> old api wrapper // new api <-> old api wrapper
::std::map< Reference< chart2::XDataSeries >, Reference< beans::XPropertySet > > aSeriesMap; ::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 ) if( iStyle->meType != DataRowPointStyle::DATA_SERIES )
continue; continue;
...@@ -718,7 +718,7 @@ void SchXMLSeries2Context::initSeriesPropertySets( SeriesDefaultsAndStyles& rSer ...@@ -718,7 +718,7 @@ void SchXMLSeries2Context::initSeriesPropertySets( SeriesDefaultsAndStyles& rSer
} }
//initialize m_xOldAPISeries for all other styles also //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 ) if( iStyle->meType == DataRowPointStyle::DATA_SERIES )
continue; continue;
...@@ -729,11 +729,11 @@ void SchXMLSeries2Context::initSeriesPropertySets( SeriesDefaultsAndStyles& rSer ...@@ -729,11 +729,11 @@ void SchXMLSeries2Context::initSeriesPropertySets( SeriesDefaultsAndStyles& rSer
//static //static
void SchXMLSeries2Context::setDefaultsToSeries( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles ) void SchXMLSeries2Context::setDefaultsToSeries( SeriesDefaultsAndStyles& rSeriesDefaultsAndStyles )
{ {
::std::list< DataRowPointStyle >::iterator iStyle; ::std::vector< DataRowPointStyle >::iterator iStyle;
// iterate over series // iterate over series
// call initSeriesPropertySets first // 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 ) if( iStyle->meType != DataRowPointStyle::DATA_SERIES )
continue; continue;
...@@ -784,10 +784,10 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe ...@@ -784,10 +784,10 @@ void SchXMLSeries2Context::setStylesToSeries( SeriesDefaultsAndStyles& rSeriesDe
, bool bIsStockChart , bool bIsStockChart
, tSchXMLLSequencesPerIndex & rInOutLSequencesPerIndex ) , tSchXMLLSequencesPerIndex & rInOutLSequencesPerIndex )
{ {
::std::list< DataRowPointStyle >::iterator iStyle; ::std::vector< DataRowPointStyle >::iterator iStyle;
// iterate over series // 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 ) if( iStyle->meType == DataRowPointStyle::DATA_SERIES )
{ {
...@@ -872,10 +872,10 @@ void SchXMLSeries2Context::setStylesToRegressionCurves( ...@@ -872,10 +872,10 @@ void SchXMLSeries2Context::setStylesToRegressionCurves(
const SvXMLStyleContext*& rpStyle, const SvXMLStyleContext*& rpStyle,
OUString const & rCurrentStyleName ) OUString const & rCurrentStyleName )
{ {
std::list< RegressionStyle >::iterator iStyle; std::vector< RegressionStyle >::iterator iStyle;
// iterate over regession etc // 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 try
{ {
...@@ -942,10 +942,10 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles ...@@ -942,10 +942,10 @@ void SchXMLSeries2Context::setStylesToStatisticsObjects( SeriesDefaultsAndStyles
, const SvXMLStyleContext*& rpStyle , const SvXMLStyleContext*& rpStyle
, OUString& rCurrStyleName ) , OUString& rCurrStyleName )
{ {
::std::list< DataRowPointStyle >::iterator iStyle; ::std::vector< DataRowPointStyle >::iterator iStyle;
// iterate over regession etc // 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 || if( iStyle->meType == DataRowPointStyle::ERROR_INDICATOR ||
iStyle->meType == DataRowPointStyle::MEAN_VALUE ) iStyle->meType == DataRowPointStyle::MEAN_VALUE )
...@@ -1016,8 +1016,8 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri ...@@ -1016,8 +1016,8 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri
, const SvXMLImport& rImport , const SvXMLImport& rImport
, bool bIsStockChart, bool bIsDonutChart, bool bSwitchOffLinesForScatter ) , bool bIsStockChart, bool bIsDonutChart, bool bSwitchOffLinesForScatter )
{ {
::std::list< DataRowPointStyle >::iterator iStyle; ::std::vector< DataRowPointStyle >::iterator iStyle;
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_POINT ) if( iStyle->meType != DataRowPointStyle::DATA_POINT )
continue; continue;
...@@ -1104,12 +1104,12 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri ...@@ -1104,12 +1104,12 @@ void SchXMLSeries2Context::setStylesToDataPoints( SeriesDefaultsAndStyles& rSeri
} }
//static //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 // 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 ) if( iStyle->meType != DataRowPointStyle::DATA_SERIES )
continue; continue;
......
...@@ -45,8 +45,8 @@ private: ...@@ -45,8 +45,8 @@ private:
SchXMLImportHelper& mrImportHelper; SchXMLImportHelper& mrImportHelper;
css::uno::Reference< css::chart2::XChartDocument > mxNewDoc; css::uno::Reference< css::chart2::XChartDocument > mxNewDoc;
::std::vector< SchXMLAxis >& mrAxes; ::std::vector< SchXMLAxis >& mrAxes;
::std::list< DataRowPointStyle >& mrStyleList; ::std::vector< DataRowPointStyle >& mrStyleVector;
::std::list< RegressionStyle >& mrRegressionStyleList; ::std::vector< RegressionStyle >& mrRegressionStyleVector;
css::uno::Reference< css::chart2::XDataSeries > m_xSeries; css::uno::Reference< css::chart2::XDataSeries > m_xSeries;
sal_Int32 mnSeriesIndex; sal_Int32 mnSeriesIndex;
...@@ -74,8 +74,8 @@ public: ...@@ -74,8 +74,8 @@ public:
SvXMLImport& rImport, const OUString& rLocalName, SvXMLImport& rImport, const OUString& rLocalName,
const css::uno::Reference< css::chart2::XChartDocument > & xNewDoc, const css::uno::Reference< css::chart2::XChartDocument > & xNewDoc,
std::vector< SchXMLAxis >& rAxes, std::vector< SchXMLAxis >& rAxes,
::std::list< DataRowPointStyle >& rStyleList, ::std::vector< DataRowPointStyle >& rStyleVector,
::std::list< RegressionStyle >& rRegressionStyleList, ::std::vector< RegressionStyle >& rRegressionStyleVector,
sal_Int32 nSeriesIndex, sal_Int32 nSeriesIndex,
bool bStockHasVolume, bool bStockHasVolume,
GlobalSeriesImportInfo& rGlobalSeriesImportInfo, GlobalSeriesImportInfo& rGlobalSeriesImportInfo,
...@@ -125,7 +125,7 @@ public: ...@@ -125,7 +125,7 @@ public:
, const SvXMLImport& rImport , const SvXMLImport& rImport
, bool bIsStockChart, bool bIsDonutChart, bool bSwitchOffLinesForScatter ); , 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 // INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLSERIES2CONTEXT_HXX
......
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