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/outdev/bitmap.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/outdev/bitmap.cxx')
| -rw-r--r-- | vcl/source/outdev/bitmap.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index 48ac3730956a..2b77d3543afa 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -32,7 +32,7 @@ #include <image.h> #include <basegfx/matrix/b2dhommatrixtools.hxx> -#include <boost/scoped_array.hpp> +#include <memory> void OutputDevice::DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap ) { @@ -698,11 +698,11 @@ namespace struct LinearScaleContext { - boost::scoped_array<long> mpMapX; - boost::scoped_array<long> mpMapY; + std::unique_ptr<long[]> mpMapX; + std::unique_ptr<long[]> mpMapY; - boost::scoped_array<long> mpMapXOffset; - boost::scoped_array<long> mpMapYOffset; + std::unique_ptr<long[]> mpMapXOffset; + std::unique_ptr<long[]> mpMapYOffset; LinearScaleContext(Rectangle& aDstRect, Rectangle& aBitmapRect, Size& aOutSize, long nOffX, long nOffY) @@ -870,8 +870,8 @@ public: struct TradScaleContext { - boost::scoped_array<long> mpMapX; - boost::scoped_array<long> mpMapY; + std::unique_ptr<long[]> mpMapX; + std::unique_ptr<long[]> mpMapY; TradScaleContext(Rectangle& aDstRect, Rectangle& aBitmapRect, Size& aOutSize, long nOffX, long nOffY) |