summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCao Cuong Ngo <cao.cuong.ngo@gmail.com>2013-07-16 20:00:56 +0200
committerCao Cuong Ngo <cao.cuong.ngo@gmail.com>2013-07-16 20:00:56 +0200
commit9020aef661d87f846b3d436d00a7118b69a45ddc (patch)
treed7d440360b710dcb5adf0bc3a6ab0029e7363356
parentb2e7610ca2ff5f7edae3312116e1a04792ac7a16 (diff)
CMIS: make GDrive work with path
Change-Id: Ib85be2887219e6067a1b6c227515504020f9a4e7
-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 3d35567a9336..9ec04f7b7e47 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1452,7 +1452,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 bbafee5f583d..ac26167328d0 100644
--- a/ucb/source/ucp/cmis/cmis_url.cxx
+++ b/ucb/source/ucp/cmis/cmis_url.cxx
@@ -35,11 +35,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( ) )