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/source/gdi/impvect.cxx | |
| 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/source/gdi/impvect.cxx')
| -rw-r--r-- | vcl/source/gdi/impvect.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx index 166f0be37148..4db6d4939e99 100644 --- a/vcl/source/gdi/impvect.cxx +++ b/vcl/source/gdi/impvect.cxx @@ -26,7 +26,6 @@ #include <vcl/wrkwin.hxx> #include <vcl/virdev.hxx> #include <impvect.hxx> -#include <boost/scoped_array.hpp> #include <memory> #define VECT_POLY_MAX 8192 @@ -872,8 +871,8 @@ ImplVectMap* ImplExpand( BitmapReadAccess* pRAcc, const Color& rColor ) const long nNewWidth = ( nOldWidth << 2L ) + 4L; const long nNewHeight = ( nOldHeight << 2L ) + 4L; const BitmapColor aTest( pRAcc->GetBestMatchingColor( rColor ) ); - boost::scoped_array<long> pMapIn(new long[ std::max( nOldWidth, nOldHeight ) ]); - boost::scoped_array<long> pMapOut(new long[ std::max( nOldWidth, nOldHeight ) ]); + std::unique_ptr<long[]> pMapIn(new long[ std::max( nOldWidth, nOldHeight ) ]); + std::unique_ptr<long[]> pMapOut(new long[ std::max( nOldWidth, nOldHeight ) ]); long nX, nY, nTmpX, nTmpY; pMap = new ImplVectMap( nNewWidth, nNewHeight ); |