From 14cb391feda461be087aafa090381cba54325d24 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 13 Jan 2016 17:03:00 +0100
Subject: sc: replace boost::ptr_map with std::map<std::unique_ptr>

Change-Id: Id503e8eb2404faaeb2486fa640d21db23e57e643
---
 sc/source/filter/excel/xichart.cxx | 16 ++++++++--------
 sc/source/filter/inc/xichart.hxx   |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'sc')

diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index be226cb5cf19..c9e884d7f187 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2799,17 +2799,17 @@ Reference< XLabeledDataSequence > XclImpChTypeGroup::CreateCategSequence() const
 
 void XclImpChTypeGroup::ReadChDropBar( XclImpStream& rStrm )
 {
-    if (maDropBars.find(EXC_CHDROPBAR_UP) == maDropBars.end())
+    if (m_DropBars.find(EXC_CHDROPBAR_UP) == m_DropBars.end())
     {
         unique_ptr<XclImpChDropBar> p(new XclImpChDropBar(EXC_CHDROPBAR_UP));
         p->ReadRecordGroup(rStrm);
-        o3tl::ptr_container::insert(maDropBars, EXC_CHDROPBAR_UP, std::move(p));
+        m_DropBars.insert(std::make_pair(EXC_CHDROPBAR_UP, std::move(p)));
     }
-    else if(maDropBars.find(EXC_CHDROPBAR_DOWN) == maDropBars.end())
+    else if (m_DropBars.find(EXC_CHDROPBAR_DOWN) == m_DropBars.end())
     {
         unique_ptr<XclImpChDropBar> p(new XclImpChDropBar(EXC_CHDROPBAR_DOWN));
         p->ReadRecordGroup(rStrm);
-        o3tl::ptr_container::insert(maDropBars, EXC_CHDROPBAR_DOWN, std::move(p));
+        m_DropBars.insert(std::make_pair(EXC_CHDROPBAR_DOWN, std::move(p)));
     }
 }
 
@@ -2927,17 +2927,17 @@ void XclImpChTypeGroup::CreateStockSeries( Reference< XChartType > xChartType, s
             xHiLoLine->second->Convert( GetChRoot(), aSeriesProp, EXC_CHOBJTYPE_HILOLINE );
         }
         // white dropbar format
-        XclImpChDropBarMap::const_iterator itr = maDropBars.find(EXC_CHDROPBAR_UP);
+        XclImpChDropBarMap::const_iterator itr = m_DropBars.find(EXC_CHDROPBAR_UP);
         Reference<XPropertySet> xWhitePropSet;
-        if (itr != maDropBars.end() && aTypeProp.GetProperty(xWhitePropSet, EXC_CHPROP_WHITEDAY))
+        if (itr != m_DropBars.end() && aTypeProp.GetProperty(xWhitePropSet, EXC_CHPROP_WHITEDAY))
         {
             ScfPropertySet aBarProp( xWhitePropSet );
             itr->second->Convert(GetChRoot(), aBarProp);
         }
         // black dropbar format
-        itr = maDropBars.find(EXC_CHDROPBAR_DOWN);
+        itr = m_DropBars.find(EXC_CHDROPBAR_DOWN);
         Reference<XPropertySet> xBlackPropSet;
-        if (itr != maDropBars.end() && aTypeProp.GetProperty(xBlackPropSet, EXC_CHPROP_BLACKDAY))
+        if (itr != m_DropBars.end() && aTypeProp.GetProperty(xBlackPropSet, EXC_CHPROP_BLACKDAY))
         {
             ScfPropertySet aBarProp( xBlackPropSet );
             itr->second->Convert(GetChRoot(), aBarProp);
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 2aa1ff817e23..b57ecbd24435 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -1022,7 +1022,7 @@ private:
     /** 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(); }
     /** Returns true, if the chart type group contains drop bar formats. */
-    inline bool         HasDropBars() const { return !maDropBars.empty(); }
+    inline bool         HasDropBars() const { return !m_DropBars.empty(); }
 
     /** Inserts the passed series into the chart type. Adds additional properties to the series. */
     void                InsertDataSeries( css::uno::Reference< css::chart2::XChartType > xChartType,
@@ -1037,7 +1037,7 @@ private:
 
 private:
     typedef ::std::vector< XclImpChSeriesRef >               XclImpChSeriesVec;
-    typedef boost::ptr_map<sal_uInt16, XclImpChDropBar>      XclImpChDropBarMap;
+    typedef ::std::map<sal_uInt16, std::unique_ptr<XclImpChDropBar>> XclImpChDropBarMap;
     typedef boost::ptr_map<sal_uInt16, XclImpChLineFormat>   XclImpChLineFormatMap;
     typedef ::std::set< sal_uInt16 >                         UInt16Set;
 
@@ -1048,7 +1048,7 @@ private:
     XclImpChSeriesRef   mxFirstSeries;      /// First series in this chart type group (CHSERIES groups).
     XclImpChChart3dRef  mxChart3d;          /// 3D settings (CHCHART3D record).
     XclImpChLegendRef   mxLegend;           /// Chart legend (CHLEGEND group).
-    XclImpChDropBarMap  maDropBars;         /// Dropbars (CHDROPBAR group).
+    XclImpChDropBarMap  m_DropBars;         /// Dropbars (CHDROPBAR group).
     XclImpChLineFormatMap maChartLines;     /// Global line formats (CHCHARTLINE group).
     XclImpChDataFormatRef mxGroupFmt;       /// Default format for all series (CHDATAFORMAT group).
     UInt16Set           maUnusedFormats;    /// Contains unused format indexes for automatic colors.
-- 
cgit