Change INetProtocol enumerators to CamelCase

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

Change-Id: I444e8b958f029201b228937e088efabc4b6d3050

5 files changed, 10 insertions, 10 deletions

diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 06ff1e253eb5..d7f09dc64507 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -567,7 +567,7 @@ void MenuManager::UpdateSpecialFileMenu( Menu* pMenu )
                 OUString   aMenuTitle;
                 INetURLObject   aURL( aURLString );
 
-                if ( aURL.GetProtocol() == INetProtocol::FILE )
+                if ( aURL.GetProtocol() == INetProtocol::File )
                 {
                     // Do handle file URL differently => convert it to a system
                     // path and abbreviate it with a special function:
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index ee5cbf946007..4e2cfdae1f6d 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -618,7 +618,7 @@ OUString TitleHelper::impl_convertURL2Title(const OUString& sURL)
     INetURLObject   aURL (sURL);
     OUString sTitle;
 
-    if (aURL.GetProtocol() == INetProtocol::FILE)
+    if (aURL.GetProtocol() == INetProtocol::File)
     {
         if (aURL.HasMark())
             aURL = INetURLObject(aURL.GetURLNoMark());
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index c17743fe5fbc..52b1a7fde18a 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -140,14 +140,14 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css
         aProtocol = aURL.Complete.copy( 0, nURLIndex+1 );
 
         // If INetURLObject knows this protocol let it parse
-        if ( INetURLObject::CompareProtocolScheme( aProtocol ) != INetProtocol::NOT_VALID )
+        if ( INetURLObject::CompareProtocolScheme( aProtocol ) != INetProtocol::NotValid )
         {
             // Initialize parser with given URL.
             INetURLObject aParser( aURL.Complete );
 
             // Get all information about this URL.
             INetProtocol eINetProt = aParser.GetProtocol();
-            if ( eINetProt == INetProtocol::NOT_VALID )
+            if ( eINetProt == INetProtocol::NotValid )
             {
                 return sal_False;
             }
@@ -200,7 +200,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL,
     {
         // Minmal support for unknown protocols. This is mandatory to support the "Protocol Handlers" implemented
         // in framework!
-        if ( INetURLObject::CompareProtocolScheme( sSmartProtocol ) == INetProtocol::NOT_VALID )
+        if ( INetURLObject::CompareProtocolScheme( sSmartProtocol ) == INetProtocol::NotValid )
         {
             // Try to extract the protocol
             sal_Int32 nIndex = aURL.Complete.indexOf( ':' );
@@ -211,7 +211,7 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL,
 
                 // If INetURLObject knows this protocol something is wrong as detected before =>
                 // give up and return false!
-                if ( INetURLObject::CompareProtocolScheme( aProtocol ) != INetProtocol::NOT_VALID )
+                if ( INetURLObject::CompareProtocolScheme( aProtocol ) != INetProtocol::NotValid )
                     return sal_False;
                 else
                     aURL.Protocol = aProtocol;
@@ -234,7 +234,7 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u
     // Initialize parser.
     INetURLObject aParser;
 
-    if ( INetURLObject::CompareProtocolScheme( aURL.Protocol ) != INetProtocol::NOT_VALID )
+    if ( INetURLObject::CompareProtocolScheme( aURL.Protocol ) != INetProtocol::NotValid )
     {
         OUStringBuffer aCompletePath( aURL.Path );
 
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx
index 8cdfb51bf161..c2cdf4058fe4 100644
--- a/framework/source/uielement/generictoolbarcontroller.cxx
+++ b/framework/source/uielement/generictoolbarcontroller.cxx
@@ -55,7 +55,7 @@ static bool isEnumCommand( const OUString& rCommand )
 {
     INetURLObject aURL( rCommand );
 
-    if (( aURL.GetProtocol() == INetProtocol::UNO ) &&
+    if (( aURL.GetProtocol() == INetProtocol::Uno ) &&
         ( aURL.GetURLPath().indexOf( '.' ) != -1))
         return true;
 
@@ -79,7 +79,7 @@ static OUString getMasterCommand( const OUString& rCommand )
 {
     OUString aMasterCommand( rCommand );
     INetURLObject aURL( rCommand );
-    if ( aURL.GetProtocol() == INetProtocol::UNO )
+    if ( aURL.GetProtocol() == INetProtocol::Uno )
     {
         sal_Int32 nIndex = aURL.GetURLPath().indexOf( '.' );
         if ( nIndex )
diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx
index f536e2610d8a..7f1bf6450aef 100644
--- a/framework/source/uielement/recentfilesmenucontroller.cxx
+++ b/framework/source/uielement/recentfilesmenucontroller.cxx
@@ -198,7 +198,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >
                 INetURLObject   aURL( m_aRecentFilesItems[i].aURL );
                 OUString aTipHelpText( aURL.getFSysPath( INetURLObject::FSYS_DETECT ) );
 
-                if ( aURL.GetProtocol() == INetProtocol::FILE )
+                if ( aURL.GetProtocol() == INetProtocol::File )
                 {
                     // Do handle file URL differently: don't show the protocol, just the file name
                     aMenuTitle = aURL.GetLastName(INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8);