Kaydet (Commit) 86aebe9e authored tarafından Michael Stahl's avatar Michael Stahl

sw: replace boost::ptr_vector with std::vector

Change-Id: I6bef6fc863034b162459a46d332fa66a06916e7f
üst b70669e4
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <swrect.hxx> #include <swrect.hxx>
#include "swdllapi.h" #include "swdllapi.h"
#include <boost/ptr_container/ptr_vector.hpp>
#include <o3tl/sorted_vector.hxx> #include <o3tl/sorted_vector.hxx>
#include <memory> #include <memory>
...@@ -137,7 +136,7 @@ public: ...@@ -137,7 +136,7 @@ public:
// Determines tables affected by a table selection and union rectangles // Determines tables affected by a table selection and union rectangles
// of the selection (also for split tables) // of the selection (also for split tables)
typedef boost::ptr_vector<SwSelUnion> SwSelUnions; typedef std::vector<SwSelUnion> SwSelUnions;
// Gets the tables involved in a table selection and the union-rectangles of the selections // Gets the tables involved in a table selection and the union-rectangles of the selections
// - also for split tables. // - also for split tables.
......
...@@ -1921,8 +1921,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart, ...@@ -1921,8 +1921,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
if( (aUnion.*fnRect->fnGetWidth)() ) if( (aUnion.*fnRect->fnGetWidth)() )
{ {
SwSelUnion *pTmp = new SwSelUnion( aUnion, const_cast<SwTabFrm*>(pTable) ); rUnions.push_back(SwSelUnion(aUnion, const_cast<SwTabFrm*>(pTable)));
rUnions.push_back( pTmp );
} }
pTable = pTable->GetFollow(); pTable = pTable->GetFollow();
......
...@@ -18,8 +18,12 @@ ...@@ -18,8 +18,12 @@
*/ */
#ifndef INCLUDED_SW_SOURCE_CORE_INC_TBLRWCL_HXX #ifndef INCLUDED_SW_SOURCE_CORE_INC_TBLRWCL_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_TBLRWCL_HXX #define INCLUDED_SW_SOURCE_CORE_INC_TBLRWCL_HXX
#include <cstddef> #include <cstddef>
#include <vector> #include <vector>
#include <boost/ptr_container/ptr_vector.hpp>
#include <swtypes.hxx> #include <swtypes.hxx>
#include <tblsel.hxx> #include <tblsel.hxx>
#include <swtable.hxx> #include <swtable.hxx>
......
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