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 /sal/textenc | |
| parent | Try make JunitTest_chart2_unoapi sch.ChXChartAxis more robust (diff) | |
| download | core-09800956191c90035872cbc18cd304fee043c710.tar.gz core-09800956191c90035872cbc18cd304fee043c710.zip | |
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 'sal/textenc')
| -rw-r--r-- | sal/textenc/tencinfo.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sal/textenc/tencinfo.cxx b/sal/textenc/tencinfo.cxx index 192619dbab41..af3898335943 100644 --- a/sal/textenc/tencinfo.cxx +++ b/sal/textenc/tencinfo.cxx @@ -26,7 +26,7 @@ #include "gettextencodingdata.hxx" #include "tenchelp.hxx" -#include <boost/scoped_array.hpp> +#include <memory> sal_Bool SAL_CALL rtl_isOctetTextEncoding(rtl_TextEncoding nEncoding) { @@ -414,7 +414,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromUnixCharset( const char* pUnixC const char* pSecondPart; /* Alloc Buffer and map to lower case */ - boost::scoped_array<char> pBuf(new char[nBufLen]); + std::unique_ptr<char[]> pBuf(new char[nBufLen]); Impl_toAsciiLower( pUnixCharset, pBuf.get() ); /* Search FirstPart */ @@ -742,7 +742,7 @@ rtl_TextEncoding SAL_CALL rtl_getTextEncodingFromMimeCharset( const char* pMimeC sal_uInt32 nBufLen = strlen( pMimeCharset )+1; /* Alloc Buffer and map to lower case and remove non alphanumeric chars */ - boost::scoped_array<char> pBuf(new char[nBufLen]); + std::unique_ptr<char[]> pBuf(new char[nBufLen]); Impl_toAsciiLowerAndRemoveNonAlphanumeric( pMimeCharset, pBuf.get() ); /* Search for equal in the VIP table */ |