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 /svx/source/dialog/_bmpmask.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 'svx/source/dialog/_bmpmask.cxx')
| -rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index f544be3fc852..83bb285511d8 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -30,7 +30,7 @@ #include <svx/dialogs.hrc> #include <bmpmask.hrc> #include <svx/svxids.hrc> -#include <boost/scoped_array.hpp> +#include <memory> #include <boost/scoped_ptr.hpp> #include "helpid.hrc" @@ -725,12 +725,12 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) long nR; long nG; long nB; - boost::scoped_array<long> pMinR(new long[nCount]); - boost::scoped_array<long> pMaxR(new long[nCount]); - boost::scoped_array<long> pMinG(new long[nCount]); - boost::scoped_array<long> pMaxG(new long[nCount]); - boost::scoped_array<long> pMinB(new long[nCount]); - boost::scoped_array<long> pMaxB(new long[nCount]); + std::unique_ptr<long[]> pMinR(new long[nCount]); + std::unique_ptr<long[]> pMaxR(new long[nCount]); + std::unique_ptr<long[]> pMinG(new long[nCount]); + std::unique_ptr<long[]> pMaxG(new long[nCount]); + std::unique_ptr<long[]> pMinB(new long[nCount]); + std::unique_ptr<long[]> pMaxB(new long[nCount]); sal_uInt16 i; aMtf.SetPrefSize( rMtf.GetPrefSize() ); |