svtools/source/misc/langhelp.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2dc075d2895c5920a42bd7714d92575d83949639
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 10 15:31:30 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Jan 10 22:39:17 2019 +0100
o3tl::string_view -> std::string_view (in svtools)
Change-Id: Id876708444e969c27c0515d6b6897c016de53437
Reviewed-on: https://gerrit.libreoffice.org/66117
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index 8c2ef914cd24..57d1d2f89ca3 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -7,10 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include <sal/config.h>
+
+#include <string_view>
+
#include <comphelper/sequence.hxx>
#include <i18nlangtag/languagetag.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>
@@ -129,7 +132,7 @@ OUString getInstalledLocaleForSystemUILanguage(const
css::uno::Sequence<OUString
OUString install =
getInstalledLocaleForLanguage(comphelper::containerToSequence(aAvailable),
wantedLocale);
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")
{
// langpack is the typical Fedora/RHEL naming convention
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
