diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-11 14:49:08 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-11 17:44:46 +0200 |
commit | 6fc3dfd3f1b5cb13101299df42444f2ff0493846 (patch) | |
tree | 404a816727baa934e77c6e474cc57e83a7aa2754 /i18nutil | |
parent | 8cbb08de38fc1a2f9d2ea0dfbdc2be8e8110ff73 (diff) |
use more string_view
found by tweaking the loplugin:stringview and making it whitelist
getLength
Change-Id: Ic41cd4e3026d93b70a76fe1279c6de3abbe6b4a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132820
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'i18nutil')
-rw-r--r-- | i18nutil/source/utility/scripttypedetector.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/i18nutil/source/utility/scripttypedetector.cxx b/i18nutil/source/utility/scripttypedetector.cxx index a2796e42a562..bea0714f375b 100644 --- a/i18nutil/source/utility/scripttypedetector.cxx +++ b/i18nutil/source/utility/scripttypedetector.cxx @@ -54,11 +54,11 @@ sal_Int16 ScriptTypeDetector::getScriptDirection( std::u16string_view Text, sal_ } // return value '-1' means either the direction on nPos is not same as scriptDirection or nPos is out of range. -sal_Int32 ScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) +sal_Int32 ScriptTypeDetector::beginOfScriptDirection( std::u16string_view Text, sal_Int32 nPos, sal_Int16 direction ) { sal_Int32 cPos = nPos; - if (cPos < Text.getLength()) { + if (cPos < static_cast<sal_Int32>(Text.size())) { for (; cPos >= 0; cPos--) { if (direction != getScriptDirection(Text, cPos, direction)) break; @@ -67,10 +67,10 @@ sal_Int32 ScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_ return cPos == nPos ? -1 : cPos + 1; } -sal_Int32 ScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) +sal_Int32 ScriptTypeDetector::endOfScriptDirection( std::u16string_view Text, sal_Int32 nPos, sal_Int16 direction ) { sal_Int32 cPos = nPos; - sal_Int32 len = Text.getLength(); + sal_Int32 len = Text.size(); if (cPos >=0) { for (; cPos < len; cPos++) { @@ -95,12 +95,12 @@ sal_Int16 ScriptTypeDetector::getCTLScriptType( std::u16string_view Text, sal_In } // Begin of Script Type is inclusive. -sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) +sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( std::u16string_view Text, sal_Int32 nPos ) { if (nPos < 0) return 0; - else if (nPos >= Text.getLength()) - return Text.getLength(); + else if (nPos >= static_cast<sal_Int32>(Text.size())) + return Text.size(); else { sal_Int16 cType = getCTLScriptType(Text, nPos); for (nPos--; nPos >= 0; nPos--) { @@ -112,15 +112,15 @@ sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_In } // End of the Script Type is exclusive, the return value pointing to the begin of next script type -sal_Int32 ScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) +sal_Int32 ScriptTypeDetector::endOfCTLScriptType( std::u16string_view Text, sal_Int32 nPos ) { if (nPos < 0) return 0; - else if (nPos >= Text.getLength()) - return Text.getLength(); + else if (nPos >= static_cast<sal_Int32>(Text.size())) + return Text.size(); else { sal_Int16 cType = getCTLScriptType(Text, nPos); - sal_Int32 len = Text.getLength(); + sal_Int32 len = Text.size(); for (nPos++; nPos < len; nPos++) { if (cType != getCTLScriptType(Text, nPos)) break; |