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 /svtools/source/graphic/grfmgr2.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 'svtools/source/graphic/grfmgr2.cxx')
-rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 03867e54cd22..e469805d803e 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -33,7 +33,7 @@ #include <vcl/virdev.hxx> #include "grfcache.hxx" #include <svtools/grfmgr.hxx> -#include <boost/scoped_array.hpp> +#include <memory> // - defines - @@ -334,10 +334,10 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib bool bHMirr( rAttributes.GetMirrorFlags() & BmpMirrorFlags::Horizontal ); bool bVMirr( rAttributes.GetMirrorFlags() & BmpMirrorFlags::Vertical ); - boost::scoped_array<long> pMapIX(new long[ aUnrotatedWidth ]); - boost::scoped_array<long> pMapFX(new long[ aUnrotatedWidth ]); - boost::scoped_array<long> pMapIY(new long[ aUnrotatedHeight ]); - boost::scoped_array<long> pMapFY(new long[ aUnrotatedHeight ]); + std::unique_ptr<long[]> pMapIX(new long[ aUnrotatedWidth ]); + std::unique_ptr<long[]> pMapFX(new long[ aUnrotatedWidth ]); + std::unique_ptr<long[]> pMapIY(new long[ aUnrotatedHeight ]); + std::unique_ptr<long[]> pMapFY(new long[ aUnrotatedHeight ]); double fRevScaleX; double fRevScaleY; @@ -431,10 +431,10 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib const double fSinAngle = sin( nRot10 * F_PI1800 ); const long aTargetWidth = nEndX - nStartX + 1L; const long aTargetHeight = nEndY - nStartY + 1L; - boost::scoped_array<long> pCosX(new long[ aTargetWidth ]); - boost::scoped_array<long> pSinX(new long[ aTargetWidth ]); - boost::scoped_array<long> pCosY(new long[ aTargetHeight ]); - boost::scoped_array<long> pSinY(new long[ aTargetHeight ]); + std::unique_ptr<long[]> pCosX(new long[ aTargetWidth ]); + std::unique_ptr<long[]> pSinX(new long[ aTargetWidth ]); + std::unique_ptr<long[]> pCosY(new long[ aTargetHeight ]); + std::unique_ptr<long[]> pSinY(new long[ aTargetHeight ]); long nUnRotX, nUnRotY, nSinY, nCosY; sal_uInt8 cR0, cG0, cB0, cR1, cG1, cB1; bool bRet = false; @@ -798,8 +798,8 @@ bool ImplCreateRotatedScaled( const BitmapEx& rBmpEx, const GraphicAttr& rAttrib if( !aMsk || ( ( pMAcc = aMsk.AcquireReadAccess() ) != NULL ) ) { - boost::scoped_array<long> pMapLX(new long[ aUnrotatedWidth ]); - boost::scoped_array<long> pMapLY(new long[ aUnrotatedHeight ]); + std::unique_ptr<long[]> pMapLX(new long[ aUnrotatedWidth ]); + std::unique_ptr<long[]> pMapLY(new long[ aUnrotatedHeight ]); BitmapColor aTestB; if( pMAcc ) |