diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-08-27 10:18:06 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-27 12:06:15 +0000 |
| commit | 33b38082ca63813f7c478945be198cc504efde4b (patch) | |
| tree | 030eb240e231d855e477d985c3edc36304dd2914 /vcl | |
| parent | 81a7aeb0806298c7a8571a46e09f485f3cf5ea13 (diff) | |
put StreamMode masks in scope of enum class
Change-Id: I77682f7e289a59b986bb84edf014029a20266470
Reviewed-on: https://gerrit.libreoffice.org/28420
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/brand.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/gfxlink.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/impgraph.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/gdi/svgdata.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/salprn-gtk.cxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx index 3f49c3a38784..590fec1d8329 100644 --- a/vcl/source/app/brand.cxx +++ b/vcl/source/app/brand.cxx @@ -32,7 +32,7 @@ namespace { bool loadPng( const OUString & rPath, BitmapEx &rBitmap) { INetURLObject aObj( rPath ); - SvFileStream aStrm( aObj.PathToFileName(), STREAM_STD_READ ); + SvFileStream aStrm( aObj.PathToFileName(), StreamMode::STD_READ ); if ( !aStrm.GetError() ) { vcl::PNGReader aReader( aStrm ); rBitmap = aReader.Read(); diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 39ff4e21deb3..d9680e610aef 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -148,7 +148,7 @@ void GfxLink::SwapOut() if( !aURL.isEmpty() ) { std::shared_ptr<GfxLink::SwapOutData> pSwapOut = std::make_shared<SwapOutData>(aURL); // aURL is removed in the destructor - std::unique_ptr<SvStream> xOStm(::utl::UcbStreamHelper::CreateStream( aURL, STREAM_READWRITE | StreamMode::SHARE_DENYWRITE )); + std::unique_ptr<SvStream> xOStm(::utl::UcbStreamHelper::CreateStream( aURL, StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE )); if( xOStm ) { xOStm->WriteBytes( mpSwapInData.get(), mnSwapInDataSize ); @@ -267,7 +267,7 @@ std::shared_ptr<sal_uInt8> GfxLink::GetSwapInData() const std::shared_ptr<sal_uInt8> pData; - std::unique_ptr<SvStream> xIStm(::utl::UcbStreamHelper::CreateStream( mpSwapOutData->maURL, STREAM_READWRITE )); + std::unique_ptr<SvStream> xIStm(::utl::UcbStreamHelper::CreateStream( mpSwapOutData->maURL, StreamMode::READWRITE )); if( xIStm ) { pData = o3tl::make_shared_array<sal_uInt8>(mnSwapInDataSize); diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 4d7a14fe64b3..bea44dc70438 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -1129,7 +1129,7 @@ bool ImpGraphic::ImplSwapOut() std::unique_ptr<SvStream> xOStm; try { - xOStm.reset(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | StreamMode::SHARE_DENYWRITE )); + xOStm.reset(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE )); } catch( const css::uno::Exception& ) { @@ -1225,7 +1225,7 @@ bool ImpGraphic::ImplSwapIn() std::unique_ptr<SvStream> xIStm; try { - xIStm.reset(::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE | StreamMode::SHARE_DENYWRITE )); + xIStm.reset(::utl::UcbStreamHelper::CreateStream( aSwapURL, StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE )); } catch( const css::uno::Exception& ) { diff --git a/vcl/source/gdi/svgdata.cxx b/vcl/source/gdi/svgdata.cxx index 2efe52f332ee..76badae279ee 100644 --- a/vcl/source/gdi/svgdata.cxx +++ b/vcl/source/gdi/svgdata.cxx @@ -168,7 +168,7 @@ SvgData::SvgData(const OUString& rPath): maSequence(), maReplacement() { - SvFileStream rIStm(rPath, STREAM_STD_READ); + SvFileStream rIStm(rPath, StreamMode::STD_READ); if(rIStm.GetError()) return; const sal_uInt32 nStmLen(rIStm.remainingSize()); diff --git a/vcl/unx/gtk/salprn-gtk.cxx b/vcl/unx/gtk/salprn-gtk.cxx index cfba6bef5670..896640d22891 100644 --- a/vcl/unx/gtk/salprn-gtk.cxx +++ b/vcl/unx/gtk/salprn-gtk.cxx @@ -905,7 +905,7 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe if (xController.is()) xDoc.set(xController->getModel(), UNO_QUERY); - SvFileStream aStream(rFileURL, STREAM_READWRITE | StreamMode::SHARE_DENYWRITE | StreamMode::TRUNC); + SvFileStream aStream(rFileURL, StreamMode::READWRITE | StreamMode::SHARE_DENYWRITE | StreamMode::TRUNC); uno::Reference< XOutputStream > xOStm(new utl::OOutputStreamWrapper(aStream)); uno::Reference< XExporter > xExport(xFilter, UNO_QUERY); |