diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 08:47:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 12:49:02 +0200 |
| commit | bfde4866e07746eafa2f0d6173c29d805cc35ad0 (patch) | |
| tree | be939a44eb70c7187fa5536089b782326b160013 /ucb/source/ucp/cmis | |
| parent | 803215142efa6437515348f63bd70ffdcf5d45f1 (diff) | |
convert DecodeMechanism to scoped enum
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'ucb/source/ucp/cmis')
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_content.cxx | 8 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_url.cxx | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index c5fa4a555c82..05de98078935 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -536,9 +536,9 @@ namespace cmis // It's weird, but needed to handle case where the path isn't the folders/files // names separated by '/' (as in Lotus Live) INetURLObject aParentUrl( m_sURL ); - string sName = OUSTR_TO_STDSTR( aParentUrl.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ) ); + string sName = OUSTR_TO_STDSTR( aParentUrl.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset ) ); aParentUrl.removeSegment( ); - OUString sParentUrl = aParentUrl.GetMainURL( INetURLObject::NO_DECODE ); + OUString sParentUrl = aParentUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ); // Avoid infinite recursion if sParentUrl == m_sURL if (sParentUrl != m_sURL) { @@ -1697,7 +1697,7 @@ namespace cmis { URL aCmisUrl( m_sURL ); aUrl.removeSegment( ); - aCmisUrl.setObjectPath( aUrl.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ) ); + aCmisUrl.setObjectPath( aUrl.GetURLPath( INetURLObject::DecodeMechanism::WithCharset ) ); parentUrl = aCmisUrl.asString( ); } } @@ -2043,7 +2043,7 @@ namespace cmis // TODO Cache the objects INetURLObject aURL( m_sURL ); - OUString sUser = aURL.GetUser( INetURLObject::DECODE_WITH_CHARSET ); + OUString sUser = aURL.GetUser( INetURLObject::DecodeMechanism::WithCharset ); URL aUrl( m_sURL ); OUString sPath( m_sObjectPath ); diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index 151b85c22323..3fbfce3bad70 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -23,17 +23,17 @@ namespace cmis INetURLObject aUrl( urlStr ); // Decode the authority to get the binding URL and repository id - OUString sDecodedHost = aUrl.GetHost( INetURLObject::DECODE_WITH_CHARSET ); + OUString sDecodedHost = aUrl.GetHost( INetURLObject::DecodeMechanism::WithCharset ); INetURLObject aHostUrl( sDecodedHost ); m_sBindingUrl = aHostUrl.GetURLNoMark( ); m_sRepositoryId = aHostUrl.GetMark( ); - m_sUser = aUrl.GetUser( INetURLObject::DECODE_WITH_CHARSET ); - m_sPass = aUrl.GetPass( INetURLObject::DECODE_WITH_CHARSET ); + m_sUser = aUrl.GetUser( INetURLObject::DecodeMechanism::WithCharset ); + m_sPass = aUrl.GetPass( INetURLObject::DecodeMechanism::WithCharset ); // Store the path to the object - m_sPath = aUrl.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ); - m_sId = aUrl.GetMark( INetURLObject::DECODE_WITH_CHARSET ); + m_sPath = aUrl.GetURLPath( INetURLObject::DecodeMechanism::WithCharset ); + m_sId = aUrl.GetMark( INetURLObject::DecodeMechanism::WithCharset ); if ( m_sPath == "/" && m_sBindingUrl.indexOf( "google" ) != -1 ) m_sId = "root"; |