diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-03-04 17:13:04 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-03-04 21:59:17 +0100 |
| commit | a7780e82305fe2e900afbe9909f9df80ad4019d5 (patch) | |
| tree | 5f645c8ac0537cef6575597821a98d83b9e786dc /tools | |
| parent | weld Security Options Dialog (diff) | |
| download | core-a7780e82305fe2e900afbe9909f9df80ad4019d5.tar.gz core-a7780e82305fe2e900afbe9909f9df80ad4019d5.zip | |
Remove unnecessary INetProtocol::Webdav[s] again
...that 65abd11d68ba9f849d89b98b6a56071411875c89 "Support for webdav:// and
webdavs:// schemes from command line" had added for no good reason, and are
removed again on the same grounds as eda273fd46e63daa4f15525e05b695450df53cea
"Remove unnecessary INetProtocol::VndSunStarWebdavs again".
Change-Id: I29135207dfdffcc818664432a11fa3b5b3a0561a
Reviewed-on: https://gerrit.libreoffice.org/50748
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 78e5c6b1e731..c6e74ddffc58 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -332,12 +332,6 @@ INetURLObject::getSchemeInfo(INetProtocol eTheScheme) "vnd.sun.star.webdav", "vnd.sun.star.webdav://", true, false, false, false, true, true, true, true}, SchemeInfo{ - "webdav", "webdav://", true, false, false, false, true, true, - true, true}, - SchemeInfo{ - "webdavs", "webdavs://", true, false, false, false, true, true, - true, true}, - SchemeInfo{ "private", "private:", false, false, false, false, false, false, false, true}, SchemeInfo{ @@ -2180,10 +2174,6 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *& { "vnd.sun.star.tdoc:", nullptr, INetProtocol::VndSunStarTdoc, PrefixInfo::OFFICIAL }, { "vnd.sun.star.webdav:", nullptr, INetProtocol::VndSunStarWebdav, - PrefixInfo::OFFICIAL }, - { "webdav:", nullptr, INetProtocol::Webdav, - PrefixInfo::OFFICIAL }, - { "webdavs:", nullptr, INetProtocol::Webdavs, PrefixInfo::OFFICIAL } }; /* This list needs to be sorted, or you'll introduce serious bugs */ @@ -2934,8 +2924,6 @@ bool INetURLObject::parsePath(INetProtocol eScheme, case INetProtocol::Http: case INetProtocol::VndSunStarWebdav: - case INetProtocol::Webdav: - case INetProtocol::Webdavs: case INetProtocol::Https: case INetProtocol::Smb: case INetProtocol::Cmis: @@ -3900,8 +3888,8 @@ bool INetURLObject::isAnyKnownWebDAVScheme() const { isSchemeEqualTo( INetProtocol::Https ) || isSchemeEqualTo( INetProtocol::VndSunStarWebdav ) || isSchemeEqualTo( u"vnd.sun.star.webdavs" ) || - isSchemeEqualTo( INetProtocol::Webdav ) || - isSchemeEqualTo( INetProtocol::Webdavs )); + isSchemeEqualTo( u"webdav" ) || + isSchemeEqualTo( u"webdavs" )); } // static |