diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-03-04 16:27:42 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-03-04 18:16:06 +0100 |
| commit | 919546585a09a755f0454c80ec5d9fdadd12d87a (patch) | |
| tree | 73ec98c28c32d8af0a6bdbff50bc6be0c326e757 /tools/source | |
| parent | c7a071b064695fdb93fedf37d4ed4ea99d83e99b (diff) | |
Remove unnecessary INetProtocol::VndSunStarWebdavs again
...that 65abd11d68ba9f849d89b98b6a56071411875c89 "Support for webdav:// and
webdavs:// schemes from command line" had added for no good reason. See the
discussion linked from the commit message of
d3de490437df4c9093f32e97fc185066d64c0f46 "Add vnd.sun.star.webdavs URL scheme"
why this had deliberately not been added when adding the vnd.sun.star.webdavs
scheme.
Change-Id: I5728ab0d2517dae54a3536a347a83ff4cbfc18fa
Reviewed-on: https://gerrit.libreoffice.org/50734
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'tools/source')
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 5e8ca4d0d614..78e5c6b1e731 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -332,9 +332,6 @@ INetURLObject::getSchemeInfo(INetProtocol eTheScheme) "vnd.sun.star.webdav", "vnd.sun.star.webdav://", true, false, false, false, true, true, true, true}, SchemeInfo{ - "vnd.sun.star.webdavs", "vnd.sun.star.webdavs://", true, false, - false, false, true, true, true, true}, - SchemeInfo{ "webdav", "webdav://", true, false, false, false, true, true, true, true}, SchemeInfo{ @@ -2184,8 +2181,6 @@ INetURLObject::PrefixInfo const * INetURLObject::getPrefix(sal_Unicode const *& PrefixInfo::OFFICIAL }, { "vnd.sun.star.webdav:", nullptr, INetProtocol::VndSunStarWebdav, PrefixInfo::OFFICIAL }, - { "vnd.sun.star.webdavs:", nullptr, INetProtocol::VndSunStarWebdavs, - PrefixInfo::OFFICIAL }, { "webdav:", nullptr, INetProtocol::Webdav, PrefixInfo::OFFICIAL }, { "webdavs:", nullptr, INetProtocol::Webdavs, @@ -2939,7 +2934,6 @@ bool INetURLObject::parsePath(INetProtocol eScheme, case INetProtocol::Http: case INetProtocol::VndSunStarWebdav: - case INetProtocol::VndSunStarWebdavs: case INetProtocol::Webdav: case INetProtocol::Webdavs: case INetProtocol::Https: @@ -3905,7 +3899,7 @@ bool INetURLObject::isAnyKnownWebDAVScheme() const { return ( isSchemeEqualTo( INetProtocol::Http ) || isSchemeEqualTo( INetProtocol::Https ) || isSchemeEqualTo( INetProtocol::VndSunStarWebdav ) || - isSchemeEqualTo( INetProtocol::VndSunStarWebdavs ) || + isSchemeEqualTo( u"vnd.sun.star.webdavs" ) || isSchemeEqualTo( INetProtocol::Webdav ) || isSchemeEqualTo( INetProtocol::Webdavs )); } |