[Libreoffice-commits] core.git: svtools/source
Jan-Marek Glogowski
glogow at fbihome.de
Tue Jan 2 22:52:27 UTC 2018
svtools/source/misc/langhelp.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 6a29d733651eb307ee8a6c3cf1bc64579070e53a
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date: Wed Dec 27 15:47:26 2017 +0100
Treat OOO_VENDOR as (non-Unicode) plain char string
Fixes the loplugin:stringconstant complains when using a unicode
vendor name.
Change-Id: Ib15e558585fe388f734da469e728909a48686ef0
Co-authored-by: Stephan Bergmann <sbergman at redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/47278
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
Tested-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index 47cb87e36963..e4e64375e4b5 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -9,6 +9,7 @@
#include <comphelper/sequence.hxx>
#include <i18nlangtag/mslangid.hxx>
+#include <o3tl/string_view.hxx>
#include <officecfg/Office/Common.hxx>
#include <officecfg/System.hxx>
#include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
@@ -125,7 +126,7 @@ OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence<OUString
OUString install = getInstalledLocaleForLanguage(comphelper::containerToSequence(aAvailable), wantedLocale);
if (!install.isEmpty() && install != "en-US")
{
- OUString sVendor(OOO_VENDOR);
+ o3tl::string_view sVendor(OOO_VENDOR);
if (sVendor == "Red Hat, Inc." || sVendor == "The Fedora Project")
{
// langpack is the typical Fedora/RHEL naming convention
More information about the Libreoffice-commits
mailing list