From 09800956191c90035872cbc18cd304fee043c710 Mon Sep 17 00:00:00 2001
From: Takeshi Abe <tabe@fixedpoint.jp>
Date: Mon, 15 Jun 2015 17:58:15 +0900
Subject: Replace boost::scoped_array<T> with std::unique_ptr<T[]>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This may reduce some degree of dependency on boost.
Done by running a script like:

git grep -l '#include  *.boost/scoped_array.hpp.' \
 | xargs sed -i -e 's@#include  *.boost/scoped_array.hpp.@#include <memory>@'
git grep -l '\(boost::\)\?scoped_array<\([^<>]*\)>' \
 | xargs sed -i -e 's/\(boost::\)\?scoped_array<\([^<>]*\)>/std::unique_ptr<\2[]>/'

... and then killing duplicate or unnecessary includes,
while changing manually
m_xOutlineStylesCandidates in xmloff/source/text/txtimp.cxx,
extensions/source/ole/unoconversionutilities.hxx, and
extensions/source/ole/oleobjw.cxx.

Change-Id: I3955ed3ad99b94499a7bd0e6e3a09078771f9bfd
Reviewed-on: https://gerrit.libreoffice.org/16289
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 ucb/source/sorter/sortresult.cxx                   | 4 ++--
 ucb/source/ucp/file/filstr.cxx                     | 4 ++--
 ucb/source/ucp/ftp/ftpurl.cxx                      | 4 ++--
 ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'ucb')

diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 97955830281e..b7edf0edd497 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -30,7 +30,7 @@
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
-#include <boost/scoped_array.hpp>
+#include <memory>
 
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
@@ -1587,7 +1587,7 @@ void SortedResultSet::Move( sal_IntPtr nPos, sal_IntPtr nCount, sal_IntPtr nOffs
     }
 
     // remember the to be moved entries
-    boost::scoped_array<sal_IntPtr> pTmpArr(new sal_IntPtr[ nCount ]);
+    std::unique_ptr<sal_IntPtr[]> pTmpArr(new sal_IntPtr[ nCount ]);
     for ( i=0; i<nCount; i++ )
         pTmpArr[i] = reinterpret_cast<sal_IntPtr>(maO2S.GetObject( (sal_uInt32)( nPos+i ) ));
 
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index 988103519e9a..68010c9e0e83 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -23,7 +23,7 @@
 #include "filstr.hxx"
 #include "shell.hxx"
 #include "prov.hxx"
-#include <boost/scoped_array.hpp>
+#include <memory>
 
 using namespace fileaccess;
 using namespace com::sun::star;
@@ -143,7 +143,7 @@ XStream_impl::readBytes(
     if( ! m_nIsOpen )
         throw io::IOException( THROW_WHERE );
 
-    boost::scoped_array<sal_Int8> buffer;
+    std::unique_ptr<sal_Int8[]> buffer;
     try
     {
         buffer.reset(new sal_Int8[nBytesToRead]);
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 8ede7cd2b068..6a0cd881b67a 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -38,7 +38,7 @@
 #include "ftphandleprovider.hxx"
 #include "ftpcfunc.hxx"
 #include "ftpcontainer.hxx"
-#include <boost/scoped_array.hpp>
+#include <memory>
 
 using namespace ftp;
 using namespace com::sun::star::ucb;
@@ -159,7 +159,7 @@ void FTPURL::parse(const OUString& url)
        strncmp("ftp://",lower.getStr(),6))
         throw malformed_exception();
 
-    boost::scoped_array<char> buffer(new char[1+aIdent.getLength()]);
+    std::unique_ptr<char[]> buffer(new char[1+aIdent.getLength()]);
     const char* p2 = aIdent.getStr();
     p2 += 6;
 
diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
index 7ed95627988f..deef57085606 100644
--- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
@@ -38,7 +38,7 @@
 #include "LockSequence.hxx"
 #include "LockEntrySequence.hxx"
 #include "UCBDeadPropertyValue.hxx"
-#include <boost/scoped_array.hpp>
+#include <memory>
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::ucb;
@@ -250,7 +250,7 @@ NeonPropFindRequest::NeonPropFindRequest( HttpSession* inSession,
     int thePropCount = inPropNames.size();
     if ( thePropCount > 0 )
     {
-        boost::scoped_array<NeonPropName> thePropNames(new NeonPropName[ thePropCount + 1 ]);
+        std::unique_ptr<NeonPropName[]> thePropNames(new NeonPropName[ thePropCount + 1 ]);
         int theIndex;
 
         for ( theIndex = 0; theIndex < thePropCount; theIndex ++ )
-- 
cgit