diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-03-04 13:52:05 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-03-04 16:13:15 +0100 |
| commit | e05263e0f23af6f3fccf56f1a488baad7b3ee55f (patch) | |
| tree | 509cc4d075c055eea9429c0c30e29ff479d8f8ae /tools | |
| parent | f59b399f50e3cad7e4d1132f863b0fd8cee0071f (diff) | |
Change INetURLObject::isSchemeEqualTo parameter to u16string_view
Change-Id: I003fa0c6f9c485d0579f3dd18331e63548a3777c
Reviewed-on: https://gerrit.libreoffice.org/50728
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qa/cppunit/test_urlobj.cxx | 8 | ||||
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx index 71554d2d8a41..f9996172a863 100644 --- a/tools/qa/cppunit/test_urlobj.cxx +++ b/tools/qa/cppunit/test_urlobj.cxx @@ -322,7 +322,7 @@ namespace tools_urlobj void urlobjTest_isSchemeEqualTo() { CPPUNIT_ASSERT(INetURLObject().isSchemeEqualTo(INetProtocol::NotValid)); - CPPUNIT_ASSERT(!INetURLObject().isSchemeEqualTo("")); + CPPUNIT_ASSERT(!INetURLObject().isSchemeEqualTo(u"")); CPPUNIT_ASSERT( INetURLObject("http://example.org").isSchemeEqualTo( INetProtocol::Http)); @@ -330,11 +330,11 @@ namespace tools_urlobj !INetURLObject("http://example.org").isSchemeEqualTo( INetProtocol::Https)); CPPUNIT_ASSERT( - INetURLObject("http://example.org").isSchemeEqualTo("Http")); + INetURLObject("http://example.org").isSchemeEqualTo(u"Http")); CPPUNIT_ASSERT( - !INetURLObject("http://example.org").isSchemeEqualTo("dav")); + !INetURLObject("http://example.org").isSchemeEqualTo(u"dav")); CPPUNIT_ASSERT( - INetURLObject("dav://example.org").isSchemeEqualTo("dav")); + INetURLObject("dav://example.org").isSchemeEqualTo(u"dav")); } void urlobjTest_isAnyKnownWebDAVScheme() { diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index b72976850345..6a3b2ef712c2 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -3889,10 +3889,10 @@ OUString INetURLObject::getExternalURL() const return aTheExtURIRef; } -bool INetURLObject::isSchemeEqualTo(OUString const & scheme) const { +bool INetURLObject::isSchemeEqualTo(o3tl::u16string_view scheme) const { return m_aScheme.isPresent() && (rtl_ustr_compareIgnoreAsciiCase_WithLength( - scheme.getStr(), scheme.getLength(), + scheme.data(), scheme.size(), m_aAbsURIRef.getStr() + m_aScheme.getBegin(), m_aScheme.getLength()) == 0); |