diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-10-16 12:53:31 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-10-31 12:03:28 +0100 |
| commit | 4cc2571e49de162f52ac9ec171f98732bb256517 (patch) | |
| tree | fbe925fb2b021060d327073153436994cef65b7a /ucb | |
| parent | c88c9b4ff2c408c0a383d5c7c658210b96e1430a (diff) | |
CMIS urls: remove +atom in the internal URLS as the binding is guessed
Change-Id: I9ae0704f1e5203778e97de5843efe777ba717271
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_content.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_content.hxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_repo_content.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_repo_content.hxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_url.cxx | 2 |
5 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 ae448ed087b7..adf9eecd83d5 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -649,7 +649,7 @@ namespace cmis { // If the source isn't on the same CMIS repository, then simply copy INetURLObject aSourceUrl( rTransferInfo.SourceURL ); - if ( aSourceUrl.GetProtocol() != INET_PROT_CMIS_ATOM ) + if ( aSourceUrl.GetProtocol() != INET_PROT_CMIS ) { rtl::OUString sSrcBindingUrl = URL( rTransferInfo.SourceURL ).getBindingUrl( ); if ( sSrcBindingUrl != m_aURL.getBindingUrl( ) ) diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index 3273517042cc..db98e3ee577a 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -61,8 +61,8 @@ namespace ucbhelper namespace cmis { -#define CMIS_FILE_TYPE "application/vnd.sun.staroffice.cmis-file" -#define CMIS_FOLDER_TYPE "application/vnd.sun.staroffice.cmis-folder" +#define CMIS_FILE_TYPE "application/vnd.libreoffice.cmis-file" +#define CMIS_FOLDER_TYPE "application/vnd.libreoffice.cmis-folder" class ContentProvider; class Content : public ::ucbhelper::ContentImplHelper, diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index 5e384e38e351..fdac399ee61b 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -378,7 +378,7 @@ namespace cmis rtl_UriCharClassRelSegment, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8 ); - sUrl = "vnd.libreoffice.cmis+atom://" + sEncodedBinding; + sUrl = "vnd.libreoffice.cmis://" + sEncodedBinding; uno::Reference< ucb::XContentIdentifier > xId = new ucbhelper::ContentIdentifier( sUrl ); uno::Reference< ucb::XContent > xContent = new Content( m_xSMgr, m_pProvider, xId ); diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx index 11a1436a0aba..2c4a32f3e2b3 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.hxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx @@ -60,7 +60,7 @@ namespace ucbhelper namespace cmis { -#define CMIS_REPO_TYPE "application/vnd.sun.staroffice.cmis-repository" +#define CMIS_REPO_TYPE "application/vnd.libreoffice.cmis-repository" class ContentProvider; class RepoContent : public ::ucbhelper::ContentImplHelper, diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index dfd0cc73e5cd..eb779d800e84 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -103,7 +103,7 @@ namespace cmis rtl_UriCharClassRelSegment, rtl_UriEncodeKeepEscapes, RTL_TEXTENCODING_UTF8 ); - sUrl = "vnd.libreoffice.cmis+atom://" + sEncodedBinding; + sUrl = "vnd.libreoffice.cmis://" + sEncodedBinding; if ( !m_sPath.isEmpty( ) ) { |