INTEGRATION: CWS tkr10 (1.18.58); FILE MERGED

2008/05/19 09:27:05 tkr 1.18.58.3: RESYNC: (1.19-1.20); FILE MERGED
2008/03/28 13:56:17 tkr 1.18.58.2: RESYNC: (1.18-1.19); FILE MERGED
2008/02/12 14:05:04 tkr 1.18.58.1: i84676 neon and gnome-vfs2

ucb/source/ucp/webdav/webdavprovider.cxx

@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: webdavprovider.cxx,v $
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -133,11 +133,13 @@ ContentProvider::queryContent(
          !aScheme.equalsAsciiL(
             RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) &&
          !aScheme.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) )
-         &&
+            RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) &&
          !aScheme.equalsAsciiL(
-            RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) )
-       )
+            RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) &&
+         !aScheme.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) &&
+          !aScheme.equalsAsciiL(
+             RTL_CONSTASCII_STRINGPARAM( FTP_URL_SCHEME ) )       )
         throw ucb::IllegalIdentifierException();
 
     // Normalize URL and create new Id, if nessacary.
@@ -164,6 +166,24 @@ ContentProvider::queryContent(
                                                     HTTP_URL_SCHEME ) );
         bNewId = true;
     }
+    else if ( aScheme.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+    {
+        aURL = aURL.replaceAt( 0,
+                               DAV_URL_SCHEME_LENGTH,
+                               rtl::OUString::createFromAscii(
+                                                    HTTP_URL_SCHEME ) );
+        bNewId = true;
+    }
+    else if ( aScheme.equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
+    {
+        aURL = aURL.replaceAt( 0,
+                               DAVS_URL_SCHEME_LENGTH,
+                               rtl::OUString::createFromAscii(
+                                                    HTTPS_URL_SCHEME ) );
+        bNewId = true;
+    }
 
     sal_Int32 nPos = aURL.lastIndexOf( '/' );
     if ( nPos != aURL.getLength() - 1 )