diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-12 12:42:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-11-13 10:54:17 +0200 |
| commit | 438a3f77e3814f90e2e3727e6d482d66e3259d36 (patch) | |
| tree | c3875a136cf71e7dc74c551ffbe9eb92de9495f6 | |
| parent | b3206e487403ab0da089010b8a56fa6b5d9edd56 (diff) | |
sc: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I07e0a63261eb988ec45ba0432079978e18d7cc38
| -rw-r--r-- | sc/source/filter/excel/impop.cxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/inc/imp_op.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 8e34342cf017..1d24749aca16 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -1228,7 +1228,7 @@ void ImportExcel::NewTable() InitializeTable( nTab ); XclImpOutlineDataBuffer* pNewItem = new XclImpOutlineDataBuffer( GetRoot(), nTab ); - pOutlineListBuffer->push_back( pNewItem ); + pOutlineListBuffer->push_back( std::unique_ptr<XclImpOutlineDataBuffer>(pNewItem) ); pExcRoot->pColRowBuff = pColRowBuff = pNewItem->GetColRowBuff(); pColOutlineBuff = pNewItem->GetColOutline(); pRowOutlineBuff = pNewItem->GetRowOutline(); @@ -1259,7 +1259,7 @@ void ImportExcel::PostDocLoad() // outlines for all sheets, sets hidden rows and columns (#i11776# after filtered ranges) for (XclImpOutlineListBuffer::iterator itBuffer = pOutlineListBuffer->begin(); itBuffer != pOutlineListBuffer->end(); ++itBuffer) - itBuffer->Convert(); + (*itBuffer)->Convert(); // document view settings (before visible OLE area) GetDocViewSettings().Finalize(); diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index df0111578053..e5455330c047 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -32,7 +32,7 @@ #include "excdefs.hxx" #include <rtl/ref.hxx> -#include <boost/ptr_container/ptr_vector.hpp> +#include <vector> #include <memory> #include <unordered_map> @@ -107,7 +107,7 @@ protected: XclImpOutlineBuffer* pRowOutlineBuff; XclImpColRowSettings* pColRowBuff; // Col/Row settings 1 table - typedef boost::ptr_vector< XclImpOutlineDataBuffer > XclImpOutlineListBuffer; + typedef std::vector< std::unique_ptr<XclImpOutlineDataBuffer> > XclImpOutlineListBuffer; XclImpOutlineListBuffer* pOutlineListBuffer; LastFormulaMapType maLastFormulaCells; // Keep track of last formula cells in each column. |