[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, 3 insertions(+), 7 deletions(-)

New commits:
commit 4bdaa70ffba4c782859bddc5c32d897c84d08b8a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Jan 13 18:45:59 2014 +0100

    Revert "Resolves: fdo#72277 https CMIS Alfresco "The specified device is invalid.""
    
    This reverts commit 0d1f724f9645e7ec0da6a4c3a1c22d0dcf785cb6.
    (as requested by https://bugs.freedesktop.org/show_bug.cgi?id=72277#c20)

diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index a2e1868..53777bc 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -297,11 +297,9 @@ 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( ) ), pURL.startsWith("https")?true:false, oauth2Data );
+                        rUsername, rPassword, OUSTR_TO_STDSTR( m_aURL.getRepositoryId( ) ), sal_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 918a3d4..88fefb5 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -159,11 +159,9 @@ 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(pURL),
-                            rUsername, rPassword, "", pURL.startsWith("https")?true:false, oauth2Data );
+                            OUSTR_TO_STDSTR( m_aURL.getBindingUrl( ) ),
+                            rUsername, rPassword, "", sal_False, oauth2Data );
                     if (session == NULL )
                         ucbhelper::cancelCommandExecution(
                                             ucb::IOErrorCode_INVALID_DEVICE,