diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-12-28 17:56:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-12-29 16:42:33 +0100 |
| commit | 042033f1e6da22616cb76c8d950c20c9efecbad5 (patch) | |
| tree | 26b3f1f42d067506f44550b410f3fb9640616a5b /linguistic | |
| parent | ccfd8e9d09f9ac0a0ea92d0f378391006faaf934 (diff) | |
loplugin:stringviewparam: operator +
Change-Id: I044dd21b63d7eb03224675584fa143009c6b6008
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108418
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'linguistic')
| -rw-r--r-- | linguistic/source/convdiclist.cxx | 6 | ||||
| -rw-r--r-- | linguistic/source/misc2.cxx | 17 |
2 files changed, 15 insertions, 8 deletions
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index afea6469ed38..f5a7e8e34b9e 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -19,6 +19,8 @@ #include <sal/config.h> +#include <string_view> + #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/NoSupportException.hpp> @@ -52,11 +54,11 @@ using namespace com::sun::star::container; using namespace com::sun::star::linguistic2; using namespace linguistic; -static OUString GetConvDicMainURL( const OUString &rDicName, const OUString &rDirectoryURL ) +static OUString GetConvDicMainURL( std::u16string_view rDicName, const OUString &rDirectoryURL ) { // build URL to use for new (persistent) dictionaries - OUString aFullDicName = rDicName + CONV_DIC_DOT_EXT; + OUString aFullDicName = OUString::Concat(rDicName) + CONV_DIC_DOT_EXT; INetURLObject aURLObj; aURLObj.SetSmartProtocol( INetProtocol::File ); diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index 6e48fc7aa52c..eeccadd5cb4a 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <string_view> + #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> #include <tools/debug.hxx> @@ -73,7 +77,7 @@ bool FileExists( const OUString &rMainURL ) } static std::vector< OUString > GetMultiPaths_Impl( - const OUString &rPathPrefix, + std::u16string_view rPathPrefix, DictionaryPathFlags nPathFlags ) { std::vector< OUString > aRes; @@ -85,9 +89,9 @@ static std::vector< OUString > GetMultiPaths_Impl( uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); try { - OUString aInternal( rPathPrefix + "_internal" ); - OUString aUser( rPathPrefix + "_user" ); - OUString aWriteable( rPathPrefix + "_writable" ); + OUString aInternal( OUString::Concat(rPathPrefix) + "_internal" ); + OUString aUser( OUString::Concat(rPathPrefix) + "_user" ); + OUString aWriteable( OUString::Concat(rPathPrefix) + "_writable" ); uno::Reference< util::XPathSettings > xPathSettings = util::thePathSettings::get( xContext ); @@ -126,7 +130,8 @@ static std::vector< OUString > GetMultiPaths_Impl( OUString GetDictionaryWriteablePath() { - std::vector< OUString > aPaths( GetMultiPaths_Impl( "Dictionary", DictionaryPathFlags::NONE ) ); + std::vector< OUString > aPaths( + GetMultiPaths_Impl( u"Dictionary", DictionaryPathFlags::NONE ) ); DBG_ASSERT( aPaths.size() == 1, "Dictionary_writable path corrupted?" ); OUString aRes; if (!aPaths.empty()) @@ -136,7 +141,7 @@ OUString GetDictionaryWriteablePath() std::vector< OUString > GetDictionaryPaths() { - return GetMultiPaths_Impl( "Dictionary", PATH_FLAG_ALL ); + return GetMultiPaths_Impl( u"Dictionary", PATH_FLAG_ALL ); } OUString GetWritableDictionaryURL( const OUString &rDicName ) |