convert DecodeMechanism to scoped enum

(cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0)

(cherry picked from commit 3de922d4a695e253d4ca2d42b70e0b35b52e9b7c)

Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547

3 files changed, 32 insertions, 32 deletions

diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index e88ef9d403ac..4c2859da297a 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -225,15 +225,15 @@ void OFileAccess::transferImpl( const OUString& rSource,
     INetURLObject aSourceObj( rSource, INetProtocol::File );
     INetURLObject aDestObj( rDest, INetProtocol::File );
     OUString aName = aDestObj.getName(
-        INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+        INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset );
     OUString aDestURL;
-    OUString aSourceURL = aSourceObj.GetMainURL( INetURLObject::NO_DECODE );
+    OUString aSourceURL = aSourceObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
     if ( aDestObj.removeSegment() )
     {
         // hierarchical URL.
 
         aDestObj.setFinalSlash();
-        aDestURL = aDestObj.GetMainURL( INetURLObject::NO_DECODE );
+        aDestURL = aDestObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
     }
     else
     {
@@ -252,7 +252,7 @@ void OFileAccess::transferImpl( const OUString& rSource,
                 Reference< XMacroExpander > xExpander = theMacroExpander::get(m_xContext);
 
                 aDestURL = xExpander->expandMacros(
-                    aDestObj.GetURLPath( INetURLObject::DECODE_WITH_CHARSET ) );
+                    aDestObj.GetURLPath( INetURLObject::DecodeMechanism::WithCharset ) );
             }
             catch ( Exception const & )
             {
@@ -306,7 +306,7 @@ void OFileAccess::kill( const OUString& FileURL )
 {
     // SfxContentHelper::Kill
     INetURLObject aDeleteObj( FileURL, INetProtocol::File );
-    ucbhelper::Content aCnt( aDeleteObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aCnt( aDeleteObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() );
     try
     {
         aCnt.executeCommand( "delete", makeAny( true ) );
@@ -324,7 +324,7 @@ sal_Bool OFileAccess::isFolder( const OUString& FileURL )
     try
     {
         INetURLObject aURLObj( FileURL, INetProtocol::File );
-        ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+        ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() );
         bRet = aCnt.isFolder();
     }
     catch (const Exception &) {}
@@ -335,7 +335,7 @@ sal_Bool OFileAccess::isReadOnly( const OUString& FileURL )
     throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aURLObj( FileURL, INetProtocol::File );
-    ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() );
     Any aRetAny = aCnt.getPropertyValue("IsReadOnly");
     bool bRet = false;
     aRetAny >>= bRet;
@@ -346,7 +346,7 @@ void OFileAccess::setReadOnly( const OUString& FileURL, sal_Bool bReadOnly )
     throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aURLObj( FileURL, INetProtocol::File );
-    ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() );
     aCnt.setPropertyValue("IsReadOnly", Any(bReadOnly) );
 }
 
@@ -359,20 +359,20 @@ void OFileAccess::createFolder( const OUString& NewFolderURL )
 
     // SfxContentHelper::MakeFolder
     INetURLObject aURL( NewFolderURL, INetProtocol::File );
-    OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+    OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset );
     if ( !aTitle.isEmpty() )
     {
         aURL.removeSegment();
 
         // Does the base folder exist? Otherwise create it first
-        OUString aBaseFolderURLStr = aURL.GetMainURL( INetURLObject::NO_DECODE );
+        OUString aBaseFolderURLStr = aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE );
         if( !isFolder( aBaseFolderURLStr ) )
         {
             createFolder( aBaseFolderURLStr );
         }
     }
 
-    ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() );
 
     Sequence< ContentInfo > aInfo = aCnt.queryCreatableContentsInfo();
     sal_Int32 nCount = aInfo.getLength();
@@ -423,7 +423,7 @@ sal_Int32 OFileAccess::getSize( const OUString& FileURL )
     sal_Int32 nSize = 0;
     sal_Int64 nTemp = 0;
     INetURLObject aObj( FileURL, INetProtocol::File );
-    ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() );
     aCnt.getPropertyValue( "Size" ) >>= nTemp;
     nSize = (sal_Int32)nTemp;
     return nSize;
@@ -433,7 +433,7 @@ OUString OFileAccess::getContentType( const OUString& FileURL )
     throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aObj( FileURL, INetProtocol::File );
-    ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() );
 
     Reference< XContent > xContent = aCnt.get();
     OUString aTypeStr = xContent->getContentType();
@@ -447,7 +447,7 @@ css::util::DateTime OFileAccess::getDateTimeModified( const OUString& FileURL )
     css::util::DateTime aDateTime;
 
     Reference< XCommandEnvironment > aCmdEnv;
-    ucbhelper::Content aYoung( aFileObj.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aYoung( aFileObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), aCmdEnv, comphelper::getProcessComponentContext() );
     aYoung.getPropertyValue("DateModified") >>= aDateTime;
     return aDateTime;
 }
@@ -462,7 +462,7 @@ Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL,
     StringList_Impl* pFiles = nullptr;
     INetURLObject aFolderObj( FolderURL, INetProtocol::File );
 
-    ucbhelper::Content aCnt( aFolderObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aCnt( aFolderObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() );
     Reference< XResultSet > xResultSet;
     Sequence< OUString > aProps(0);
 
@@ -486,7 +486,7 @@ Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL,
         {
             OUString aId = xContentAccess->queryContentIdentifierString();
             INetURLObject aURL( aId, INetProtocol::File );
-            OUString* pFile = new OUString( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
+            OUString* pFile = new OUString( aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
             pFiles->push_back( pFile );
         }
     }
@@ -534,7 +534,7 @@ Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL )
 {
     Reference< XInputStream > xRet;
     INetURLObject aObj( FileURL, INetProtocol::File );
-    ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() );
 
     Reference< XActiveDataSink > xSink = static_cast<XActiveDataSink*>(new OActiveDataSink());
 
@@ -578,7 +578,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL )
     aCmdArg <<= aArg;
 
     INetURLObject aFileObj( FileURL, INetProtocol::File );
-    ucbhelper::Content aCnt( aFileObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aCnt( aFileObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() );
 
     // Be silent...
     Reference< XInteractionHandler > xIH;
@@ -698,7 +698,7 @@ void SAL_CALL OFileAccess::writeFile( const OUString& FileURL,
     try
     {
         ucbhelper::Content aCnt(
-            aURL.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment,
+            aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment,
             comphelper::getProcessComponentContext() );
 
         try
@@ -719,7 +719,7 @@ void SAL_CALL OFileAccess::writeFile( const OUString& FileURL,
             if ( aParentURLObj.removeSegment() )
             {
                 OUString aParentURL
-                    = aParentURLObj.GetMainURL( INetURLObject::NO_DECODE );
+                    = aParentURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE );
 
                 // ensure all parent folders exist.
                 createFolder( aParentURL );
@@ -728,7 +728,7 @@ void SAL_CALL OFileAccess::writeFile( const OUString& FileURL,
                 OUString aTitle
                     = aURL.getName( INetURLObject::LAST_SEGMENT,
                                     true,
-                                    INetURLObject::DECODE_WITH_CHARSET );
+                                    INetURLObject::DecodeMechanism::WithCharset );
                 if ( createNewFile( aParentURL, aTitle, data ) )
                 {
                     // success
@@ -745,7 +745,7 @@ sal_Bool OFileAccess::isHidden( const OUString& FileURL )
     throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aURLObj( FileURL, INetProtocol::File );
-    ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() );
     Any aRetAny = aCnt.getPropertyValue("IsHidden");
     bool bRet = false;
     aRetAny >>= bRet;
@@ -756,7 +756,7 @@ void OFileAccess::setHidden( const OUString& FileURL, sal_Bool bHidden )
     throw(CommandAbortedException, Exception, RuntimeException, std::exception)
 {
     INetURLObject aURLObj( FileURL, INetProtocol::File );
-    ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() );
+    ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment, comphelper::getProcessComponentContext() );
     aCnt.setPropertyValue("IsHidden", Any(bHidden) );
 }
 
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index c3fca0792a7d..e7a79d3cace3 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -535,9 +535,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)
                     {
@@ -1696,7 +1696,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( );
             }
         }
@@ -2042,7 +2042,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";