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/impimage.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/impimage.cxx')
| -rw-r--r-- | vcl/source/gdi/impimage.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx index 067b6e8ab95e..87b9bce71075 100644 --- a/vcl/source/gdi/impimage.cxx +++ b/vcl/source/gdi/impimage.cxx @@ -27,7 +27,7 @@ #include <vcl/settings.hxx> #include <image.h> -#include <boost/scoped_array.hpp> +#include <memory> #define IMPSYSIMAGEITEM_MASK ( 0x01 ) #define IMPSYSIMAGEITEM_ALPHA ( 0x02 ) @@ -213,9 +213,9 @@ void ImplImageBmp::Draw( sal_uInt16 nPos, OutputDevice* pOutDev, BitmapColor aCol; const long nW = pAcc->Width(); const long nH = pAcc->Height(); - boost::scoped_array<sal_uInt8> pMapR(new sal_uInt8[ 256 ]); - boost::scoped_array<sal_uInt8> pMapG(new sal_uInt8[ 256 ]); - boost::scoped_array<sal_uInt8> pMapB(new sal_uInt8[ 256 ]); + std::unique_ptr<sal_uInt8[]> pMapR(new sal_uInt8[ 256 ]); + std::unique_ptr<sal_uInt8[]> pMapG(new sal_uInt8[ 256 ]); + std::unique_ptr<sal_uInt8[]> pMapB(new sal_uInt8[ 256 ]); long nX, nY; if( nStyle & DrawImageFlags::Highlight ) |