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 /svl/source/items | |
| 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 'svl/source/items')
| -rw-r--r-- | svl/source/items/nranges.cxx | 6 | ||||
| -rw-r--r-- | svl/source/items/poolio.cxx | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx index 35b2e482a0bb..d454058bc726 100644 --- a/svl/source/items/nranges.cxx +++ b/svl/source/items/nranges.cxx @@ -20,7 +20,7 @@ #include <cassert> #include <vector> // compiled via include from itemset.cxx only! -#include <boost/scoped_array.hpp> +#include <memory> #include <osl/diagnose.h> @@ -400,7 +400,7 @@ SfxUShortRanges& SfxUShortRanges::operator -= // (size is computed for maximal possibly split-count plus terminating 0) sal_uInt16 nThisSize = Count_Impl(_pRanges); sal_uInt16 nTargetSize = 1 + ( nThisSize + Count_Impl(rRanges._pRanges) ); - boost::scoped_array<sal_uInt16> pTarget(new sal_uInt16[ nTargetSize ]); + std::unique_ptr<sal_uInt16[]> pTarget(new sal_uInt16[ nTargetSize ]); memset( pTarget.get(), 0, sizeof(sal_uInt16)*nTargetSize ); memcpy( pTarget.get(), _pRanges, sizeof(sal_uInt16)*nThisSize ); @@ -545,7 +545,7 @@ SfxUShortRanges& SfxUShortRanges::operator /= // (size is computed for maximal possibly split-count plus terminating 0) sal_uInt16 nThisSize = Count_Impl(_pRanges); sal_uInt16 nTargetSize = 1 + ( nThisSize + Count_Impl(rRanges._pRanges) ); - boost::scoped_array<sal_uInt16> pTarget(new sal_uInt16[ nTargetSize ]); + std::unique_ptr<sal_uInt16[]> pTarget(new sal_uInt16[ nTargetSize ]); memset( pTarget.get(), 0, sizeof(sal_uInt16)*nTargetSize ); memcpy( pTarget.get(), _pRanges, sizeof(sal_uInt16)*nThisSize ); diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index 8abb03b57c94..918330f6fa5a 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -28,7 +28,6 @@ #include <svl/filerec.hxx> #include "poolio.hxx" #include <boost/scoped_ptr.hpp> -#include <boost/scoped_array.hpp> /** * Returns the <SfxItemPool> that is being saved. |