diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-01-11 11:21:46 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-01-11 13:55:14 +0100 |
commit | 70519a43e0d89a6b5d89859a6851f8c757c6b0c7 (patch) | |
tree | bc1f4a6b6510e3bff75e9dc54eb71e2fa6cfc3c8 /i18npool/source | |
parent | a0210c5c5e8fd47b55567a8b18788d57d2b7decb (diff) |
Replace OUStringBuffer::appendCopy with append(std::u16string_view)
...which is more general
Change-Id: I94f28f8eda887120cf5f143b4549e0339b60e6a7
Reviewed-on: https://gerrit.libreoffice.org/66155
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'i18npool/source')
-rw-r--r-- | i18npool/source/characterclassification/cclass_unicode_parser.cxx | 13 | ||||
-rw-r--r-- | i18npool/source/nativenumber/nativenumbersupplier.cxx | 5 |
2 files changed, 10 insertions, 8 deletions
diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx index cc7107e355a2..29d69521954e 100644 --- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx +++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/i18n/NativeNumberSupplier.hpp> #include <string.h> +#include <string_view> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::i18n; @@ -902,13 +903,13 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 { if ( cLast == '\\' ) { // escaped - aSymbol.appendCopy(rText, postSymbolIndex, nextCharIndex - postSymbolIndex - 2); + aSymbol.append(std::u16string_view(rText).substr(postSymbolIndex, nextCharIndex - postSymbolIndex - 2)); aSymbol.append(OUString(¤t, 1)); } else { eState = ssStop; - aSymbol.appendCopy(rText, postSymbolIndex, nextCharIndex - postSymbolIndex - 1); + aSymbol.append(std::u16string_view(rText).substr(postSymbolIndex, nextCharIndex - postSymbolIndex - 1)); } postSymbolIndex = nextCharIndex; } @@ -927,13 +928,13 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 { if ( cLast == '\\' ) { // escaped - aSymbol.appendCopy(rText, postSymbolIndex, nextCharIndex - postSymbolIndex - 2); + aSymbol.append(std::u16string_view(rText).substr(postSymbolIndex, nextCharIndex - postSymbolIndex - 2)); aSymbol.append(OUString(¤t, 1)); } else if (current == nextChar && !(nContTypes & KParseTokens::TWO_DOUBLE_QUOTES_BREAK_STRING) ) { // "" => literal " escaped - aSymbol.appendCopy(rText, postSymbolIndex, nextCharIndex - postSymbolIndex); + aSymbol.append(std::u16string_view(rText).substr(postSymbolIndex, nextCharIndex - postSymbolIndex)); nextCharIndex = index; if (index < rText.getLength()) { ++nCodePoints; } nextChar = (index < rText.getLength()) ? rText.iterateCodePoints(&index) : 0; @@ -941,7 +942,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 else { eState = ssStop; - aSymbol.appendCopy(rText, postSymbolIndex, nextCharIndex - postSymbolIndex - 1); + aSymbol.append(std::u16string_view(rText).substr(postSymbolIndex, nextCharIndex - postSymbolIndex - 1)); } postSymbolIndex = nextCharIndex; } @@ -1050,7 +1051,7 @@ void cclass_Unicode::parseText( ParseResult& r, const OUString& rText, sal_Int32 { if (postSymbolIndex < nextCharIndex) { //! open quote - aSymbol.appendCopy(rText, postSymbolIndex, nextCharIndex - postSymbolIndex - 1); + aSymbol.append(std::u16string_view(rText).substr(postSymbolIndex, nextCharIndex - postSymbolIndex - 1)); r.TokenType |= KParseType::MISSING_QUOTE; } r.DequotedNameOrString = aSymbol.toString(); diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index 4e6f176edbb2..80fd575e115d 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -28,6 +28,7 @@ #include <cppuhelper/supportsservice.hxx> #include <map> #include <memory> +#include <string_view> #include <unordered_map> #include <com/sun/star/linguistic2/NumberText.hpp> @@ -1070,7 +1071,7 @@ OUString getHebrewNativeNumberString(const OUString& aNumberString, bool useGere makeHebrewNumber(value, output, true, useGeresh); if (i < len) - output.appendCopy(aNumberString,i); + output.append(std::u16string_view(aNumberString).substr(i)); return output.makeStringAndClear(); } @@ -1189,7 +1190,7 @@ OUString getCyrillicNativeNumberString(const OUString& aNumberString) makeCyrillicNumber(value, output, true); if (i < len) - output.appendCopy(aNumberString,i); + output.append(std::u16string_view(aNumberString).substr(i)); return output.makeStringAndClear(); } |