diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-06-15 17:58:15 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-17 15:50:45 +0000 |
| commit | 09800956191c90035872cbc18cd304fee043c710 (patch) | |
| tree | 9d255ad7629fedc181e8b5cf965a3075a328caaf /vcl/generic | |
| parent | 9cc52266bd1a4d01552675f151ce2da8c5210f84 (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<\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>
Diffstat (limited to 'vcl/generic')
| -rw-r--r-- | vcl/generic/fontmanager/helper.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx index ecd4cca6cfdc..4517c6dcbfbb 100644 --- a/vcl/generic/fontmanager/helper.cxx +++ b/vcl/generic/fontmanager/helper.cxx @@ -31,7 +31,7 @@ #include <tools/urlobj.hxx> #include "vcl/helper.hxx" #include "vcl/ppdparser.hxx" -#include <boost/scoped_array.hpp> +#include <memory> using ::rtl::Bootstrap; @@ -289,7 +289,7 @@ bool psp::convertPfbToPfa( ::osl::File& rInFile, ::osl::File& rOutFile ) rInFile.getPos(nOrgPos); nBytesToRead = std::min<sal_uInt64>(nBytesToRead, nSize - nOrgPos); - boost::scoped_array<unsigned char> pBuffer(new unsigned char[nBytesToRead+1]); + std::unique_ptr<unsigned char[]> pBuffer(new unsigned char[nBytesToRead+1]); pBuffer[nBytesToRead] = 0; if( ! rInFile.read( pBuffer.get(), nBytesToRead, nRead ) && nRead == nBytesToRead ) @@ -298,7 +298,7 @@ bool psp::convertPfbToPfa( ::osl::File& rInFile, ::osl::File& rOutFile ) { // ascii data, convert dos lineends( \r\n ) and // m_ac lineends( \r ) to \n - boost::scoped_array<unsigned char> pWriteBuffer(new unsigned char[ nBytesToRead ]); + std::unique_ptr<unsigned char[]> pWriteBuffer(new unsigned char[ nBytesToRead ]); unsigned int nBytesToWrite = 0; for( unsigned int i = 0; i < nBytesToRead; i++ ) { |