Change INetProtocol enumerators to CamelCase

...to avoid clashes with macros and poor warnings about hiding global FILE

Change-Id: I444e8b958f029201b228937e088efabc4b6d3050

23 files changed, 66 insertions, 66 deletions

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 9996a86811c4..a6a9ef3a507e 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -145,7 +145,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
             while( xResultSet->next() && schedule() )
             {
                 INetURLObject   aFoundURL( xContentAccess->queryContentIdentifierString() );
-                DBG_ASSERT( aFoundURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+                DBG_ASSERT( aFoundURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
                 bool bFolder = xRow->getBoolean( 1 ); // property "IsFolder"
                 if ( xRow->wasNull() )
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 2daa9e51f186..8c48d513151e 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -305,17 +305,17 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
 
     switch ( eProtocolTyp )
     {
-        case INetProtocol::HTTP :
-        case INetProtocol::FTP :
+        case INetProtocol::Http :
+        case INetProtocol::Ftp :
             nPageId = RID_SVXPAGE_HYPERLINK_INTERNET;
             break;
-        case INetProtocol::FILE :
-        case INetProtocol::POP3 :
-        case INetProtocol::IMAP :
+        case INetProtocol::File :
+        case INetProtocol::Pop3 :
+        case INetProtocol::Imap :
             nPageId = RID_SVXPAGE_HYPERLINK_DOCUMENT;
             break;
-        case INetProtocol::MAILTO :
-        case INetProtocol::NEWS :
+        case INetProtocol::Mailto :
+        case INetProtocol::News :
             nPageId = RID_SVXPAGE_HYPERLINK_MAIL;
             break;
         default :
@@ -323,7 +323,7 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
                 nPageId = RID_SVXPAGE_HYPERLINK_DOCUMENT;
             else
             {
-                eProtocolTyp = INetProtocol::NOT_VALID;
+                eProtocolTyp = INetProtocol::NotValid;
                 nPageId = GetCurPageId();
             }
             break;
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index f74809b8a640..4711a1f574ce 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -64,7 +64,7 @@ bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUStri
     if ( bIsValidURL )
     {
         aURLObject.SetURL( rPath );
-        if ( aURLObject.GetProtocol() == INetProtocol::NOT_VALID )      // test if the source is already a valid url
+        if ( aURLObject.GetProtocol() == INetProtocol::NotValid )      // test if the source is already a valid url
         {                                                           // if not we have to create a url from a physical file name
             bool wasAbs;
             INetURLObject base(rBase);
@@ -73,7 +73,7 @@ bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUStri
                 rPath, wasAbs, true, INetURLObject::ENCODE_ALL,
                 RTL_TEXTENCODING_UTF8, true);
         }
-        bIsValidURL = aURLObject.GetProtocol() != INetProtocol::NOT_VALID;
+        bIsValidURL = aURLObject.GetProtocol() != INetProtocol::NotValid;
         if ( bIsValidURL )
         {
             OUString aBase( aURLObject.getName( INetURLObject::LAST_SEGMENT, false ) );
@@ -103,7 +103,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( vcl::Window *pParent, IconChoiceDia
     get(m_pRbtEditNow, "editnow");
     get(m_pRbtEditLater, "editlater");
     get(m_pCbbPath, "path");
-    m_pCbbPath->SetSmartProtocol(INetProtocol::FILE);
+    m_pCbbPath->SetSmartProtocol(INetProtocol::File);
     get(m_pBtCreate, "create");
     m_pBtCreate->SetModeImage(Image(CUI_RES(RID_SVXBMP_NEWDOC)));
     get(m_pLbDocTypes, "types");
@@ -417,7 +417,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
     {
         sal_Char const  sSlash[] = "/";
 
-        INetURLObject   aURL( aStrURL, INetProtocol::FILE );
+        INetURLObject   aURL( aStrURL, INetProtocol::File );
         OUString        aStrName;
         if( bHandleFileName )
             aStrName = bZeroPath? aTempStrURL : OUString(aURL.getName());
@@ -442,7 +442,7 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
             aNewURL.setExtension( static_cast<DocumentTypeData*>(m_pLbDocTypes->GetEntryData( nPos ))->aStrExt );
         }
 
-        if( aNewURL.GetProtocol() == INetProtocol::FILE )
+        if( aNewURL.GetProtocol() == INetProtocol::File )
         {
             utl::LocalFileHelper::ConvertURLToSystemPath( aNewURL.GetMainURL( INetURLObject::NO_DECODE ), aStrTmp );
         }
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 12d73d1966ad..11fe8e63db34 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -39,7 +39,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( vcl::Window *pParent, IconChoiceDialog* p
     mbMarkWndOpen   ( false )
 {
     get(m_pCbbPath, "path");
-    m_pCbbPath->SetSmartProtocol(INetProtocol::FILE);
+    m_pCbbPath->SetSmartProtocol(INetProtocol::File);
     get(m_pBtFileopen, "fileopen");
     m_pBtFileopen->SetModeImage(Image(CUI_RES(RID_SVXBMP_FILEOPEN)));
     get(m_pEdTarget, "target");
@@ -113,7 +113,7 @@ OUString SvxHyperlinkDocTp::GetCurrentURL ()
     if ( aStrPath != aEmptyStr )
     {
         INetURLObject aURL( aStrPath );
-        if ( aURL.GetProtocol() != INetProtocol::NOT_VALID )    // maybe the path is already a valid
+        if ( aURL.GetProtocol() != INetProtocol::NotValid )    // maybe the path is already a valid
             aStrURL = aStrPath;                             // hyperlink, then we can use this path directly
         else
             utl::LocalFileHelper::ConvertSystemPathToURL( aStrPath, aBaseURL, aStrURL );
@@ -341,7 +341,7 @@ void SvxHyperlinkDocTp::SetMarkStr ( const OUString& aStrMark )
 
 SvxHyperlinkDocTp::EPathType SvxHyperlinkDocTp::GetPathType ( const OUString& rStrPath )
 {
-    INetURLObject aURL( rStrPath, INetProtocol::FILE );
+    INetURLObject aURL( rStrPath, INetProtocol::File );
 
     if( aURL.HasError() )
         return Type_Invalid;
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 0471571facf9..3c7bfcc1c4a4 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -44,7 +44,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent,
     get(m_pRbtLinktypInternet, "linktyp_internet");
     get(m_pRbtLinktypFTP, "linktyp_ftp");
     get(m_pCbbTarget, "target");
-    m_pCbbTarget->SetSmartProtocol(INetProtocol::HTTP);
+    m_pCbbTarget->SetSmartProtocol(INetProtocol::Http);
     get(m_pBtBrowse, "browse");
     m_pBtBrowse->SetModeImage(Image(CUI_RES (RID_SVXBMP_BROWSE)));
     get(m_pFtLogin, "login_label");
@@ -111,7 +111,7 @@ void SvxHyperlinkInternetTp::FillDlgFields(const OUString& rStrURL)
 
     // set URL-field
     // Show the scheme, #72740
-    if ( aURL.GetProtocol() != INetProtocol::NOT_VALID )
+    if ( aURL.GetProtocol() != INetProtocol::NotValid )
         m_pCbbTarget->SetText( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) );
     else
         m_pCbbTarget->SetText(rStrURL); // #77696#
@@ -165,17 +165,17 @@ OUString SvxHyperlinkInternetTp::CreateAbsoluteURL() const
 
     INetURLObject aURL(aStrURL);
 
-    if( aURL.GetProtocol() == INetProtocol::NOT_VALID )
+    if( aURL.GetProtocol() == INetProtocol::NotValid )
     {
         aURL.SetSmartProtocol( GetSmartProtocolFromButtons() );
         aURL.SetSmartURL(aStrURL);
     }
 
     // username and password for ftp-url
-    if( aURL.GetProtocol() == INetProtocol::FTP && !m_pEdLogin->GetText().isEmpty() )
+    if( aURL.GetProtocol() == INetProtocol::Ftp && !m_pEdLogin->GetText().isEmpty() )
         aURL.SetUserAndPass ( m_pEdLogin->GetText(), m_pEdPassword->GetText() );
 
-    if ( aURL.GetProtocol() != INetProtocol::NOT_VALID )
+    if ( aURL.GetProtocol() != INetProtocol::NotValid )
         return aURL.GetMainURL( INetURLObject::DECODE_TO_IURI );
     else //#105788# always create a URL even if it is not valid
         return aStrURL;
@@ -321,9 +321,9 @@ INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const
 {
     if( m_pRbtLinktypFTP->IsChecked() )
     {
-        return INetProtocol::FTP;
+        return INetProtocol::Ftp;
     }
-    return INetProtocol::HTTP;
+    return INetProtocol::Http;
 }
 
 /*************************************************************************
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 60d8142b028f..bb04adb1e675 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -44,7 +44,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( vcl::Window *pParent, IconChoiceDialog*
     get(m_pRbtMail, "linktyp_mail");
     get(m_pRbtNews, "linktyp_news");
     get(m_pCbbReceiver, "receiver");
-    m_pCbbReceiver->SetSmartProtocol(INetProtocol::MAILTO);
+    m_pCbbReceiver->SetSmartProtocol(INetProtocol::Mailto);
     get(m_pBtAdrBook, "adressbook");
     m_pBtAdrBook->SetModeImage(Image(CUI_RES(RID_SVXBMP_ADRESSBOOK)));
     get(m_pFtSubject, "subject_label");
@@ -139,14 +139,14 @@ OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const
     OUString aStrURL = m_pCbbReceiver->GetText();
     INetURLObject aURL(aStrURL);
 
-    if( aURL.GetProtocol() == INetProtocol::NOT_VALID )
+    if( aURL.GetProtocol() == INetProtocol::NotValid )
     {
         aURL.SetSmartProtocol( GetSmartProtocolFromButtons() );
         aURL.SetSmartURL(aStrURL);
     }
 
     // subject for EMail-url
-    if( aURL.GetProtocol() == INetProtocol::MAILTO )
+    if( aURL.GetProtocol() == INetProtocol::Mailto )
     {
         if ( m_pEdSubject->GetText() != OUString(aEmptyStr) )
         {
@@ -156,7 +156,7 @@ OUString SvxHyperlinkMailTp::CreateAbsoluteURL() const
         }
     }
 
-    if ( aURL.GetProtocol() != INetProtocol::NOT_VALID )
+    if ( aURL.GetProtocol() != INetProtocol::NotValid )
         return aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
     else //#105788# always create a URL even if it is not valid
         return aStrURL;
@@ -238,9 +238,9 @@ INetProtocol SvxHyperlinkMailTp::GetSmartProtocolFromButtons() const
 {
     if( m_pRbtNews->IsChecked() )
     {
-        return INetProtocol::NEWS;
+        return INetProtocol::News;
     }
-    return INetProtocol::MAILTO;
+    return INetProtocol::Mailto;
 }
 
 /*************************************************************************
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index fcaaed8f7f75..7aec01683018 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -43,7 +43,7 @@ SvxHyperURLBox::SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart )
 
 extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxHyperURLBox(vcl::Window *pParent, VclBuilder::stringmap &)
 {
-    return new SvxHyperURLBox(pParent, INetProtocol::HTTP);
+    return new SvxHyperURLBox(pParent, INetProtocol::Http);
 }
 
 sal_Int8 SvxHyperURLBox::AcceptDrop( const AcceptDropEvent& /* rEvt */ )
@@ -383,7 +383,7 @@ OUString SvxHyperlinkTabPageBase::GetSchemeFromURL( const OUString& rStrURL )
     // #77696#
     // our new INetUrlObject now has the ability
     // to detect if an Url is valid or not :-(
-    if ( aProtocol == INetProtocol::NOT_VALID )
+    if ( aProtocol == INetProtocol::NotValid )
     {
         if ( rStrURL.startsWithIgnoreAsciiCase( INET_HTTP_SCHEME ) )
         {
@@ -474,10 +474,10 @@ OUString SvxHyperlinkTabPageBase::CreateUiNameFromURL( const OUString& aStrURL )
 
     switch(aURLObj.GetProtocol())
     {
-        case INetProtocol::FILE:
+        case INetProtocol::File:
             utl::LocalFileHelper::ConvertURLToSystemPath( aURLObj.GetMainURL(INetURLObject::NO_DECODE), aStrUiURL );
             break;
-        case INetProtocol::FTP :
+        case INetProtocol::Ftp :
             {
                 //remove password from name
                 INetURLObject   aTmpURL(aURLObj);
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index b8cd08bc29aa..fc9d8218c97d 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -295,7 +295,7 @@ short SvInsertOleDlg::Execute()
         {
             aFileName = GetFilePath();
             INetURLObject aURL;
-            aURL.SetSmartProtocol( INetProtocol::FILE );
+            aURL.SetSmartProtocol( INetProtocol::File );
             aURL.SetSmartURL( aFileName );
             aFileName = aURL.GetMainURL( INetURLObject::NO_DECODE );
             bool bLink = IsLinked();
@@ -433,7 +433,7 @@ short SvInsertPlugInDialog::Execute()
         OUString aURL = GetPlugInFile();
 
         // URL can be a valid and absolute URL or a system file name
-        m_pURL->SetSmartProtocol( INetProtocol::FILE );
+        m_pURL->SetSmartProtocol( INetProtocol::File );
         if ( aURL.isEmpty() || m_pURL->SetSmartURL( aURL ) )
         {
             // create a plugin object
@@ -618,7 +618,7 @@ short SfxInsertFloatingFrameDialog::Execute()
         {
             // URL can be a valid and absolute URL or a system file name
             INetURLObject aObj;
-            aObj.SetSmartProtocol( INetProtocol::FILE );
+            aObj.SetSmartProtocol( INetProtocol::File );
             if ( aObj.SetSmartURL( m_pEDURL->GetText() ) )
                 aURL = aObj.GetMainURL( INetURLObject::NO_DECODE );
         }
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index bde358525512..911a76c694b2 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -361,7 +361,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
             SvBaseLink* pLink = static_cast<SvBaseLink*>(pEntry->GetUserData());
             pLinkMgr->GetDisplayNames( pLink, &sType, &sFile, 0, 0 );
             INetURLObject aUrl(sFile);
-            if(aUrl.GetProtocol() == INetProtocol::FILE)
+            if(aUrl.GetProtocol() == INetProtocol::File)
             {
                 OUString sOldPath(aUrl.PathToFileName());
                 sal_Int32 nLen = aUrl.GetName().getLength();
@@ -386,7 +386,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
                         continue;
                     pLinkMgr->GetDisplayNames( pLink, &sType, &sFile, &sLinkName, &sFilter );
                     INetURLObject aUrl_(sFile);
-                    INetURLObject aUrl2(aPath, INetProtocol::FILE);
+                    INetURLObject aUrl2(aPath, INetProtocol::File);
                     aUrl2.insertName( aUrl_.getName() );
                     OUString sNewLinkName;
                     MakeLnkName( sNewLinkName, 0 ,
@@ -639,7 +639,7 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uLong nPos, bool
     long nWidthPixel = m_pTbLinks->GetLogicTab( 2 ) - m_pTbLinks->GetLogicTab( 1 );
     nWidthPixel -= SV_TAB_BORDER;
     OUString aTxt = m_pTbLinks->GetEllipsisString( sFileNm, nWidthPixel, TEXT_DRAW_PATHELLIPSIS );
-    INetURLObject aPath( sFileNm, INetProtocol::FILE );
+    INetURLObject aPath( sFileNm, INetProtocol::File );
     OUString aFileName = aPath.getName();
     aFileName = INetURLObject::decode(aFileName, '%', INetURLObject::DECODE_UNAMBIGUOUS);
 
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index b338534d0b81..f1df0e407056 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -59,7 +59,7 @@ protected:
     virtual bool        PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
 
 public:
-    SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::FILE );
+    SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::File );
 
 };
 
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 6a4eba8777fb..ffeeb84e33a3 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -121,7 +121,7 @@ namespace svx
             return 0L;
         } // if (!bFileExists)
         INetURLObject aURL( sURL );
-        if ( aURL.GetProtocol() != INetProtocol::FILE )
+        if ( aURL.GetProtocol() != INetProtocol::File )
         {
             OUString sMsg = CUI_RES(STR_LINKEDDOC_NO_SYSTEM_FILE);
             sMsg = sMsg.replaceFirst("$file$", m_pURL->GetText());
@@ -176,7 +176,7 @@ namespace svx
         {   // default the name to the base of the chosen URL
             INetURLObject aParser;
 
-            aParser.SetSmartProtocol(INetProtocol::FILE);
+            aParser.SetSmartProtocol(INetProtocol::File);
             aParser.SetSmartURL(aFileDlg.GetPath());
 
             m_pName->SetText(aParser.getBase(INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET));
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 33fe5cb3b34b..1b72de3e8c23 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1676,9 +1676,9 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
                         {
                             OUString sURL = xStor->getLocation();
                             INetURLObject aObj(sURL);
-                            DBG_ASSERT( aObj.GetProtocol() == INetProtocol::FILE,
+                            DBG_ASSERT( aObj.GetProtocol() == INetProtocol::File,
                                     "non-file URLs cannot be deleted" );
-                            if ( aObj.GetProtocol() == INetProtocol::FILE )
+                            if ( aObj.GetProtocol() == INetProtocol::File )
                             {
                                 KillFile_Impl( aObj.GetMainURL( INetURLObject::NO_DECODE ) );
                             }
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 512c61f1fc94..f7798adee1ea 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -150,7 +150,7 @@ OUString Convert_Impl( const OUString& rValue )
     {
         OUString aValue = rValue.getToken( i, cDelim );
         INetURLObject aObj( aValue );
-        if ( aObj.GetProtocol() == INetProtocol::FILE )
+        if ( aObj.GetProtocol() == INetProtocol::File )
             aReturn += aObj.PathToFileName();
         else if ( ::utl::LocalFileHelper::IsFileContent( aValue ) )
             aReturn += aObj.GetURLPath( INetURLObject::DECODE_WITH_CHARSET );
@@ -482,7 +482,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
 
     // old path is an URL?
     INetURLObject aObj( sWritable );
-    bool bURL = ( aObj.GetProtocol() != INetProtocol::NOT_VALID );
+    bool bURL = ( aObj.GetProtocol() != INetProtocol::NotValid );
     OUString aPathStr( _rFolder );
     INetURLObject aNewObj( aPathStr );
     aNewObj.removeFinalSlash();
@@ -607,7 +607,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
             Reference < XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
             xFolderPicker = FolderPicker::create(xContext);;
 
-            INetURLObject aURL( sWritable, INetProtocol::FILE );
+            INetURLObject aURL( sWritable, INetProtocol::File );
             xFolderPicker->setDisplayDirectory( aURL.GetMainURL( INetURLObject::NO_DECODE ) );
 
             Reference< XAsynchronousExecutableDialog > xAsyncDlg( xFolderPicker, UNO_QUERY );
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 81fb8af0d09b..b1a274e88e05 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -830,7 +830,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection()
                                                 : pLastPageSaver->m_sLastPageURL_Tools;
         }
 
-        bool bMustExpand = ( INetURLObject( sLastURL ).GetProtocol() == INetProtocol::FILE );
+        bool bMustExpand = ( INetURLObject( sLastURL ).GetProtocol() == INetProtocol::File );
 
         SvTreeListEntry* pTemp = pTreeLB->First();
         while( !pEntry && pTemp )
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 12e0f1740dbb..7465f02d8bae 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1340,7 +1340,7 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox )
             m_pFtUnlinked->Hide();
             INetURLObject aObj( aBgdGraphicPath );
             OUString aFilePath;
-            if ( aObj.GetProtocol() == INetProtocol::FILE )
+            if ( aObj.GetProtocol() == INetProtocol::File )
                 aFilePath = aObj.getFSysPath( INetURLObject::FSYS_DETECT );
             else
                 aFilePath = aBgdGraphicPath;
@@ -1745,7 +1745,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
         {
 #ifdef DBG_UTIL
             INetURLObject aObj( aStrLink );
-            DBG_ASSERT( aObj.GetProtocol() != INetProtocol::NOT_VALID, "Invalid URL!" );
+            DBG_ASSERT( aObj.GetProtocol() != INetProtocol::NotValid, "Invalid URL!" );
 #endif
             aBgdGraphicPath = aStrLink;
             m_pBtnLink->Check( true );
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 14b76460262b..921e7db53333 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -799,7 +799,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent,
         m_pExamplesVS->InsertItem( i + 1, i);
 
         INetURLObject aObj(*it);
-        if(aObj.GetProtocol() == INetProtocol::FILE)
+        if(aObj.GetProtocol() == INetProtocol::File)
             *it = aObj.PathToFileName();
 
         m_pExamplesVS->SetItemText( i + 1, *it );
@@ -1978,7 +1978,7 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl)
             {
                 sGrfName = *it;
                 INetURLObject aObj(sGrfName);
-                if(aObj.GetProtocol() == INetProtocol::FILE)
+                if(aObj.GetProtocol() == INetProtocol::File)
                     sGrfName = aObj.PathToFileName();
 
                 if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, i, &aGraphic))
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 6170eb482e51..54eecc0230a1 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -190,7 +190,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet&  )
             INetURLObject   aURL( pBitmapList->GetPath() );
 
             aURL.Append( pBitmapList->GetName() );
-            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
             if( aURL.getBase().getLength() > 18 )
             {
@@ -857,7 +857,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl)
     aDlg.AddFilter( aStrFilterType, aStrFilterType );
 
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
-    DBG_ASSERT( aFile.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+    DBG_ASSERT( aFile.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
     if( !pBitmapList->GetName().isEmpty() )
     {
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 8ed80122c414..8bc12c7aaf80 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -210,7 +210,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickSaveHdl_Impl)
     aDlg.AddFilter( aStrFilterType, aStrFilterType );
 
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
-    DBG_ASSERT( aFile.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+    DBG_ASSERT( aFile.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
     XPropertyListRef pList = GetList();
 
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index aab58f2d49eb..9c554b7f1e1c 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -203,7 +203,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet&  )
             INetURLObject   aURL( pGradientList->GetPath() );
 
             aURL.Append( pGradientList->GetName() );
-            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
             if ( aURL.getBase().getLength() > 18 )
             {
@@ -712,7 +712,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
     aDlg.AddFilter( aStrFilterType, aStrFilterType );
 
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
-    DBG_ASSERT( aFile.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+    DBG_ASSERT( aFile.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
     if( !pGradientList->GetName().isEmpty() )
     {
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 7754a07b11fe..c3afeafafd6e 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -187,7 +187,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
             INetURLObject   aURL( pHatchingList->GetPath() );
 
             aURL.Append( pHatchingList->GetName() );
-            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
             if ( aURL.getBase().getLength() > 18 )
             {
@@ -745,7 +745,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
     aDlg.AddFilter( aStrFilterType, aStrFilterType );
 
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
-    DBG_ASSERT( aFile.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+    DBG_ASSERT( aFile.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
     if( !pHatchingList->GetName().isEmpty() )
     {
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 6fffcef3d64d..ce3668f7a89f 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -562,7 +562,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
         INetURLObject   aDashURL( pDashList->GetPath() );
 
         aDashURL.Append( pDashList->GetName() );
-        DBG_ASSERT( aDashURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+        DBG_ASSERT( aDashURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
         // LineEnd list
         if( ( *pnLineEndListState & CT_MODIFIED ) || ( *pnLineEndListState & CT_CHANGED ) )
         {
@@ -601,7 +601,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
         INetURLObject aLineURL( pLineEndList->GetPath() );
 
         aLineURL.Append( pLineEndList->GetName() );
-        DBG_ASSERT( aLineURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+        DBG_ASSERT( aLineURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
         // Evaluate if another TabPage set another fill type
         if( m_pLbLineStyle->GetSelectEntryPos() != 0 )
         {
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 4fe1be6d4859..66de7c9bffcf 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -184,7 +184,7 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
             INetURLObject   aURL( pDashList->GetPath() );
 
             aURL.Append( pDashList->GetName() );
-            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
             *pPageType = 0; // 2
             *pPosDashLb = LISTBOX_ENTRY_NOTFOUND;
@@ -801,7 +801,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
     aDlg.AddFilter( aStrFilterType, aStrFilterType );
 
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
-    DBG_ASSERT( aFile.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+    DBG_ASSERT( aFile.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
     if( !pDashList->GetName().isEmpty() )
     {
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index d00f37474ad0..0c2ed94c4482 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -163,7 +163,7 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& )
             INetURLObject   aURL( pLineEndList->GetPath() );
 
             aURL.Append( pLineEndList->GetName() );
-            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+            DBG_ASSERT( aURL.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
             *pPageType = 0; // 3
             *pPosLineEndLb = LISTBOX_ENTRY_NOTFOUND;
         }
@@ -623,7 +623,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl)
     aDlg.AddFilter( aStrFilterType, aStrFilterType );
 
     INetURLObject aFile( SvtPathOptions().GetPalettePath() );
-    DBG_ASSERT( aFile.GetProtocol() != INetProtocol::NOT_VALID, "invalid URL" );
+    DBG_ASSERT( aFile.GetProtocol() != INetProtocol::NotValid, "invalid URL" );
 
     if( !pLineEndList->GetName().isEmpty() )
     {