include/tools/urlobj.hxx | 4 ++--
tools/source/fsys/urlobj.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 4f36ea1a1ecde6c000aeb878ab46747edd16c8f0
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Thu Jan 10 15:32:05 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Jan 11 08:05:57 2019 +0100
o3tl::string_view -> std::string_view (in tools)
Change-Id: Ic3952cf0f05752813f60199b7b2c8c8e8dc27427
Reviewed-on: https://gerrit.libreoffice.org/66118
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index 84556aa4a609..391a629c5598 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -23,10 +23,10 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/textenc.h>
#include <sal/types.h>
-#include <o3tl/string_view.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <memory>
+#include <string_view>
class SvMemoryStream;
@@ -381,7 +381,7 @@ public:
bool isSchemeEqualTo(INetProtocol scheme) const { return scheme ==
m_eScheme; }
- bool isSchemeEqualTo(o3tl::u16string_view scheme) const;
+ bool isSchemeEqualTo(std::u16string_view scheme) const;
/** Check if the scheme is one of the WebDAV scheme
* we know about.
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index e280a7f84abe..45bd5a0d283f 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -3862,7 +3862,7 @@ OUString INetURLObject::getExternalURL() const
return aTheExtURIRef;
}
-bool INetURLObject::isSchemeEqualTo(o3tl::u16string_view scheme) const {
+bool INetURLObject::isSchemeEqualTo(std::u16string_view scheme) const {
return m_aScheme.isPresent()
&& (rtl_ustr_compareIgnoreAsciiCase_WithLength(
scheme.data(), scheme.size(),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
