From 803215142efa6437515348f63bd70ffdcf5d45f1 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

Change-Id: I50ea17c7779c7b5cacddf548f1773fd7d6c8bade
---
 sd/source/filter/html/pubdlg.cxx         | 2 +-
 sd/source/ui/dlg/tpaction.cxx            | 2 +-
 sd/source/ui/func/fusel.cxx              | 2 +-
 sd/source/ui/slideshow/slideshowimpl.cxx | 2 +-
 sd/source/ui/view/drviewse.cxx           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sd')

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index c279412baf79..a203b0a0e56b 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -865,7 +865,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
     // try to guess protocol for user's homepage
     INetURLObject aHomeURL( pPage4_WWW->GetText(),
                             INetProtocol::Http,     // default proto is HTTP
-                            INetURLObject::ENCODE_ALL );
+                            INetURLObject::EncodeMechanism::All );
 
     aValue.Name = "HomepageURL";
     aValue.Value <<= OUString( aHomeURL.GetMainURL( INetURLObject::NO_DECODE ) );
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index d1a0b7472dd8..815fa6bbf207 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -303,7 +303,7 @@ bool SdTPAction::FillItemSet( SfxItemSet* rAttrs )
                 eCA == presentation::ClickAction_DOCUMENT ||
                 eCA == presentation::ClickAction_PROGRAM )
                 aFileName = ::URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aFileName, URIHelper::GetMaybeFileHdl(), true, false,
-                                                        INetURLObject::WAS_ENCODED,
+                                                        INetURLObject::EncodeMechanism::WasEncoded,
                                                         INetURLObject::DECODE_UNAMBIGUOUS );
 
             rAttrs->Put( SfxStringItem( ATTR_ACTION_FILENAME, aFileName ) );
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index f1e024947f0e..4a0acda8d055 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -1365,7 +1365,7 @@ bool FuSelection::AnimateObj(SdrObject* pObj, const Point& rPos)
                    OUString aBaseURL = GetDocSh()->GetMedium()->GetBaseURL();
                    INetURLObject aURL( ::URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), pInfo->GetBookmark(),
                                                 URIHelper::GetMaybeFileHdl(), true, false,
-                                                INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS ) );
+                                                INetURLObject::EncodeMechanism::WasEncoded, INetURLObject::DECODE_UNAMBIGUOUS ) );
 
                    if( INetProtocol::File == aURL.GetProtocol() )
                    {
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index dd430e2b3bf2..4a71463d236b 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -1534,7 +1534,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const css::awt::Mo
             ::URIHelper::SmartRel2Abs(
                 INetURLObject(mpDocSh->GetMedium()->GetBaseURL()),
                 pEvent->maStrBookmark, ::URIHelper::GetMaybeFileHdl(), true,
-                false, INetURLObject::WAS_ENCODED,
+                false, INetURLObject::EncodeMechanism::WasEncoded,
                 INetURLObject::DECODE_UNAMBIGUOUS ) );
 
         if( INetProtocol::File == aURL.GetProtocol() )
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index cff011ed0dc2..704b8d9ff172 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -1473,7 +1473,7 @@ void DrawViewShell::InsertURLButton(const OUString& rURL, const OUString& rText,
     bool bNewObj = true;
 
     const OUString sTargetURL( ::URIHelper::SmartRel2Abs( INetURLObject( GetDocSh()->GetMedium()->GetBaseURL() ), rURL, URIHelper::GetMaybeFileHdl(), true, false,
-                                                                INetURLObject::WAS_ENCODED,
+                                                                INetURLObject::EncodeMechanism::WasEncoded,
                                                                 INetURLObject::DECODE_UNAMBIGUOUS ) );
     if (mpDrawView->GetMarkedObjectList().GetMarkCount() > 0)
     {
-- 
cgit