diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 18:32:36 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 18:33:37 +0200 |
| commit | 54e87df11faf697d3b2666198a3d20b3ee091419 (patch) | |
| tree | 8cfe316f012a4969ca6980fa6ac2fdb3a9424118 /framework/source/services | |
| parent | 3aac11a1233f679ea813fee8b8de134553d7db60 (diff) | |
Change INetProtocol enumerators to CamelCase
...to avoid clashes with macros and poor warnings about hiding global FILE
Change-Id: I444e8b958f029201b228937e088efabc4b6d3050
Diffstat (limited to 'framework/source/services')
| -rw-r--r-- | framework/source/services/urltransformer.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
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 ); |