diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 15:58:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 16:30:34 +0200 |
| commit | 44b3e56bb4a4df59f53447c4ca4d8e02fe926206 (patch) | |
| tree | 71a9efde3a6a2a00688e8feb8e3086cb32eceb4f /toolkit | |
| parent | Model o3tl::enumarray after std::array to allow aggregate initialization (diff) | |
| download | core-44b3e56bb4a4df59f53447c4ca4d8e02fe926206.tar.gz core-44b3e56bb4a4df59f53447c4ca4d8e02fe926206.zip | |
Change INetProtocol to scoped enumeration
...and fix o3tl::enumarray::operator [] const overload
Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b
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 3c77117e6116..5b6964c4826c 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() != INET_PROT_PRIV_SOFFICE ) + if ( aURL.GetProtocol() != INetProtocol::PRIV_SOFFICE ) { 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 588641713110..9039356d19e8 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() == INET_PROT_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 289b804c27fd..fde89ee50b74 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 == INET_PROT_NOT_VALID ) + if ( protocol == INetProtocol::NOT_VALID ) { OUString testAbsoluteURL; if ( ::osl::FileBase::E_None == ::osl::FileBase::getAbsoluteFileURL( baseLocation, url, testAbsoluteURL ) ) |