diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-12 10:16:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-12 10:45:05 +0200 |
| commit | f7b9212610edee748ceb0ebaa243def995b1951c (patch) | |
| tree | 11d932796ee4d562a5c47262cc382919a9edc0aa /sc | |
| parent | 49b2208ffab0631a8aa150c26086f722aa8d978d (diff) | |
sc: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I4629d67b8cc69a2ace5a20f3d22505d7fc1ad10b
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xistyle.cxx | 2 | ||||
| -rw-r--r-- | sc/source/filter/inc/xistyle.hxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 21894beb18eb..4ff74b58780e 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -1569,7 +1569,7 @@ void XclImpXFBuffer::ReadXF( XclImpStream& rStrm ) { XclImpXF* pXF = new XclImpXF( GetRoot() ); pXF->ReadXF( rStrm ); - maXFList.push_back( pXF ); + maXFList.push_back( std::unique_ptr<XclImpXF>(pXF) ); } void XclImpXFBuffer::ReadStyle( XclImpStream& rStrm ) diff --git a/sc/source/filter/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index 01e614ddda68..1fd2978d008f 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -489,10 +489,10 @@ public: /** Returns the object that stores all contents of an XF record. */ inline XclImpXF* GetXF( sal_uInt16 nXFIndex ) - { return (nXFIndex >= maXFList.size()) ? nullptr : &maXFList.at(nXFIndex); } + { return (nXFIndex >= maXFList.size()) ? nullptr : maXFList.at(nXFIndex).get(); } inline const XclImpXF* GetXF( sal_uInt16 nXFIndex ) const - { return (nXFIndex >= maXFList.size()) ? nullptr : &maXFList.at(nXFIndex); } + { return (nXFIndex >= maXFList.size()) ? nullptr : maXFList.at(nXFIndex).get(); } /** Returns the index to the Excel font used in the specified XF record. */ sal_uInt16 GetFontIndex( sal_uInt16 nXFIndex ) const; @@ -509,7 +509,7 @@ private: typedef std::vector< std::unique_ptr<XclImpStyle> > XclImpStyleList; typedef ::std::map< sal_uInt16, XclImpStyle* > XclImpStyleMap; - boost::ptr_vector< XclImpXF > maXFList; /// List of contents of all XF record. + std::vector< std::unique_ptr<XclImpXF> > maXFList; /// List of contents of all XF record. XclImpStyleList maBuiltinStyles; /// List of built-in cell styles. XclImpStyleList maUserStyles; /// List of user defined cell styles. XclImpStyleMap maStylesByXf; /// Maps XF records to cell styles. |