diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-06-15 17:58:15 +0900 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-02-06 09:39:03 -0500 |
| commit | ba4fac9c7543e92001cf8ae81a2a017e4d34aa34 (patch) | |
| tree | 0afc3c1c6fb5947fd7aad119e4ed755276dfb197 /sax | |
| parent | a9e376dbfeb3109398dcb83e56a7f9c8b7521a73 (diff) | |
Replace boost::scoped_array<T> with std::unique_ptr<T[]>
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<[]>/'
... 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.
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>
(cherry picked from commit 09800956191c90035872cbc18cd304fee043c710)
Change-Id: I3955ed3ad99b94499a7bd0e6e3a09078771f9bfd
Diffstat (limited to 'sax')
| -rw-r--r-- | sax/source/expatwrap/saxwriter.cxx | 4 | ||||
| -rw-r--r-- | sax/source/expatwrap/xml2utf.cxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx index feb8efd2c6bb..f1d418a3fa10 100644 --- a/sax/source/expatwrap/saxwriter.cxx +++ b/sax/source/expatwrap/saxwriter.cxx @@ -52,7 +52,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::io; #include "xml2utf.hxx" -#include <boost/scoped_array.hpp> +#include <memory> #define LINEFEED 10 #define SEQUENCESIZE 1024 @@ -493,7 +493,7 @@ inline void SaxWriterHelper::insertIndentation(sal_uInt32 m_nLevel) throw( SAXEx else { sal_uInt32 nCount(m_nLevel + 1); - boost::scoped_array<sal_Int8> pBytes(new sal_Int8[nCount]); + std::unique_ptr<sal_Int8[]> pBytes(new sal_Int8[nCount]); pBytes[0] = LINEFEED; memset( &(pBytes[1]), 32, m_nLevel ); AddBytes(mp_Sequence, nCurrentPos, pBytes.get(), nCount); diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx index f58023ca8e4a..64e0c1407e39 100644 --- a/sax/source/expatwrap/xml2utf.cxx +++ b/sax/source/expatwrap/xml2utf.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star::io; #include "xml2utf.hxx" -#include <boost/scoped_array.hpp> +#include <memory> namespace sax_expatwrap { @@ -395,7 +395,7 @@ Sequence<sal_Unicode> Text2UnicodeConverter::convert( const Sequence<sal_Int8> & Sequence<sal_Unicode> seqUnicode ( nSourceSize ); const sal_Int8 *pbSource = seqText.getConstArray(); - boost::scoped_array<sal_Int8> pbTempMem; + std::unique_ptr<sal_Int8[]> pbTempMem; if( m_seqSource.getLength() ) { // put old rest and new byte sequence into one array @@ -467,7 +467,7 @@ Unicode2TextConverter::~Unicode2TextConverter() Sequence<sal_Int8> Unicode2TextConverter::convert(const sal_Unicode *puSource , sal_Int32 nSourceSize) { - boost::scoped_array<sal_Unicode> puTempMem; + std::unique_ptr<sal_Unicode[]> puTempMem; if( m_seqSource.getLength() ) { // For surrogates ! |