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

[Julien Nabet]

 ucb/source/ucp/cmis/cmis_content.cxx      |    4 +++-
 ucb/source/ucp/cmis/cmis_repo_content.cxx |    6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 0d1f724f9645e7ec0da6a4c3a1c22d0dcf785cb6
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Jan 11 16:38:08 2014 +0100

    Resolves: fdo#72277 https CMIS Alfresco "The specified device is invalid."
    
    Change-Id: I34f8b5e19d9bea0c6d98a7f3258b67e82c50e1de

diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 53777bc..a2e1868 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -297,9 +297,11 @@ namespace cmis
                         ALFRESCO_CLOUD_SCOPE, ALFRESCO_CLOUD_REDIRECT_URI,
                         ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET ) );
 
+                OUString pURL =  m_aURL.getBindingUrl( );
+
                 m_pSession = libcmis::SessionFactory::createSession(
                         OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ),
-                        rUsername, rPassword, OUSTR_TO_STDSTR( m_aURL.getRepositoryId( ) ), sal_False, oauth2Data );
+                        rUsername, rPassword, OUSTR_TO_STDSTR( m_aURL.getRepositoryId( ) ), pURL.startsWith("https")?true:false, oauth2Data );
                 if ( m_pSession == NULL )
                     ucbhelper::cancelCommandExecution(
                                         ucb::IOErrorCode_INVALID_DEVICE,
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 88fefb5..918a3d4 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -159,9 +159,11 @@ namespace cmis
                             ALFRESCO_CLOUD_SCOPE, ALFRESCO_CLOUD_REDIRECT_URI,
                             ALFRESCO_CLOUD_CLIENT_ID, ALFRESCO_CLOUD_CLIENT_SECRET ) );
 
+                    OUString pURL =  m_aURL.getBindingUrl( );
+
                     libcmis::Session* session = libcmis::SessionFactory::createSession(
-                            OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ),
-                            rUsername, rPassword, "", sal_False, oauth2Data );
+                            OUSTR_TO_STDSTR(pURL),
+                            rUsername, rPassword, "", pURL.startsWith("https")?true:false, oauth2Data );
                     if (session == NULL )
                         ucbhelper::cancelCommandExecution(
                                             ucb::IOErrorCode_INVALID_DEVICE,