From 6b631a02d36aa09f7c06793e8b4482d3b67ab258 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Mon, 5 Dec 2016 07:59:20 +0200
Subject: convert INetURLObject::EncodeMechanism to scoped enum

(cherry picked from commit 803215142efa6437515348f63bd70ffdcf5d45f1)
(cherry picked from commit 736cd289d4cdb0db61d92134bcc9d48aa7e79613)

Change-Id: I50ea17c7779c7b5cacddf548f1773fd7d6c8bade
---
 svtools/source/contnr/fileview.cxx | 2 +-
 svtools/source/control/inettbc.cxx | 4 ++--
 svtools/source/misc/imap.cxx       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'svtools')

diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 76f1ea59a7ce..0a0a5ebea974 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -2107,7 +2107,7 @@ void SvtFileView_Impl::EntryRenamed( OUString& rURL,
                 (*aIt)->maDisplayText = aDisplayText.replaceAt( 0, nIndex, rTitle );
 
             INetURLObject aURLObj( rURL );
-            aURLObj.SetName( rTitle, INetURLObject::ENCODE_ALL );
+            aURLObj.SetName( rTitle, INetURLObject::EncodeMechanism::All );
 
             rURL = aURLObj.GetMainURL( INetURLObject::NO_DECODE );
 
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index c2218b123b37..3e44679ae078 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -481,7 +481,7 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseUR
 
             // file URL must be correctly encoded!
             OUString aTextURL = INetURLObject::encode( aText, INetURLObject::PART_FPATH,
-                                                     INetURLObject::ENCODE_ALL );
+                                                     INetURLObject::EncodeMechanism::All );
             aTemp += aTextURL;
 
             INetURLObject aTmp( aTemp );
@@ -516,7 +516,7 @@ OUString SvtURLBox::ParseSmart( const OUString& _aText, const OUString& _aBaseUR
             bool bWasAbsolute = false;
 #ifdef UNX
             // encode file URL correctly
-            aSmart = INetURLObject::encode( aSmart, INetURLObject::PART_FPATH, INetURLObject::ENCODE_ALL );
+            aSmart = INetURLObject::encode( aSmart, INetURLObject::PART_FPATH, INetURLObject::EncodeMechanism::All );
 #endif
             INetURLObject aTmp( aObj.smartRel2Abs( aSmart, bWasAbsolute ) );
 
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 839450aac5b3..a5f31be9b7f8 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -109,7 +109,7 @@ void IMapObject::Read( SvStream& rIStm, const OUString& rBaseURL )
     aTarget = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStm, nTextEncoding);
 
     // make URL absolute
-    aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS );
+    aURL = URIHelper::SmartRel2Abs( INetURLObject(rBaseURL), aURL, URIHelper::GetMaybeFileHdl(), true, false, INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DECODE_UNAMBIGUOUS );
     std::unique_ptr<IMapCompat> pCompat(new IMapCompat( rIStm, StreamMode::READ ));
 
     ReadIMapObject( rIStm );
-- 
cgit