Change INetProtocol to scoped enumeration

...and fix o3tl::enumarray::operator [] const overload

Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b

5 files changed, 7 insertions, 7 deletions

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 5a62f7207fad..6b9783c4cd47 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -579,15 +579,15 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl)
 
         sal_uInt16 nFilter = GRFILTER_FORMAT_DONTKNOW;
 
-        if ( aURLObj.HasError() || INET_PROT_NOT_VALID == aURLObj.GetProtocol() )
+        if ( aURLObj.HasError() || INetProtocol::NOT_VALID == aURLObj.GetProtocol() )
         {
-            aURLObj.SetSmartProtocol( INET_PROT_FILE );
+            aURLObj.SetSmartProtocol( INetProtocol::FILE );
             aURLObj.SetSmartURL( sImgUrl );
         }
 
         sal_uInt32 nFilterImportFlags = GRFILTER_I_FLAGS_SET_LOGSIZE_FOR_JPEG;
         // remote?
-        if ( INET_PROT_FILE != aURLObj.GetProtocol() )
+        if ( INetProtocol::FILE != aURLObj.GetProtocol() )
         {
             SvStream* pStream = ::utl::UcbStreamHelper::CreateStream( sImgUrl, StreamMode::READ );
 
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index fbf21f5ac386..cc95909988ca 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1616,7 +1616,7 @@ bool AssistentDlgImpl::IsOwnFormat( const OUString& rPath )
     INetURLObject   aURL( rPath );
     OUString        aExt( aURL.GetFileExtension() );
 
-    DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+    DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
 
     return !aExt.equalsIgnoreAsciiCase( "ppt" );
 }
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index c1bf56d1e661..24df6b6225f2 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -584,7 +584,7 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName)
 {
     INetURLObject   aURL( rFileName );
 
-    if( aURL.GetProtocol() == INET_PROT_NOT_VALID )
+    if( aURL.GetProtocol() == INetProtocol::NOT_VALID )
     {
         OUString aURLStr;
         ::utl::LocalFileHelper::ConvertPhysicalNameToURL( rFileName, aURLStr );
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index cd90acf2f1f7..c21ea4eb8e8e 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1176,7 +1176,7 @@ void SdPageObjsTLB::DoDrag()
     if( mpDropNavWin )
     {
         ::sd::DrawDocShell* pDocShell = mpDoc->GetDocSh();
-        OUString aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INET_PROT_FILE ).GetMainURL( INetURLObject::NO_DECODE );
+        OUString aURL = INetURLObject( pDocShell->GetMedium()->GetPhysicalName(), INetProtocol::FILE ).GetMainURL( INetURLObject::NO_DECODE );
         NavigatorDragType   eDragType = mpDropNavWin->GetNavigatorDragType();
 
         aURL += "#" + GetSelectEntry();
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index e281738b6a25..a2d3cd1dc455 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -811,7 +811,7 @@ OUString SdTPAction::GetEditText( bool bFullDocDestination )
     if( mpDoc && mpDoc->GetDocSh() && mpDoc->GetDocSh()->GetMedium() )
         aBaseURL = mpDoc->GetDocSh()->GetMedium()->GetBaseURL();
 
-    if( !aStr.isEmpty() && aURL.GetProtocol() == INET_PROT_NOT_VALID )
+    if( !aStr.isEmpty() && aURL.GetProtocol() == INetProtocol::NOT_VALID )
         aURL = INetURLObject( ::URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), aStr, URIHelper::GetMaybeFileHdl(), true, false ) );
 
     // get adjusted file name