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 /toolkit | |
| 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 'toolkit')
| -rw-r--r-- | toolkit/source/awt/animatedimagespeer.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxwindow.cxx | 2 | ||||
| -rw-r--r-- | toolkit/source/controls/controlmodelcontainerbase.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index 5b6964c4826c..13da483cde92 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -110,7 +110,7 @@ namespace toolkit OUString lcl_getHighContrastURL( OUString const& i_imageURL ) { INetURLObject aURL( i_imageURL ); - if ( aURL.GetProtocol() != INetProtocol::PRIV_SOFFICE ) + if ( aURL.GetProtocol() != INetProtocol::PrivSoffice ) { OSL_VERIFY( aURL.insertName( OUString( "hicontrast" ), false, 0 ) ); return aURL.GetMainURL( INetURLObject::NO_DECODE ); diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 9039356d19e8..3d7a22dbeb23 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1519,7 +1519,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st if ( Value >>= aURL ) { INetURLObject aHelpURL( aURL ); - if ( aHelpURL.GetProtocol() == INetProtocol::HID ) + if ( aHelpURL.GetProtocol() == INetProtocol::Hid ) pWindow->SetHelpId( OUStringToOString( aHelpURL.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); else pWindow->SetHelpId( OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ) ); diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index fde89ee50b74..7e70d43324c6 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -1865,7 +1865,7 @@ OUString getPhysicalLocation( const ::com::sun::star::uno::Any& rbase, const ::c const INetURLObject protocolCheck( url ); const INetProtocol protocol = protocolCheck.GetProtocol(); - if ( protocol == INetProtocol::NOT_VALID ) + if ( protocol == INetProtocol::NotValid ) { OUString testAbsoluteURL; if ( ::osl::FileBase::E_None == ::osl::FileBase::getAbsoluteFileURL( baseLocation, url, testAbsoluteURL ) ) |