From 09800956191c90035872cbc18cd304fee043c710 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Mon, 15 Jun 2015 17:58:15 +0900 Subject: Replace boost::scoped_array with std::unique_ptr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 @' 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 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- i18npool/source/nativenumber/nativenumbersupplier.cxx | 8 ++++---- i18npool/source/textconversion/textconversion_ko.cxx | 4 ++-- i18npool/source/textconversion/textconversion_zh.cxx | 4 ++-- i18npool/source/transliteration/transliteration_body.cxx | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'i18npool') diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index 1fb6953c559d..ba56624c2d47 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -173,8 +173,8 @@ OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_ if (nCount > 0) { const sal_Unicode *str = inStr.getStr() + startPos; - boost::scoped_array newStr(new sal_Unicode[nCount * 2 + 1]); - boost::scoped_array srcStr(new sal_Unicode[nCount + 1]); // for keeping number without comma + std::unique_ptr newStr(new sal_Unicode[nCount * 2 + 1]); + std::unique_ptr srcStr(new sal_Unicode[nCount + 1]); // for keeping number without comma sal_Int32 i, len = 0, count = 0; if (useOffset) @@ -307,7 +307,7 @@ static OUString SAL_CALL NativeToAscii(const OUString& inStr, if (nCount > 0) { const sal_Unicode *str = inStr.getStr() + startPos; - boost::scoped_array newStr(new sal_Unicode[nCount * MultiplierExponent_7_CJK[0] + 2]); + std::unique_ptr newStr(new sal_Unicode[nCount * MultiplierExponent_7_CJK[0] + 2]); if (useOffset) offset.realloc( nCount * MultiplierExponent_7_CJK[0] + 1 ); sal_Int32 count = 0, index; diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx index b80ec0205ca1..d3fac1edeaf2 100644 --- a/i18npool/source/textconversion/textconversion_ko.cxx +++ b/i18npool/source/textconversion/textconversion_ko.cxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include using namespace com::sun::star::lang; using namespace com::sun::star::i18n; @@ -167,7 +167,7 @@ TextConversion_ko::getCharConversions(const OUString& aText, sal_Int32 nStartPos } } else if (! toHanja && getHanja2HangulIndex && getHanja2HangulData) { - boost::scoped_array newStr(new sal_Unicode[nLength+1]); + std::unique_ptr newStr(new sal_Unicode[nLength+1]); sal_Int32 count = 0; while (count < nLength) { diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx index ea60ba017e74..084460502502 100644 --- a/i18npool/source/textconversion/textconversion_zh.cxx +++ b/i18npool/source/textconversion/textconversion_zh.cxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include using namespace com::sun::star::lang; using namespace com::sun::star::i18n; @@ -165,7 +165,7 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos, if ((!wordData || !index || !entry) && !xCDL.is()) // no word mapping defined, do char2char conversion. return getCharConversion(aText, nStartPos, nLength, toSChinese, nConversionOptions); - boost::scoped_array newStr(new sal_Unicode[nLength * 2 + 1]); + std::unique_ptr newStr(new sal_Unicode[nLength * 2 + 1]); sal_Int32 currPos = 0, count = 0; while (currPos < nLength) { sal_Int32 len = nLength - currPos; diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index 0a78040c27f9..e48b6a6e6e92 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -31,7 +31,7 @@ #include "breakiteratorImpl.hxx" #include "transliteration_body.hxx" -#include +#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -154,7 +154,7 @@ Transliteration_body::transliterate( // which would have to be reallocated most times anyways. const sal_Int32 nLocalBuf = 2048; sal_Unicode aLocalBuf[ nLocalBuf * NMAPPINGMAX ], *out = aLocalBuf; - boost::scoped_array pHeapBuf; + std::unique_ptr pHeapBuf; if ( nCount > nLocalBuf ) { pHeapBuf.reset(new sal_Unicode[ nCount * NMAPPINGMAX ]); out = pHeapBuf.get(); -- cgit