diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-05 08:47:18 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:07:53 -0500 |
| commit | 3c4333c24882d6699b65d109f2cfbf7daf3122c6 (patch) | |
| tree | 739dacdd38ddd2053aaa3ad7f0ffc053eb515d52 /slideshow | |
| parent | 6b631a02d36aa09f7c06793e8b4482d3b67ab258 (diff) | |
convert DecodeMechanism to scoped enum
(cherry picked from commit bfde4866e07746eafa2f0d6173c29d805cc35ad0)
(cherry picked from commit 3de922d4a695e253d4ca2d42b70e0b35b52e9b7c)
Change-Id: I5c56634b1bca8e37fa73d02d2428645301b6c547
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapes/shapeimporter.cxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/soundplayer.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index d8c94189c557..4caa9bc7269d 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -117,7 +117,7 @@ bool importShapeGraphic( INetURLObject aTmp( aURL ); std::unique_ptr<SvStream> pGraphicStream( utl::UcbStreamHelper::CreateStream( - aTmp.GetMainURL( INetURLObject::NO_DECODE ), + aTmp.GetMainURL( INetURLObject::DecodeMechanism::NONE ), StreamMode::READ ) ); if( !pGraphicStream ) { diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index 502742ee306f..a685dd18d583 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -97,7 +97,7 @@ namespace slideshow { const INetURLObject aURL( rSoundURL ); mxPlayer.set( avmedia::MediaWindow::createPlayer( - aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ), ""/*TODO!*/ ), + aURL.GetMainURL( INetURLObject::DecodeMechanism::Unambiguous ), ""/*TODO!*/ ), uno::UNO_QUERY); } catch( uno::RuntimeException& ) |