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 /sc/source/filter/lotus/op.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 'sc/source/filter/lotus/op.cxx')
| -rw-r--r-- | sc/source/filter/lotus/op.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index fba14cd67f73..4cd5df25f558 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.cxx @@ -50,7 +50,7 @@ #include <vector> #include <map> -#include <boost/scoped_array.hpp> +#include <memory> static sal_uInt16 nDefWidth = ( sal_uInt16 ) ( TWIPS_PER_CHAR * 10 ); @@ -117,7 +117,7 @@ void OP_Label(LotusContext& rContext, SvStream& r, sal_uInt16 n) n -= (n > 5) ? 5 : n; - boost::scoped_array<sal_Char> pText(new sal_Char[n + 1]); + std::unique_ptr<sal_Char[]> pText(new sal_Char[n + 1]); r.Read( pText.get(), n ); pText[n] = 0; @@ -356,7 +356,7 @@ void OP_Label123(LotusContext& rContext, SvStream& r, sal_uInt16 n) n -= (n > 4) ? 4 : n; - boost::scoped_array<sal_Char> pText(new sal_Char[n + 1]); + std::unique_ptr<sal_Char[]> pText(new sal_Char[n + 1]); r.Read( pText.get(), n ); pText[ n ] = 0; @@ -437,7 +437,7 @@ void OP_Note123(LotusContext& rContext, SvStream& r, sal_uInt16 n) n -= (n > 4) ? 4 : n; - boost::scoped_array<sal_Char> pText(new sal_Char[n + 1]); + std::unique_ptr<sal_Char[]> pText(new sal_Char[n + 1]); r.Read( pText.get(), n ); pText[ n ] = 0; |