[Libreoffice-commits] core.git: sw/inc sw/source

[Michael Stahl]

 sw/inc/tblsel.hxx                |    3 +--
 sw/source/core/frmedt/tblsel.cxx |    3 +--
 sw/source/core/inc/tblrwcl.hxx   |    4 ++++
 3 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 86aebe9e5b084a737ce18e4620e8d8f0998eb5a1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Sep 9 17:28:19 2015 +0200

    sw: replace boost::ptr_vector with std::vector
    
    Change-Id: I6bef6fc863034b162459a46d332fa66a06916e7f

diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 1b7000e..cf12758 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -23,7 +23,6 @@
 #include <swrect.hxx>
 #include "swdllapi.h"
 
-#include <boost/ptr_container/ptr_vector.hpp>
 #include <o3tl/sorted_vector.hxx>
 
 #include <memory>
@@ -137,7 +136,7 @@ public:
 
 // Determines tables affected by a table selection and union rectangles
 // 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
 // - also for split tables.
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 26a5d16..26ef88f 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -1921,8 +1921,7 @@ void MakeSelUnions( SwSelUnions& rUnions, const SwLayoutFrm *pStart,
 
         if( (aUnion.*fnRect->fnGetWidth)() )
         {
-            SwSelUnion *pTmp = new SwSelUnion( aUnion, const_cast<SwTabFrm*>(pTable) );
-            rUnions.push_back( pTmp );
+            rUnions.push_back(SwSelUnion(aUnion, const_cast<SwTabFrm*>(pTable)));
         }
 
         pTable = pTable->GetFollow();
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index e23a41e..46c50cc 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -18,8 +18,12 @@
  */
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_TBLRWCL_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_TBLRWCL_HXX
+
 #include <cstddef>
 #include <vector>
+
+#include <boost/ptr_container/ptr_vector.hpp>
+
 #include <swtypes.hxx>
 #include <tblsel.hxx>
 #include <swtable.hxx>