CMIS: the file picker prefer path to ID

Change-Id: I3a8d52411176d29f67340d8b668b8e9cc940d648

ucb/source/ucp/cmis/cmis_oauth2_providers.hxx

@@ -10,7 +10,7 @@
  *
  */
 
-#ifndef CMIS_OAUTH2_PROVIDER2_HXX
+#ifndef CMIS_OAUTH2_PROVIDERS_HXX
 #define CMIS_OAUTH2_PROVIDERS_HXX
 
 

ucb/source/ucp/cmis/cmis_url.cxx

@@ -83,15 +83,7 @@ namespace cmis
                 RTL_TEXTENCODING_UTF8 );
         sUrl = "vnd.libreoffice.cmis://" + sEncodedBinding;
 
-        // Prefer get object by ID
-        if ( !m_sId.isEmpty( ) )
-        {
-            sUrl += "#" + rtl::Uri::encode( m_sId,
-                rtl_UriCharClassRelSegment,
-                rtl_UriEncodeKeepEscapes,
-                RTL_TEXTENCODING_UTF8 );
-        }
-        else if ( !m_sPath.isEmpty( ) )
+        if ( !m_sPath.isEmpty( ) )
         {
             sal_Int32 nPos = -1;
             OUString sEncodedPath;
@@ -115,6 +107,13 @@ namespace cmis
             while ( nPos != -1 );
             sUrl += sEncodedPath;
         }
+        else if ( !m_sId.isEmpty( ) )
+        {
+            sUrl += "#" + rtl::Uri::encode( m_sId,
+                rtl_UriCharClassRelSegment,
+                rtl_UriEncodeKeepEscapes,
+                RTL_TEXTENCODING_UTF8 );
+        }
 
         return sUrl;
     }