[Libreoffice-commits] core.git: include/tools tools/source ucb/source

[Stephan Bergmann]

 include/tools/urlobj.hxx                      |    1 -
 tools/source/fsys/urlobj.cxx                  |    8 +-------
 ucb/source/ucp/webdav-neon/webdavprovider.cxx |    2 +-
 ucb/source/ucp/webdav-neon/webdavprovider.hxx |    2 +-
 ucb/source/ucp/webdav/webdavprovider.cxx      |    2 +-
 ucb/source/ucp/webdav/webdavprovider.hxx      |    2 +-
 6 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 919546585a09a755f0454c80ec5d9fdadd12d87a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Mar 4 16:27:42 2018 +0100

    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 at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx
index cceab871a383..e199ab0c49a9 100644
--- a/include/tools/urlobj.hxx
+++ b/include/tools/urlobj.hxx
@@ -55,7 +55,6 @@ enum class INetProtocol
     File,
     Mailto,
     VndSunStarWebdav,
-    VndSunStarWebdavs,
     Webdav,
     Webdavs,
     PrivSoffice,
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 ));
 }
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
index 16a0e21f351b..ee2febfe1872 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx
@@ -145,7 +145,7 @@ ContentProvider::queryContent(
         aURL.changeScheme( INetProtocol::Http );
         xCanonicId = new ::ucbhelper::ContentIdentifier( aURL.getExternalURL() );
     }
-    else if ( aURL.isSchemeEqualTo( INetProtocol::VndSunStarWebdavs ) ||
+    else if ( aURL.isSchemeEqualTo( VNDSUNSTARWEBDAVS_URL_SCHEME ) ||
         aURL.isSchemeEqualTo( DAVS_URL_SCHEME ) ||
         aURL.isSchemeEqualTo( INetProtocol::Webdavs ))
     {
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
index 3e90c7fef5ab..c8b4679ac1fc 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
@@ -48,7 +48,7 @@ namespace webdav_ucp {
 // contents for. The UCB will select the provider ( i.e. in order to create
 // contents ) according to this scheme.
 #define VNDSUNSTARWEBDAV_URL_SCHEME  "vnd.sun.star.webdav"
-#define VNDSUNSTARWEBDAVS_URL_SCHEME "vnd.sun.star.webdavs"
+#define VNDSUNSTARWEBDAVS_URL_SCHEME u"vnd.sun.star.webdavs"
 #define HTTP_URL_SCHEME              "http"
 #define HTTPS_URL_SCHEME             "https"
 #define DAV_URL_SCHEME               u"dav"
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index b9f2f85e5493..5c3cf218da15 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -135,7 +135,7 @@ ContentProvider::queryContent(
         aURL.changeScheme(INetProtocol::Http);
         xCanonicId = new ::ucbhelper::ContentIdentifier( aURL.getExternalURL() );
     }
-    else if (aURL.isSchemeEqualTo(INetProtocol::VndSunStarWebdavs) ||
+    else if (aURL.isSchemeEqualTo(VNDSUNSTARWEBDAVS_URL_SCHEME) ||
         aURL.isSchemeEqualTo(DAVS_URL_SCHEME) ||
         aURL.isSchemeEqualTo(INetProtocol::Webdavs))
     {
diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx
index d01455b25332..4540535a4208 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -42,7 +42,7 @@ namespace http_dav_ucp {
 // contents for. The UCB will select the provider ( i.e. in order to create
 // contents ) according to this scheme.
 #define VNDSUNSTARWEBDAV_URL_SCHEME  "vnd.sun.star.webdav"
-#define VNDSUNSTARWEBDAVS_URL_SCHEME "vnd.sun.star.webdavs"
+#define VNDSUNSTARWEBDAVS_URL_SCHEME u"vnd.sun.star.webdavs"
 #define HTTP_URL_SCHEME              "http"
 #define HTTPS_URL_SCHEME             "https"
 #define DAV_URL_SCHEME               u"dav"