Kaydet (Commit) 438a3f77 authored tarafından Noel Grandin's avatar Noel Grandin

sc: boost::ptr_vector->std::vector<std::unique_ptr>

Change-Id: I07e0a63261eb988ec45ba0432079978e18d7cc38
üst b3206e48
...@@ -1228,7 +1228,7 @@ void ImportExcel::NewTable() ...@@ -1228,7 +1228,7 @@ void ImportExcel::NewTable()
InitializeTable( nTab ); InitializeTable( nTab );
XclImpOutlineDataBuffer* pNewItem = new XclImpOutlineDataBuffer( GetRoot(), nTab ); XclImpOutlineDataBuffer* pNewItem = new XclImpOutlineDataBuffer( GetRoot(), nTab );
pOutlineListBuffer->push_back( pNewItem ); pOutlineListBuffer->push_back( std::unique_ptr<XclImpOutlineDataBuffer>(pNewItem) );
pExcRoot->pColRowBuff = pColRowBuff = pNewItem->GetColRowBuff(); pExcRoot->pColRowBuff = pColRowBuff = pNewItem->GetColRowBuff();
pColOutlineBuff = pNewItem->GetColOutline(); pColOutlineBuff = pNewItem->GetColOutline();
pRowOutlineBuff = pNewItem->GetRowOutline(); pRowOutlineBuff = pNewItem->GetRowOutline();
...@@ -1259,7 +1259,7 @@ void ImportExcel::PostDocLoad() ...@@ -1259,7 +1259,7 @@ void ImportExcel::PostDocLoad()
// outlines for all sheets, sets hidden rows and columns (#i11776# after filtered ranges) // outlines for all sheets, sets hidden rows and columns (#i11776# after filtered ranges)
for (XclImpOutlineListBuffer::iterator itBuffer = pOutlineListBuffer->begin(); itBuffer != pOutlineListBuffer->end(); ++itBuffer) for (XclImpOutlineListBuffer::iterator itBuffer = pOutlineListBuffer->begin(); itBuffer != pOutlineListBuffer->end(); ++itBuffer)
itBuffer->Convert(); (*itBuffer)->Convert();
// document view settings (before visible OLE area) // document view settings (before visible OLE area)
GetDocViewSettings().Finalize(); GetDocViewSettings().Finalize();
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "excdefs.hxx" #include "excdefs.hxx"
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <boost/ptr_container/ptr_vector.hpp> #include <vector>
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
...@@ -107,7 +107,7 @@ protected: ...@@ -107,7 +107,7 @@ protected:
XclImpOutlineBuffer* pRowOutlineBuff; XclImpOutlineBuffer* pRowOutlineBuff;
XclImpColRowSettings* pColRowBuff; // Col/Row settings 1 table XclImpColRowSettings* pColRowBuff; // Col/Row settings 1 table
typedef boost::ptr_vector< XclImpOutlineDataBuffer > XclImpOutlineListBuffer; typedef std::vector< std::unique_ptr<XclImpOutlineDataBuffer> > XclImpOutlineListBuffer;
XclImpOutlineListBuffer* pOutlineListBuffer; XclImpOutlineListBuffer* pOutlineListBuffer;
LastFormulaMapType maLastFormulaCells; // Keep track of last formula cells in each column. LastFormulaMapType maLastFormulaCells; // Keep track of last formula cells in each column.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment