Kaydet (Commit) 2dc075d2 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

o3tl::string_view -> std::string_view (in svtools)

Change-Id: Id876708444e969c27c0515d6b6897c016de53437
Reviewed-on: https://gerrit.libreoffice.org/66117
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 06b854bf
...@@ -7,10 +7,13 @@ ...@@ -7,10 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <sal/config.h>
#include <string_view>
#include <comphelper/sequence.hxx> #include <comphelper/sequence.hxx>
#include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/languagetag.hxx>
#include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/mslangid.hxx>
#include <o3tl/string_view.hxx>
#include <officecfg/Office/Common.hxx> #include <officecfg/Office/Common.hxx>
#include <officecfg/System.hxx> #include <officecfg/System.hxx>
#include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp> #include <org/freedesktop/PackageKit/SyncDbusSessionHelper.hpp>
...@@ -129,7 +132,7 @@ OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence<OUString ...@@ -129,7 +132,7 @@ OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence<OUString
OUString install = getInstalledLocaleForLanguage(comphelper::containerToSequence(aAvailable), wantedLocale); OUString install = getInstalledLocaleForLanguage(comphelper::containerToSequence(aAvailable), wantedLocale);
if (!install.isEmpty() && install != "en-US") if (!install.isEmpty() && install != "en-US")
{ {
o3tl::string_view sVendor(OOO_VENDOR); std::string_view sVendor(OOO_VENDOR);
if (sVendor == "Red Hat, Inc." || sVendor == "The Fedora Project") if (sVendor == "Red Hat, Inc." || sVendor == "The Fedora Project")
{ {
// langpack is the typical Fedora/RHEL naming convention // langpack is the typical Fedora/RHEL naming convention
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment