diff options
| author | Cao Cuong Ngo <cao.cuong.ngo@gmail.com> | 2013-07-16 16:41:52 +0200 |
|---|---|---|
| committer | Cao Cuong Ngo <cao.cuong.ngo@gmail.com> | 2013-07-16 16:41:52 +0200 |
| commit | ae0903a8db71a695483a1801fc72739992be4fe5 (patch) | |
| tree | eae924fc61af67926afab49d74b7e8d2d066cab4 | |
| parent | fd4d31b16702fa1f8e522350df0766e16a86b5e0 (diff) | |
CMIS: the file picker prefer path to ID
Change-Id: I3a8d52411176d29f67340d8b668b8e9cc940d648
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_oauth2_providers.hxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_url.cxx | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/ucb/source/ucp/cmis/cmis_oauth2_providers.hxx b/ucb/source/ucp/cmis/cmis_oauth2_providers.hxx index bd3df5b22ba9..63df6a48e305 100644 --- a/ucb/source/ucp/cmis/cmis_oauth2_providers.hxx +++ b/ucb/source/ucp/cmis/cmis_oauth2_providers.hxx @@ -10,7 +10,7 @@ * */ -#ifndef CMIS_OAUTH2_PROVIDER2_HXX +#ifndef CMIS_OAUTH2_PROVIDERS_HXX #define CMIS_OAUTH2_PROVIDERS_HXX diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index 5d82e18804d0..bbafee5f583d 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -86,15 +86,7 @@ namespace cmis RTL_TEXTENCODING_UTF8 ); sUrl = "vnd.libreoffice.cmis://" + sEncodedBinding; - // Prefer get object by ID - if ( !m_sId.isEmpty( ) ) - { - sUrl += "#" + rtl::Uri::encode( m_sId, - rtl_UriCharClassRelSegment, - rtl_UriEncodeKeepEscapes, - RTL_TEXTENCODING_UTF8 ); - } - else if ( !m_sPath.isEmpty( ) ) + if ( !m_sPath.isEmpty( ) ) { sal_Int32 nPos = -1; OUString sEncodedPath; @@ -118,6 +110,13 @@ namespace cmis while ( nPos != -1 ); sUrl += sEncodedPath; } + else if ( !m_sId.isEmpty( ) ) + { + sUrl += "#" + rtl::Uri::encode( m_sId, + rtl_UriCharClassRelSegment, + rtl_UriEncodeKeepEscapes, + RTL_TEXTENCODING_UTF8 ); + } return sUrl; } |