[Libreoffice-commits] core.git: sfx2/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Jan 10 21:25:39 UTC 2019


 sfx2/source/appl/sfxhelp.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 06b854bff6061f69d113b2992d646c368d05ce50
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Jan 10 15:30:27 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Jan 10 22:25:16 2019 +0100

    o3tl::string_view -> std::string_view (in sfx2)
    
    Change-Id: I61b40db1e75938ecf09c3c2e039be2d757fde170
    Reviewed-on: https://gerrit.libreoffice.org/66116
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index ebf530a00fb5..e0540ec5e1d9 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/sfxhelp.hxx>
 
 #include <set>
+#include <string_view>
 #include <algorithm>
 #include <cassert>
 
@@ -758,7 +759,7 @@ bool rewriteFlatpakHelpRootUrl(OUString * helpRootUrl) {
                             << " before [Instance] app-path");
                     throw Failure();
                 }
-                o3tl::string_view const line(
+                std::string_view const line(
                     reinterpret_cast<char const *>(bytes.getConstArray()), bytes.getLength());
                 if (instance) {
                     static constexpr auto keyPath = OUStringLiteral("app-path=");


More information about the Libreoffice-commits mailing list