diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-13 17:09:37 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-13 17:53:13 +0100 |
| commit | 09943011f08fd4853c486376b8820eba1dcc9dbc (patch) | |
| tree | f07a06cceae53b32214b11d7346357e2a05ce3ad /sc/source | |
| parent | 3e53470184f0398429004e836fe6e9bdd08f2240 (diff) | |
sc: replace boost::ptr_map with std::map<std::unique_ptr>
Change-Id: Ib97ddc8871774eb5faca35a8b4193599dc6f25ef
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/filter/excel/xichart.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/inc/xichart.hxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 63a639511c70..1454df33f8a3 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -3854,7 +3854,7 @@ void XclImpChChart::ReadChDefaultText( XclImpStream& rStrm ) { unique_ptr<XclImpChText> pText(new XclImpChText(GetChRoot())); pText->ReadRecordGroup(rStrm); - o3tl::ptr_container::insert(maDefTexts, nTextId, std::move(pText)); + m_DefTexts.insert(std::make_pair(nTextId, std::move(pText))); } } @@ -3904,8 +3904,8 @@ const XclImpChText* XclImpChChart::GetDefaultText( XclChTextType eTextType ) con case EXC_CHTEXTTYPE_DATALABEL: nDefTextId = bBiff8 ? EXC_CHDEFTEXT_AXESSET : EXC_CHDEFTEXT_GLOBAL; break; } - XclImpChTextMap::const_iterator itr = maDefTexts.find(nDefTextId); - return itr == maDefTexts.end() ? nullptr : itr->second; + XclImpChTextMap::const_iterator const itr = m_DefTexts.find(nDefTextId); + return itr == m_DefTexts.end() ? nullptr : itr->second.get(); } bool XclImpChChart::IsManualPlotArea() const diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 6410aece5b34..61a81552ec4e 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -1334,14 +1334,14 @@ private: private: typedef ::std::vector< XclImpChSeriesRef > XclImpChSeriesVec; typedef ::std::map<XclChDataPointPos, XclImpChDataFormatRef> XclImpChDataFormatMap; - typedef ::boost::ptr_map<sal_uInt16, XclImpChText> XclImpChTextMap; + typedef ::std::map<sal_uInt16, std::unique_ptr<XclImpChText>> XclImpChTextMap; XclChRectangle maRect; /// Position of the chart on the sheet (CHCHART record). XclImpChSeriesVec maSeries; /// List of series data (CHSERIES groups). XclImpChDataFormatMap maDataFmts; /// All series and point formats (CHDATAFORMAT groups). XclImpChFrameRef mxFrame; /// Chart frame format (CHFRAME group). XclChProperties maProps; /// Chart properties (CHPROPERTIES record). - XclImpChTextMap maDefTexts; /// Default text objects (CHDEFAULTTEXT groups). + XclImpChTextMap m_DefTexts; /// Default text objects (CHDEFAULTTEXT groups). XclImpChAxesSetRef mxPrimAxesSet; /// Primary axes set (CHAXESSET group). XclImpChAxesSetRef mxSecnAxesSet; /// Secondary axes set (CHAXESSET group). XclImpChTextRef mxTitle; /// Chart title (CHTEXT group). |