Change INetProtocol to scoped enumeration

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

Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b

24 files changed, 50 insertions, 50 deletions

diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index ec5941f234f4..ef6a48f6e21e 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -1318,7 +1318,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
     css::uno::Reference< css::ui::dialogs::XFolderPicker2 > xFolderPicker =
         css::ui::dialogs::FolderPicker::create( m_pCore->getComponentContext() );
 
-    INetURLObject aURL(m_sSavePath, INET_PROT_FILE);
+    INetURLObject aURL(m_sSavePath, INetProtocol::FILE);
     xFolderPicker->setDisplayDirectory(aURL.GetMainURL(INetURLObject::NO_DECODE));
     short nRet = xFolderPicker->execute();
     if (nRet == css::ui::dialogs::ExecutableDialogResults::OK)
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 3a790abc2caa..ad1ba121a26b 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -449,7 +449,7 @@ void SvxIMapDlg::DoOpen()
     if( aDlg.Execute() == ERRCODE_NONE )
     {
         INetURLObject aURL( aDlg.GetPath() );
-        DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+        DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
         boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
 
         if( pIStm )
@@ -516,7 +516,7 @@ bool SvxIMapDlg::DoSave()
 
         INetURLObject aURL( aDlg.GetPath() );
 
-        if( aURL.GetProtocol() == INET_PROT_NOT_VALID )
+        if( aURL.GetProtocol() == INetProtocol::NOT_VALID )
         {
             OSL_FAIL( "invalid URL" );
         }
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 7ff7feb7d1e5..d0ee9386fa02 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -685,8 +685,8 @@ void IMapWindow::DoPropertyDialog()
 
                 if ( !aURLText.isEmpty() )
                 {
-                    INetURLObject aObj( aURLText, INET_PROT_FILE );
-                    DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL" );
+                    INetURLObject aObj( aURLText, INetProtocol::FILE );
+                    DBG_ASSERT( aObj.GetProtocol() != INetProtocol::NOT_VALID, "Invalid URL" );
                     pIMapObj->SetURL( aObj.GetMainURL( INetURLObject::NO_DECODE ) );
                 }
                 else
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index b6259c359acd..1c7a0c0d95df 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -44,7 +44,7 @@ static_assert((LISTBOX_APPEND == COMBOBOX_APPEND) && (LISTBOX_ENTRY_NOTFOUND ==
 OUString GetDicInfoStr( const OUString& rName, const sal_uInt16 nLang, bool bNeg )
 {
     INetURLObject aURLObj;
-    aURLObj.SetSmartProtocol( INET_PROT_FILE );
+    aURLObj.SetSmartProtocol( INetProtocol::FILE );
     aURLObj.SetSmartURL( rName, INetURLObject::ENCODE_ALL );
     OUString aTmp( aURLObj.GetBase() );
     aTmp += " ";
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 8532774db6d2..7047887d99b9 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -1897,7 +1897,7 @@ void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) t
         OUString sHelpURL;
         OSL_VERIFY( Value >>= sHelpURL );
         INetURLObject aHID( sHelpURL );
-        if ( aHID.GetProtocol() == INET_PROT_HID )
+        if ( aHID.GetProtocol() == INetProtocol::HID )
             sHelpURL = aHID.GetURLPath();
         pGrid->SetHelpId( OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) );
     }
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 1b53ad0e1b23..1f1d93312ea3 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -392,7 +392,7 @@ namespace svx
         if ( !_sDataSourceNameOrLocation.isEmpty() )
         {
             INetURLObject aURL(_sDataSourceNameOrLocation);
-            (*this)[ (( aURL.GetProtocol() == INET_PROT_FILE ) ? daDatabaseLocation : daDataSource)] <<= _sDataSourceNameOrLocation;
+            (*this)[ (( aURL.GetProtocol() == INetProtocol::FILE ) ? daDatabaseLocation : daDataSource)] <<= _sDataSourceNameOrLocation;
         }
         else
             (*this)[ daDataSource ] <<= OUString();
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 2a4f2d40b8cc..ae712941f736 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -243,7 +243,7 @@ namespace svx
         if ( aFileDlg.Execute() == ERRCODE_NONE )
         {
             INetURLObject aURL( aFileDlg.GetPath() );
-            if( aURL.GetProtocol() != INET_PROT_NOT_VALID )
+            if( aURL.GetProtocol() != INetProtocol::NOT_VALID )
             {
                 ::svt::OFileNotation aFileNotation( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
                 m_rLocationInput.SetText( aFileNotation.get( ::svt::OFileNotation::N_SYSTEM ) );
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 5c41a768728f..3117930c26d3 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -191,9 +191,9 @@ bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView* pView,
             // testen, ob es ein Protokoll-Typ ist, den ich anzeigen will
             INetProtocol aProtocol = aUrl.GetProtocol();
             static const INetProtocol s_aQuickHelpSupported[] =
-                {   INET_PROT_FTP, INET_PROT_HTTP, INET_PROT_FILE, INET_PROT_MAILTO, INET_PROT_NEWS,
-                    INET_PROT_HTTPS, INET_PROT_JAVASCRIPT, INET_PROT_IMAP, INET_PROT_POP3,
-                    INET_PROT_VIM, INET_PROT_LDAP
+                {   INetProtocol::FTP, INetProtocol::HTTP, INetProtocol::FILE, INetProtocol::MAILTO, INetProtocol::NEWS,
+                    INetProtocol::HTTPS, INetProtocol::JAVASCRIPT, INetProtocol::IMAP, INetProtocol::POP3,
+                    INetProtocol::VIM, INetProtocol::LDAP
                 };
             for (sal_uInt16 i=0; i<sizeof(s_aQuickHelpSupported)/sizeof(s_aQuickHelpSupported[0]); ++i)
                 if (s_aQuickHelpSupported[i] == aProtocol)
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 145dd97739cf..997da1a9a7dc 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -137,7 +137,7 @@ GalleryBrowser1::GalleryBrowser1(
     maNewTheme.SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) );
 
     // disable creation of new themes if a writable directory is not available
-    if( mpGallery->GetUserURL().GetProtocol() == INET_PROT_NOT_VALID )
+    if( mpGallery->GetUserURL().GetProtocol() == INetProtocol::NOT_VALID )
         maNewTheme.Disable();
 
     mpThemes->SetHelpId( HID_GALLERY_THEMELIST );
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 13e34abe9b30..16e6e948582c 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -239,7 +239,7 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos
     INetURLObject    aURL;
 
     const_cast< GalleryTheme* >( mpTheme )->GetURL( mnObjectPos, aURL );
-    const bool bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
+    const bool bValidURL = ( aURL.GetProtocol() != INetProtocol::NOT_VALID );
 
     maPopupMenu.EnableItem( MN_ADD, bValidURL && SGA_OBJ_SOUND != eObjKind );
 
@@ -668,7 +668,7 @@ bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow )
 
         const_cast< GalleryTheme* >( mpCurTheme )->GetURL( nItemId - 1, aURL );
 
-        const bool  bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
+        const bool  bValidURL = ( aURL.GetProtocol() != INetProtocol::NOT_VALID );
         bool        bPreview = bValidURL;
         bool        bDelete = false;
         bool        bTitle = false;
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 517b3a9094c3..a8d6bd431430 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -236,7 +236,7 @@ void GalleryPreview::StartDrag( sal_Int8, const Point& )
 
 void GalleryPreview::PreviewMedia( const INetURLObject& rURL )
 {
-    if( rURL.GetProtocol() != INET_PROT_NOT_VALID )
+    if( rURL.GetProtocol() != INetProtocol::NOT_VALID )
     {
         ::avmedia::MediaFloater* pFloater = avmedia::getMediaFloater();
 
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 75def1b09e86..5db382344529 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -121,7 +121,7 @@ bool GalleryExplorer::InsertURL( const OUString& rThemeName, const OUString& rUR
         if( pTheme )
         {
             INetURLObject aURL( rURL );
-            DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
             bRet = pTheme->InsertURL( aURL );
             pGal->ReleaseTheme( pTheme, aListener );
         }
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 32b14eb3e2d9..3328b46677d5 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -67,7 +67,7 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL,
         bThemeNameFromResource  ( _bThemeNameFromResource )
 {
     INetURLObject aURL( rBaseURL );
-    DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+    DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
 
     if (bCreateUniqueURL)
     {
@@ -226,8 +226,8 @@ void Gallery::ImplLoad( const OUString& rMultiPath )
     else
         aRelURL = INetURLObject( rMultiPath );
 
-    DBG_ASSERT( aUserURL.GetProtocol() != INET_PROT_NOT_VALID, "no writable Gallery user directory available" );
-    DBG_ASSERT( aRelURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+    DBG_ASSERT( aUserURL.GetProtocol() != INetProtocol::NOT_VALID, "no writable Gallery user directory available" );
+    DBG_ASSERT( aRelURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
 }
 
 void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadOnly )
@@ -245,7 +245,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO
         uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
 
 #if defined(MACOSX) && HAVE_FEATURE_READONLY_INSTALLSET
-        if( rBaseURL.GetProtocol() == INET_PROT_FILE )
+        if( rBaseURL.GetProtocol() == INetProtocol::FILE )
         {
             const char *appBundle = [[[NSBundle mainBundle] bundlePath] UTF8String];
             OUString path = rBaseURL.GetURLPath();
@@ -509,7 +509,7 @@ bool Gallery::CreateTheme( const OUString& rThemeName )
 {
     bool bRet = false;
 
-    if( !HasTheme( rThemeName ) && ( GetUserURL().GetProtocol() != INET_PROT_NOT_VALID ) )
+    if( !HasTheme( rThemeName ) && ( GetUserURL().GetProtocol() != INetProtocol::NOT_VALID ) )
     {
         INetURLObject aURL( GetUserURL() );
         aURL.Append( rThemeName );
@@ -616,7 +616,7 @@ GalleryTheme* Gallery::ImplGetCachedTheme(const GalleryThemeEntry* pThemeEntry)
         {
             INetURLObject aURL = pThemeEntry->GetThmURL();
 
-            DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
 
             if( FileExists( aURL ) )
             {
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 4cafc7439793..789bdaa8dcf6 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -190,7 +190,7 @@ OUString GetReducedString( const INetURLObject& rURL, sal_Int32 nMaxLen )
 
     aReduced = aReduced.getToken( comphelper::string::getTokenCount(aReduced, '/') - 1, '/' );
 
-    if( INET_PROT_PRIV_SOFFICE != rURL.GetProtocol() )
+    if( INetProtocol::PRIV_SOFFICE != rURL.GetProtocol() )
     {
         sal_Unicode     aDelimiter;
         const OUString  aPath( rURL.getFSysPath( INetURLObject::FSYS_DETECT, &aDelimiter ) );
@@ -226,7 +226,7 @@ OUString GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL )
 {
     OUString aRet;
 
-    if( rSvDrawObjURL.GetProtocol() == INET_PROT_PRIV_SOFFICE &&
+    if( rSvDrawObjURL.GetProtocol() == INetProtocol::PRIV_SOFFICE &&
         comphelper::string::getTokenCount(rSvDrawObjURL.GetMainURL( INetURLObject::NO_DECODE ), '/') == 3 )
     {
         aRet = rSvDrawObjURL.GetMainURL( INetURLObject::NO_DECODE ).getToken( 2, '/' );
@@ -239,7 +239,7 @@ bool FileExists( const INetURLObject& rURL )
 {
     bool bRet = false;
 
-    if( rURL.GetProtocol() != INET_PROT_NOT_VALID )
+    if( rURL.GetProtocol() != INetProtocol::NOT_VALID )
     {
         try
         {
@@ -585,7 +585,7 @@ void GalleryTransferable::StartDrag( vcl::Window* pWindow, sal_Int8 nDragSourceA
 {
     INetURLObject aURL;
 
-    if( mpTheme->GetURL( mnObjectPos, aURL ) && ( aURL.GetProtocol() != INET_PROT_NOT_VALID ) )
+    if( mpTheme->GetURL( mnObjectPos, aURL ) && ( aURL.GetProtocol() != INetProtocol::NOT_VALID ) )
     {
         mpTheme->SetDragging( true );
         mpTheme->SetDragPos( mnObjectPos );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index f7dc2cb19cae..1f6c7ec547b4 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -201,7 +201,7 @@ void GalleryTheme::ImplWrite()
         aPathURL.removeSegment();
         aPathURL.removeFinalSlash();
 
-        DBG_ASSERT( aPathURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+        DBG_ASSERT( aPathURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
 
         if( FileExists( aPathURL ) || CreateDir( aPathURL ) )
         {
@@ -293,7 +293,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPt
         if( SGA_OBJ_SVDRAW == eObjKind )
         {
             OUString aFileName( "gallery/svdraw/dd" );
-            aNewURL = INetURLObject( aFileName += OUString::number( ++nNextNumber % 99999999 ), INET_PROT_PRIV_SOFFICE );
+            aNewURL = INetURLObject( aFileName += OUString::number( ++nNextNumber % 99999999 ), INetProtocol::PRIV_SOFFICE );
 
             bExists = false;
 
@@ -614,8 +614,8 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
         INetURLObject   aInURL( GetSdgURL() );
         INetURLObject   aTmpURL( aTmp.GetURL() );
 
-        DBG_ASSERT( aInURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
-        DBG_ASSERT( aTmpURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+        DBG_ASSERT( aInURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+        DBG_ASSERT( aTmpURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
 
         boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aInURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
         boost::scoped_ptr<SvStream> pTmpStm(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::TRUNC ));
@@ -691,7 +691,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
 
 GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, bool bReadOnly )
 {
-    DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+    DBG_ASSERT( rURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
 
     GalleryThemeEntry*  pRet = NULL;
 
@@ -1211,7 +1211,7 @@ bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
                 const OUString  aFile( aFileList.GetFile( i ) );
                 INetURLObject   aURL( aFile );
 
-                if( aURL.GetProtocol() == INET_PROT_NOT_VALID )
+                if( aURL.GetProtocol() == INetProtocol::NOT_VALID )
                 {
                     OUString aLocalURL;
 
@@ -1219,7 +1219,7 @@ bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
                         aURL = INetURLObject( aLocalURL );
                 }
 
-                if( aURL.GetProtocol() != INET_PROT_NOT_VALID )
+                if( aURL.GetProtocol() != INetProtocol::NOT_VALID )
                     bRet = InsertFileOrDirURL( aURL, nInsertPos );
             }
         }
@@ -1459,7 +1459,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
                 if( SGA_OBJ_SVDRAW == pObj->eObjKind )
                 {
                     OUString aDummyURL( "gallery/svdraw/" );
-                    pObj->aURL = INetURLObject( aDummyURL += aFileName, INET_PROT_PRIV_SOFFICE );
+                    pObj->aURL = INetURLObject( aDummyURL += aFileName, INetProtocol::PRIV_SOFFICE );
                 }
                 else
                 {
@@ -1467,7 +1467,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
 
                     pObj->aURL = INetURLObject( aFileName );
 
-                    if( ( pObj->aURL.GetProtocol() == INET_PROT_NOT_VALID ) &&
+                    if( ( pObj->aURL.GetProtocol() == INetProtocol::NOT_VALID ) &&
                         ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aFileName, aLocalURL ) )
                     {
                         pObj->aURL = INetURLObject( aLocalURL );
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index f0e2ed04a60e..64a83acc5947 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -561,7 +561,7 @@ void GraphyicBulletsTypeMgr::Init()
     {
         OUString sGrfNm = aGrfNames[i];
         INetURLObject aObj(sGrfNm);
-        if(aObj.GetProtocol() == INET_PROT_FILE)
+        if(aObj.GetProtocol() == INetProtocol::FILE)
             sGrfNm = aObj.PathToFileName();
 
         GrfBulDataRelation* pEntry = new GrfBulDataRelation(eNBType::GRAPHICBULLETS);
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 489dae44a2c7..a62c27d31891 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -171,7 +171,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad)
         try
         {
             INetURLObject aURL( pData->aFileName );
-            DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
 
             ::ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() );
             ::com::sun::star::uno::Any aAny( aCnt.getPropertyValue("DateModified") );
@@ -210,7 +210,7 @@ bool SdrTextObj::LoadText(const OUString& rFileName, const OUString& /*rFilterNa
     INetURLObject   aFileURL( rFileName );
     bool            bRet = false;
 
-    if( aFileURL.GetProtocol() == INET_PROT_NOT_VALID )
+    if( aFileURL.GetProtocol() == INetProtocol::NOT_VALID )
     {
         OUString aFileURLStr;
 
@@ -220,7 +220,7 @@ bool SdrTextObj::LoadText(const OUString& rFileName, const OUString& /*rFilterNa
             aFileURL.SetSmartURL( rFileName );
     }
 
-    DBG_ASSERT( aFileURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+    DBG_ASSERT( aFileURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
 
     boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aFileURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ));
 
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 7f2a32ba18be..4a5ab7cc561a 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -1059,7 +1059,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
             else
             {
                 INetURLObject aURLObject( aSettings.maURL.Complete );
-                DBG_ASSERT( aURLObject.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
+                DBG_ASSERT( aURLObject.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
 
                 nStatus = XOutBitmap::ExportGraphic( aGraphic, aURLObject, rFilter, nFilter, &aSettings.maFilterData );
             }
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index f0f4eb3bb932..b942a0d7057c 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1495,7 +1495,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte
                 {
                     INetURLObject aURLObj( aURL );
 
-                    if( aURLObj.GetProtocol() == INET_PROT_NOT_VALID )
+                    if( aURLObj.GetProtocol() == INetProtocol::NOT_VALID )
                     {
                         OUString aValidURL;
 
@@ -1503,7 +1503,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte
                             aURLObj = INetURLObject( aValidURL );
                     }
 
-                    if( aURLObj.GetProtocol() != INET_PROT_NOT_VALID )
+                    if( aURLObj.GetProtocol() != INetProtocol::NOT_VALID )
                     {
                         GraphicFilter &rGrfFilter = GraphicFilter::GetGraphicFilter();
                         aFilterName = rGrfFilter.GetImportFormatName( rGrfFilter.GetImportFormatNumberForShortName( aURLObj.getExtension() ) );
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 8381641fae35..1d3b6fa76129 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -228,7 +228,7 @@ void SAL_CALL GalleryTheme::update(  )
 
             nIndex = ::std::max( ::std::min( nIndex, getCount() ), sal_Int32( 0 ) );
 
-            if( ( aURL.GetProtocol() != INET_PROT_NOT_VALID ) && mpTheme->InsertURL( aURL, nIndex ) )
+            if( ( aURL.GetProtocol() != INetProtocol::NOT_VALID ) && mpTheme->InsertURL( aURL, nIndex ) )
             {
                 const GalleryObject* pObj = mpTheme->ImplGetGalleryObject( aURL );
 
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 6bd11a0df730..e308779f7331 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -218,7 +218,7 @@ bool SvxXMLXTableExportComponent::save(
     sal_Int32 eCreate = embed::ElementModes::WRITE | embed::ElementModes::TRUNCATE;
 
     INetURLObject aURLObj( rURL );
-    bool bToStorage = aURLObj.GetProtocol() == INET_PROT_NOT_VALID; // a relative path
+    bool bToStorage = aURLObj.GetProtocol() == INetProtocol::NOT_VALID; // a relative path
 
     bool bSaveAsStorage = xTable->getElementType() == cppu::UnoType<OUString>::get();
 
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 57632db61458..e3239c3f9648 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -375,7 +375,7 @@ bool SvxXMLXTableImport::load( const OUString &rPath, const OUString &rReferer,
     SvXMLGraphicHelper* pGraphicHelper = 0;
 
     INetURLObject aURLObj( rPath );
-    bool bUseStorage = aURLObj.GetProtocol() == INET_PROT_NOT_VALID; // a relative path
+    bool bUseStorage = aURLObj.GetProtocol() == INetProtocol::NOT_VALID; // a relative path
 
     try
     {
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index ed7682953c86..87dbb9f55dc3 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -127,7 +127,7 @@ sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, OUString& rFileNam
         sal_uInt16          nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
         bool            bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
 
-        DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::WriteGraphic(...): invalid URL" );
+        DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "XOutBitmap::WriteGraphic(...): invalid URL" );
 
         // calculate correct file name
         if( !( nFlags & XOUTBMP_DONT_EXPAND_FILENAME ) )
@@ -364,7 +364,7 @@ sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObje
                                   GraphicFilter& rFilter, const sal_uInt16 nFormat,
                                   const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
 {
-    DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::ExportGraphic(...): invalid URL" );
+    DBG_ASSERT( rURL.GetProtocol() != INetProtocol::NOT_VALID, "XOutBitmap::ExportGraphic(...): invalid URL" );
 
     SfxMedium   aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::WRITE | StreamMode::SHARE_DENYNONE | StreamMode::TRUNC );
     SvStream*   pOStm = aMedium.GetOutStream();
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index c5cd0c549602..bae363fb044b 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -227,7 +227,7 @@ bool XPropertyList::Load()
 
         INetURLObject aURL( maPath );
 
-        if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
+        if( INetProtocol::NOT_VALID == aURL.GetProtocol() )
         {
             DBG_ASSERT( maPath.isEmpty(), "invalid URL" );
             return false;
@@ -258,7 +258,7 @@ bool XPropertyList::Save()
 {
     INetURLObject aURL( maPath );
 
-    if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
+    if( INetProtocol::NOT_VALID == aURL.GetProtocol() )
     {
         DBG_ASSERT( maPath.isEmpty(), "invalid URL" );
         return false;