summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-01-13 17:07:11 +0100
committerMichael Stahl <mstahl@redhat.com>2016-01-13 17:53:13 +0100
commit3e53470184f0398429004e836fe6e9bdd08f2240 (patch)
tree510c86ac1ddf9a2cb2a0b4b0b7060a0a28447bfd /sc
parent14cb391feda461be087aafa090381cba54325d24 (diff)
sc: replace boost::ptr_map with std::map
Change-Id: I21fbba963e595377a0f6e9151e5510c660d8ca5f
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/excel/xichart.cxx12
-rw-r--r--sc/source/filter/inc/xichart.hxx6
2 files changed, 9 insertions, 9 deletions
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index c9e884d7f187..63a639511c70 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2741,8 +2741,8 @@ bool XclImpChTypeGroup::HasConnectorLines() const
// existence of connector lines (only in stacked bar charts)
if ( !(maType.IsStacked() || maType.IsPercent()) || (maTypeInfo.meTypeCateg != EXC_CHTYPECATEG_BAR) )
return false;
- XclImpChLineFormatMap::const_iterator xConLine = maChartLines.find( EXC_CHCHARTLINE_CONNECT );
- return ( xConLine != maChartLines.end() && xConLine->second->HasLine() );
+ XclImpChLineFormatMap::const_iterator xConLine = m_ChartLines.find(EXC_CHCHARTLINE_CONNECT);
+ return (xConLine != m_ChartLines.end() && xConLine->second.HasLine());
}
OUString XclImpChTypeGroup::GetSingleSeriesTitle() const
@@ -2820,7 +2820,7 @@ void XclImpChTypeGroup::ReadChChartLine( XclImpStream& rStrm )
{
XclImpChLineFormat xLineFmt;
xLineFmt.ReadChLineFormat( rStrm );
- maChartLines[ nLineId ] = xLineFmt;
+ m_ChartLines[ nLineId ] = xLineFmt;
}
}
@@ -2920,11 +2920,11 @@ void XclImpChTypeGroup::CreateStockSeries( Reference< XChartType > xChartType, s
aTypeProp.SetBoolProperty( EXC_CHPROP_SHOWFIRST, HasDropBars() );
aTypeProp.SetBoolProperty( EXC_CHPROP_SHOWHIGHLOW, true );
// hi-lo line format
- XclImpChLineFormatMap::const_iterator xHiLoLine = maChartLines.find( EXC_CHCHARTLINE_HILO );
- if ( xHiLoLine != maChartLines.end() )
+ XclImpChLineFormatMap::const_iterator xHiLoLine = m_ChartLines.find( EXC_CHCHARTLINE_HILO );
+ if (xHiLoLine != m_ChartLines.end())
{
ScfPropertySet aSeriesProp( xDataSeries );
- xHiLoLine->second->Convert( GetChRoot(), aSeriesProp, EXC_CHOBJTYPE_HILOLINE );
+ xHiLoLine->second.Convert( GetChRoot(), aSeriesProp, EXC_CHOBJTYPE_HILOLINE );
}
// white dropbar format
XclImpChDropBarMap::const_iterator itr = m_DropBars.find(EXC_CHDROPBAR_UP);
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index b57ecbd24435..6410aece5b34 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -1020,7 +1020,7 @@ private:
void ReadChDataFormat( XclImpStream& rStrm );
/** Returns true, if the chart type group contains a hi-lo line format. */
- inline bool HasHiLoLine() const { return maChartLines.find( EXC_CHCHARTLINE_HILO ) != maChartLines.end(); }
+ inline bool HasHiLoLine() const { return m_ChartLines.find(EXC_CHCHARTLINE_HILO) != m_ChartLines.end(); }
/** Returns true, if the chart type group contains drop bar formats. */
inline bool HasDropBars() const { return !m_DropBars.empty(); }
@@ -1038,7 +1038,7 @@ private:
private:
typedef ::std::vector< XclImpChSeriesRef > XclImpChSeriesVec;
typedef ::std::map<sal_uInt16, std::unique_ptr<XclImpChDropBar>> XclImpChDropBarMap;
- typedef boost::ptr_map<sal_uInt16, XclImpChLineFormat> XclImpChLineFormatMap;
+ typedef ::std::map<sal_uInt16, XclImpChLineFormat> XclImpChLineFormatMap;
typedef ::std::set< sal_uInt16 > UInt16Set;
XclChTypeGroup maData; /// Contents of the CHTYPEGROUP record.
@@ -1049,7 +1049,7 @@ private:
XclImpChChart3dRef mxChart3d; /// 3D settings (CHCHART3D record).
XclImpChLegendRef mxLegend; /// Chart legend (CHLEGEND group).
XclImpChDropBarMap m_DropBars; /// Dropbars (CHDROPBAR group).
- XclImpChLineFormatMap maChartLines; /// Global line formats (CHCHARTLINE group).
+ XclImpChLineFormatMap m_ChartLines; /// Global line formats (CHCHARTLINE group).
XclImpChDataFormatRef mxGroupFmt; /// Default format for all series (CHDATAFORMAT group).
UInt16Set maUnusedFormats; /// Contains unused format indexes for automatic colors.
};