summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorCao Cuong Ngo <cao.cuong.ngo@gmail.com>2013-07-16 20:00:56 +0200
committerCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2013-09-02 13:51:52 +0200
commita281090de6f574d51af7a5d58c6a13ed30ba1055 (patch)
treefaf3b68f8faecdd488b861ad5497ad54d11d266e /ucb
parent9431ace820221a77f9110165ba7f3746a7bdb538 (diff)
CMIS: make GDrive work with path
Change-Id: Ib85be2887219e6067a1b6c227515504020f9a4e7
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/cmis/cmis_content.cxx6
-rw-r--r--ucb/source/ucp/cmis/cmis_url.cxx6
2 files changed, 6 insertions, 6 deletions
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 38ea240e862c..5e843822bb34 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1449,7 +1449,11 @@ namespace cmis
{
libcmis::Folder* folder = dynamic_cast< libcmis::Folder* >( pObj.get( ) );
if ( NULL != folder )
- parentPath = folder->getFolderParent( )->getPath( );
+ {
+ libcmis::FolderPtr parentFolder = folder->getFolderParent( );
+ if ( NULL != parentFolder )
+ parentPath = parentFolder->getPath( );
+ }
}
}
catch ( const libcmis::Exception & )
diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx
index 4602f5b87309..bf0bed96ab8e 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -32,11 +32,7 @@ namespace cmis
m_sPass = aUrl.GetPass( INetURLObject::DECODE_WITH_CHARSET );
// Store the path to the object
- // Google Drive doesn't support getObjectByPath
- if ( m_sBindingUrl == GDRIVE_BASE_URL )
- m_sPath = OUString( );
- else
- m_sPath = aUrl.GetURLPath( INetURLObject::DECODE_WITH_CHARSET );
+ m_sPath = aUrl.GetURLPath( INetURLObject::DECODE_WITH_CHARSET );
m_sId = aUrl.GetMark( INetURLObject::DECODE_WITH_CHARSET );
if ( !m_sId.isEmpty( ) )