diff options
| author | Noel Grandin <noel@peralex.com> | 2015-01-07 09:28:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-01-07 11:20:44 +0200 |
| commit | 7f8f277b94704a289fbbd1b836e4e5d66311580d (patch) | |
| tree | 2400b7306a0a2a3ea63aee2e5bfc336b52102635 /cppcanvas | |
| parent | 8db77209e0755d21d9efc34f70a2978d1df5d2c6 (diff) | |
fdo#84938: convert STREAM_ #defines to 'enum class'
Change-Id: Ibbf14c7e9a5c1883c1311d4c86f948f74f8e473e
Diffstat (limited to 'cppcanvas')
| -rw-r--r-- | cppcanvas/qa/extras/emfplus/emfplus.cxx | 2 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/emfplus.cxx | 6 | ||||
| -rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cppcanvas/qa/extras/emfplus/emfplus.cxx b/cppcanvas/qa/extras/emfplus/emfplus.cxx index 96bde5643e58..c704b4aef005 100644 --- a/cppcanvas/qa/extras/emfplus/emfplus.cxx +++ b/cppcanvas/qa/extras/emfplus/emfplus.cxx @@ -64,7 +64,7 @@ public: char* pEnv = getenv("CPPCANVAS_DEBUG_EMFPLUS_DUMP_TO"); if (pEnv) { - SvFileStream aStream(OUString::fromUtf8(pEnv), STREAM_WRITE); + SvFileStream aStream(OUString::fromUtf8(pEnv), StreamMode::WRITE); vcl::PNGWriter aWriter(aResultBitmap); CPPUNIT_ASSERT(aWriter.Write(aStream)); } diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index f58ec95dd49a..11843e2732fd 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -1136,7 +1136,7 @@ namespace cppcanvas GraphicFilter filter; // workaround buggy metafiles, which have wrong mfSize set (n#705956 for example) - SvMemoryStream mfStream (((char *)s.GetData()) + s.Tell(), bUseWholeStream ? s.remainingSize() : dataSize - 16, STREAM_READ); + SvMemoryStream mfStream (((char *)s.GetData()) + s.Tell(), bUseWholeStream ? s.remainingSize() : dataSize - 16, StreamMode::READ); filter.ImportGraphic (graphic, OUString(), mfStream); @@ -1147,7 +1147,7 @@ namespace cppcanvas OUString emfp_debug_filename = "/tmp/emf-embedded-stream" + OUString::number(emfp_debug_stream_number++) + ".emf"; - SvFileStream file( emfp_debug_filename, STREAM_WRITE | STREAM_TRUNC ); + SvFileStream file( emfp_debug_filename, StreamMode::WRITE | StreamMode::TRUNC ); mfStream.WriteStream(file); file.Flush(); @@ -1809,7 +1809,7 @@ namespace cppcanvas OutDevState& rState, const CanvasSharedPtr& rCanvas ) { sal_uInt32 length = pAct->GetDataSize (); - SvMemoryStream rMF ((void*) pAct->GetData (), length, STREAM_READ); + SvMemoryStream rMF ((void*) pAct->GetData (), length, StreamMode::READ); length -= 4; diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 2bd095605487..edc3a6ef887d 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -1661,7 +1661,7 @@ namespace cppcanvas const sal_uInt8* pData = pAct->GetData(); if ( pData ) { - SvMemoryStream aMemStm( (void*)pData, pAct->GetDataSize(), STREAM_READ ); + SvMemoryStream aMemStm( (void*)pData, pAct->GetDataSize(), StreamMode::READ ); SvtGraphicFill aFill; ReadSvtGraphicFill( aMemStm, aFill ); @@ -1788,7 +1788,7 @@ namespace cppcanvas } else if( pAct->GetComment() == "EMF_PLUS_HEADER_INFO" ) { SAL_INFO ("cppcanvas.emf", "EMF+ passed to canvas mtf renderer - header info, size: " << pAct->GetDataSize ()); - SvMemoryStream rMF ((void*) pAct->GetData (), pAct->GetDataSize (), STREAM_READ); + SvMemoryStream rMF ((void*) pAct->GetData (), pAct->GetDataSize (), StreamMode::READ); rMF.ReadInt32( nFrameLeft ).ReadInt32( nFrameTop ).ReadInt32( nFrameRight ).ReadInt32( nFrameBottom ); SAL_INFO ("cppcanvas.emf", "EMF+ picture frame: " << nFrameLeft << "," << nFrameTop << " - " << nFrameRight << "," << nFrameBottom); |