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 /ucb/source | |
| parent | 8e9e26066333f287476a8ed7b354acceac9f2879 (diff) | |
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 'ucb/source')
| -rw-r--r-- | ucb/source/ucp/webdav-neon/webdavprovider.cxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/webdavprovider.hxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/webdavprovider.cxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/webdavprovider.hxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx index ee2febfe1872..54d4ed5de655 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx @@ -140,14 +140,14 @@ ContentProvider::queryContent( if (aURL.isSchemeEqualTo( INetProtocol::VndSunStarWebdav ) || aURL.isSchemeEqualTo(DAV_URL_SCHEME) || - aURL.isSchemeEqualTo( INetProtocol::Webdav ) ) + aURL.isSchemeEqualTo( WEBDAV_URL_SCHEME ) ) { aURL.changeScheme( INetProtocol::Http ); xCanonicId = new ::ucbhelper::ContentIdentifier( aURL.getExternalURL() ); } else if ( aURL.isSchemeEqualTo( VNDSUNSTARWEBDAVS_URL_SCHEME ) || aURL.isSchemeEqualTo( DAVS_URL_SCHEME ) || - aURL.isSchemeEqualTo( INetProtocol::Webdavs )) + aURL.isSchemeEqualTo( WEBDAVS_URL_SCHEME )) { aURL.changeScheme( INetProtocol::Https ); xCanonicId = new ::ucbhelper::ContentIdentifier( aURL.getExternalURL() ); diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index c8b4679ac1fc..e90d5364a742 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -53,8 +53,8 @@ namespace webdav_ucp { #define HTTPS_URL_SCHEME "https" #define DAV_URL_SCHEME u"dav" #define DAVS_URL_SCHEME u"davs" -#define WEBDAV_URL_SCHEME "webdav" -#define WEBDAVS_URL_SCHEME "webdavs" +#define WEBDAV_URL_SCHEME u"webdav" +#define WEBDAVS_URL_SCHEME u"webdavs" #define FTP_URL_SCHEME "ftp" diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index 5c3cf218da15..0096b5a39384 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -130,14 +130,14 @@ ContentProvider::queryContent( if (aURL.isSchemeEqualTo(INetProtocol::VndSunStarWebdav) || aURL.isSchemeEqualTo(DAV_URL_SCHEME) || - aURL.isSchemeEqualTo(INetProtocol::Webdav)) + aURL.isSchemeEqualTo(WEBDAV_URL_SCHEME)) { aURL.changeScheme(INetProtocol::Http); xCanonicId = new ::ucbhelper::ContentIdentifier( aURL.getExternalURL() ); } else if (aURL.isSchemeEqualTo(VNDSUNSTARWEBDAVS_URL_SCHEME) || aURL.isSchemeEqualTo(DAVS_URL_SCHEME) || - aURL.isSchemeEqualTo(INetProtocol::Webdavs)) + aURL.isSchemeEqualTo(WEBDAVS_URL_SCHEME)) { aURL.changeScheme(INetProtocol::Https); xCanonicId = new ::ucbhelper::ContentIdentifier( aURL.getExternalURL() ); diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx index 4540535a4208..fa6e6e3c8ec2 100644 --- a/ucb/source/ucp/webdav/webdavprovider.hxx +++ b/ucb/source/ucp/webdav/webdavprovider.hxx @@ -47,8 +47,8 @@ namespace http_dav_ucp { #define HTTPS_URL_SCHEME "https" #define DAV_URL_SCHEME u"dav" #define DAVS_URL_SCHEME u"davs" -#define WEBDAV_URL_SCHEME "webdav" -#define WEBDAVS_URL_SCHEME "webdavs" +#define WEBDAV_URL_SCHEME u"webdav" +#define WEBDAVS_URL_SCHEME u"webdavs" #define HTTP_CONTENT_TYPE "application/" HTTP_URL_SCHEME "-content" |