1 files changed, 17 insertions, 57 deletions

diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index 78ea35df5a71..b9f2f85e5493 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -28,6 +28,8 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/ucb/IllegalIdentifierException.hpp>
 
+#include <tools/urlobj.hxx>
+
 using namespace com::sun::star;
 using namespace http_dav_ucp;
 
@@ -116,76 +118,34 @@ ContentProvider::queryContent(
                     ucb::XContentIdentifier >& Identifier )
 {
     // Check URL scheme...
+    INetURLObject aURL(Identifier->getContentIdentifier());
 
-    const OUString aScheme
-        = Identifier->getContentProviderScheme().toAsciiLowerCase();
-    if ( aScheme != HTTP_URL_SCHEME && aScheme != HTTPS_URL_SCHEME &&
-         aScheme != WEBDAV_URL_SCHEME && aScheme != WEBDAVS_URL_SCHEME &&
-         aScheme != DAV_URL_SCHEME && aScheme != DAVS_URL_SCHEME )
-        throw ucb::IllegalIdentifierException();
-
-    // Normalize URL and create new Id, if nessacary.
-    OUString aURL = Identifier->getContentIdentifier();
-
-    // At least: <scheme> + "://"
-    if ( aURL.getLength() < ( aScheme.getLength() + 3 ) )
+    if (aURL.isSchemeEqualTo(INetProtocol::NotValid))
         throw ucb::IllegalIdentifierException();
 
-    if ( !aURL.match("://", aScheme.getLength()) )
+    if (!aURL.isAnyKnownWebDAVScheme())
         throw ucb::IllegalIdentifierException();
 
     uno::Reference< ucb::XContentIdentifier > xCanonicId;
 
-    bool bNewId = false;
-    if ( aScheme == WEBDAV_URL_SCHEME )
-    {
-        aURL = aURL.replaceAt( 0,
-                               WEBDAV_URL_SCHEME_LENGTH,
-                               HTTP_URL_SCHEME );
-        bNewId = true;
-    }
-    else if ( aScheme == WEBDAVS_URL_SCHEME )
-    {
-        aURL = aURL.replaceAt( 0,
-                               WEBDAVS_URL_SCHEME_LENGTH,
-                               HTTPS_URL_SCHEME );
-        bNewId = true;
-    }
-    else if ( aScheme == DAV_URL_SCHEME )
-    {
-        aURL = aURL.replaceAt( 0,
-                               DAV_URL_SCHEME_LENGTH,
-                               HTTP_URL_SCHEME );
-        bNewId = true;
-    }
-    else if ( aScheme == DAVS_URL_SCHEME )
+    if (aURL.isSchemeEqualTo(INetProtocol::VndSunStarWebdav) ||
+        aURL.isSchemeEqualTo(DAV_URL_SCHEME) ||
+        aURL.isSchemeEqualTo(INetProtocol::Webdav))
     {
-        aURL = aURL.replaceAt( 0,
-                               DAVS_URL_SCHEME_LENGTH,
-                               HTTPS_URL_SCHEME );
-        bNewId = true;
+        aURL.changeScheme(INetProtocol::Http);
+        xCanonicId = new ::ucbhelper::ContentIdentifier( aURL.getExternalURL() );
     }
-
-    sal_Int32 nPos = aURL.lastIndexOf( '/' );
-    if ( nPos != aURL.getLength() - 1 )
+    else if (aURL.isSchemeEqualTo(INetProtocol::VndSunStarWebdavs) ||
+        aURL.isSchemeEqualTo(DAVS_URL_SCHEME) ||
+        aURL.isSchemeEqualTo(INetProtocol::Webdavs))
     {
-        // Find second slash in URL.
-        nPos = aURL.indexOf( '/', aURL.indexOf( '/' ) + 1 );
-        if ( nPos == -1 )
-            throw ucb::IllegalIdentifierException();
-
-        nPos = aURL.indexOf( '/', nPos + 1 );
-        if ( nPos == -1 )
-        {
-            aURL += "/";
-            bNewId = true;
-        }
+        aURL.changeScheme(INetProtocol::Https);
+        xCanonicId = new ::ucbhelper::ContentIdentifier( aURL.getExternalURL() );
     }
-
-    if ( bNewId )
-        xCanonicId = new ::ucbhelper::ContentIdentifier( aURL );
     else
+    {
         xCanonicId = Identifier;
+    }
 
     osl::MutexGuard aGuard( m_aMutex );