summaryrefslogtreecommitdiffstats
path: root/lingucomponent
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-11 17:44:34 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-11 21:25:10 +0100
commit35e471bb4d1388cf5afcdcee214cf5111edf44e3 (patch)
treebb78f4f13f131f0cb206a9707cc3cfc495a3876a /lingucomponent
parentalign anchor south-west to dropdown north-east (diff)
downloadcore-35e471bb4d1388cf5afcdcee214cf5111edf44e3.tar.gz
core-35e471bb4d1388cf5afcdcee214cf5111edf44e3.zip
Adapt the remaining OUString functions to std string_view
...for LIBO_INTERNAL_ONLY. These had been missed by 1b43cceaea2084a0489db68cd0113508f34b6643 "Make many OUString functions take std::u16string_view parameters" because they did not match the multi-overload pattern that was addressed there, but they nevertheless benefit from being changed just as well (witness e.g. the various resulting changes from copy() to subView()). This showed a conversion from OStringChar to std::string_view to be missing (while the corresponding conversion form OUStringChar to std::u16string_view was already present). The improvement to loplugin:stringadd became necessary to fix > [CPT] compilerplugins/clang/test/stringadd.cxx > error: 'error' diagnostics expected but not seen: > File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 43 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:42): simplify by merging with the preceding assignment [loplugin:stringadd] > File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 61 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:60): simplify by merging with the preceding assignment [loplugin:stringadd] > 2 errors generated. Change-Id: Ie40de0616a66e60e289c1af0ca60aed6f9ecc279 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107602 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'lingucomponent')
-rw-r--r--lingucomponent/source/languageguessing/guesslang.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx b/lingucomponent/source/languageguessing/guesslang.cxx
index 560f883e1c55..f04e0b3956d5 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -18,6 +18,7 @@
*/
#include <iostream>
+#include <string_view>
#include <osl/file.hxx>
#include <tools/debug.hxx>
@@ -91,7 +92,7 @@ public:
// implementation specific
/// @throws RuntimeException
- void SetFingerPrintsDB( const OUString &fileName );
+ void SetFingerPrintsDB( std::u16string_view fileName );
};
}
@@ -165,7 +166,7 @@ Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage(
if (nStartPos < 0 || nLen < 0 || nStartPos + nLen > rText.getLength())
throw lang::IllegalArgumentException();
- OString o( OUStringToOString( rText.copy(nStartPos, nLen), RTL_TEXTENCODING_UTF8 ) );
+ OString o( OUStringToOString( rText.subView(nStartPos, nLen), RTL_TEXTENCODING_UTF8 ) );
Guess g = m_aGuesser.GuessPrimaryLanguage(o.getStr());
lang::Locale aRes;
aRes.Language = OUString::createFromAscii( g.GetLanguage().c_str() );
@@ -176,7 +177,7 @@ Locale SAL_CALL LangGuess_Impl::guessPrimaryLanguage(
#define DEFAULT_CONF_FILE_NAME "fpdb.conf"
void LangGuess_Impl::SetFingerPrintsDB(
- const OUString &filePath )
+ std::u16string_view filePath )
{
//! text encoding for file name / path needs to be in the same encoding the OS uses
OString path = OUStringToOString( filePath, osl_getThreadTextEncoding() );