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

[Miklos Vajna]

 sw/source/core/table/swnewtable.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit fd3d1bbaa9ab338f374fd20798fca71a888c9ab7
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Sep 2 09:10:19 2015 +0200

    sw: use std::unique_ptr<> in swnewtable
    
    Change-Id: Iddc51cd927fa4e2e44c094909892102158f07389

diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index 4024b09..2f7a9f8 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -36,7 +36,6 @@
 #include <set>
 #include <list>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 #include <editeng/boxitem.hxx>
 #include <editeng/protitem.hxx>
 #include <swtblfmt.hxx>
@@ -819,7 +818,7 @@ bool SwTable::PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
     }
     CHECK_TABLE( *this )
     // We have to assert a "rectangular" box selection before we start to merge
-    boost::scoped_ptr< SwBoxSelection > pSel( CollectBoxSelection( rPam ) );
+    std::unique_ptr< SwBoxSelection > pSel( CollectBoxSelection( rPam ) );
     if( !pSel.get() || pSel->isEmpty() )
         return false;
     // Now we should have a rectangle of boxes,