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 /avmedia | |
| parent | 0b4965bcd7ec911951e7ca3a4cd48062843b2634 (diff) | |
Change INetProtocol to scoped enumeration
...and fix o3tl::enumarray::operator [] const overload
Change-Id: I749b1b9d68686b03a97074253478d9d2d9d32b0b
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/modeltools.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/avmedia/source/framework/modeltools.cxx b/avmedia/source/framework/modeltools.cxx index fe6ea56ca689..72e6a03371b7 100644 --- a/avmedia/source/framework/modeltools.cxx +++ b/avmedia/source/framework/modeltools.cxx @@ -90,7 +90,7 @@ bool KmzDae2Gltf(const OUString& rSourceURL, OUString& o_rOutput) // If *.dae file is not in the local file system, then copy it to a temp folder for the conversion OUString sInput = rSourceURL; const INetURLObject aSourceURLObj(rSourceURL); - if( aSourceURLObj.GetProtocol() != INET_PROT_FILE ) + if( aSourceURLObj.GetProtocol() != INetProtocol::FILE ) { try { diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 7912bf5ddef5..9713666a13a9 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -339,7 +339,7 @@ bool MediaWindow::isMediaURL( const OUString& rURL, const OUString& rReferer, bo const INetURLObject aURL( rURL ); bool bRet = false; - if( aURL.GetProtocol() != INET_PROT_NOT_VALID ) + if( aURL.GetProtocol() != INetProtocol::NOT_VALID ) { if( bDeep || pPreferredSizePixel ) { diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 26877f653bb5..9916b4451a85 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -310,7 +310,7 @@ void MediaWindowImpl::setURL( const OUString& rURL, { INetURLObject aURL( rURL ); - if (aURL.GetProtocol() != INET_PROT_NOT_VALID) + if (aURL.GetProtocol() != INetProtocol::NOT_VALID) maFileURL = aURL.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS); else maFileURL = rURL; |