[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - ucb/source

[Giuseppe Castagno]

 ucb/source/ucp/webdav-neon/webdavcontent.cxx |   26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

New commits:
commit 7704b0bd61b622d0186aca43626b37fdf364d397
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Sun Dec 27 11:19:39 2015 +0100

    tdf#96669: IsDocument should be true only if the document exists
    
    Fixes a problem with Save to remote server dialog.
    
    Change-Id: I4ef2dbf12bb786f5617cb57ff021012e4d884230
    Reviewed-on: https://gerrit.libreoffice.org/21010
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    Tested-by: jan iversen <jani at documentfoundation.org>
    (cherry picked from commit 5fc2910fc872bbd1184aaab7c842dff593d2449b)
    Reviewed-on: https://gerrit.libreoffice.org/21258
    Reviewed-by: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
index d7fe644..85ef1ed 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx
@@ -865,6 +865,7 @@ void Content::addProperty( const ucb::PropertyCommandArgument& aCmdArg,
                     switch ( eType )
                     {
                     case UNKNOWN:
+                    case NOT_FOUND:
                     case DAV:
                         throw lang::IllegalArgumentException();
 
@@ -953,6 +954,7 @@ void Content::removeProperty( const OUString& Name,
                     switch ( eType )
                     {
                         case UNKNOWN:
+                        case NOT_FOUND:
                         case DAV:
                             throw beans::UnknownPropertyException();
 
@@ -1439,7 +1441,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
         NeonUri aUri( xResAccess->getURL() );
         aUnescapedTitle = aUri.GetPathBaseNameUnescaped();
 
-        if ( eType == UNKNOWN )
+        if ( eType == UNKNOWN || eType == NOT_FOUND )
         {
             xProps.reset( new ContentProperties( aUnescapedTitle ) );
         }
@@ -1470,10 +1472,20 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                 "IsFolder",
                 uno::makeAny( false ),
                 true );
-            xProps->addProperty(
+            if ( eType == NOT_FOUND )
+            {
+                xProps->addProperty(
+                "IsDocument",
+                uno::makeAny( false ),
+                true );
+            }
+            else
+            {
+                xProps->addProperty(
                 "IsDocument",
                 uno::makeAny( true ),
                 true );
+            }
         }
     }
     else
@@ -2897,7 +2909,7 @@ Content::ResourceType Content::resourceTypeForLocks(
         }
     }
     osl::MutexGuard g(m_aMutex);
-    if (m_eResourceTypeForLocks == UNKNOWN)
+    if ( m_eResourceTypeForLocks == UNKNOWN || m_eResourceTypeForLocks == NOT_FOUND )
     {
         m_eResourceTypeForLocks = eResourceTypeForLocks;
     }
@@ -3435,7 +3447,7 @@ Content::ResourceType Content::getResourceType(
 {
     {
         osl::MutexGuard g(m_aMutex);
-        if (m_eResourceType != UNKNOWN) {
+        if ( m_eResourceType != UNKNOWN && m_eResourceType != NOT_FOUND ) {
             return m_eResourceType;
         }
     }
@@ -3484,6 +3496,10 @@ Content::ResourceType Content::getResourceType(
         {
             rResAccess->resetUri();
 
+            if ( e.getStatus() == SC_NOT_FOUND )
+            {
+                eResourceType = NOT_FOUND;
+            }
             if ( e.getStatus() == SC_METHOD_NOT_ALLOWED )
             {
                 // Status SC_METHOD_NOT_ALLOWED is a safe indicator that the
@@ -3507,7 +3523,7 @@ Content::ResourceType Content::getResourceType(
     }
 
     osl::MutexGuard g(m_aMutex);
-    if (m_eResourceType == UNKNOWN) {
+    if ( m_eResourceType == UNKNOWN || m_eResourceType == NOT_FOUND ) {
         m_eResourceType = eResourceType;
     } else {
         SAL_WARN_IF(