fdo#84938: convert STREAM_ #defines to 'enum class'

Change-Id: Ibbf14c7e9a5c1883c1311d4c86f948f74f8e473e

35 files changed, 177 insertions, 177 deletions

diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx
index 8a0f809ff5d9..56a15bfdfef0 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -94,7 +94,7 @@ void FontCache::flush()
         return;
 
     SvFileStream aStream;
-    aStream.Open( m_aCacheFile, STREAM_WRITE | STREAM_TRUNC );
+    aStream.Open( m_aCacheFile, StreamMode::WRITE | StreamMode::TRUNC );
     if( ! (aStream.IsOpen() && aStream.IsWritable()) )
     {
 #if OSL_DEBUG_LEVEL > 1
@@ -236,7 +236,7 @@ void FontCache::read()
     PrintFontManager& rManager( PrintFontManager::get() );
     MultiAtomProvider* pAtoms = rManager.m_pAtoms;
 
-    SvFileStream aStream( m_aCacheFile, STREAM_READ );
+    SvFileStream aStream( m_aCacheFile, StreamMode::READ );
     if( ! aStream.IsOpen() )
     {
 #if OSL_DEBUG_LEVEL > 1
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/generic/print/common_gfx.cxx
index fbf7ba6f000d..cc7c4d992f9c 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/generic/print/common_gfx.cxx
@@ -1135,7 +1135,7 @@ PrinterGfx::DrawEPS( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize
     bool bSuccess = false;
 
     // first search the BoundingBox of the EPS data
-    SvMemoryStream aStream( pPtr, nSize, STREAM_READ );
+    SvMemoryStream aStream( pPtr, nSize, StreamMode::READ );
     aStream.Seek( STREAM_SEEK_TO_BEGIN );
     OString aLine;
 
diff --git a/vcl/qa/cppunit/graphicfilter/filters-test.cxx b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
index 0b04dbf0e9ef..128010854289 100644
--- a/vcl/qa/cppunit/graphicfilter/filters-test.cxx
+++ b/vcl/qa/cppunit/graphicfilter/filters-test.cxx
@@ -55,7 +55,7 @@ bool VclFiltersTest::load(const OUString &,
     const OUString &rURL, const OUString &,
     unsigned int, unsigned int, unsigned int)
 {
-    SvFileStream aFileStream(rURL, STREAM_READ);
+    SvFileStream aFileStream(rURL, StreamMode::READ);
     Graphic aGraphic;
     return mGraphicFilter.ImportGraphic(aGraphic, rURL, aFileStream) == 0;
 }
diff --git a/vcl/qa/cppunit/wmf/wmfimporttest.cxx b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
index 6e2e374fa7cb..f0d192c41a03 100644
--- a/vcl/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/vcl/qa/cppunit/wmf/wmfimporttest.cxx
@@ -56,7 +56,7 @@ public:
 
 void WmfTest::testNonPlaceableWmf()
 {
-    SvFileStream aFileStream(getFullUrl("visio_import_source.wmf"), STREAM_READ);
+    SvFileStream aFileStream(getFullUrl("visio_import_source.wmf"), StreamMode::READ);
     GDIMetaFile aGDIMetaFile;
     ReadWindowMetafile(aFileStream, aGDIMetaFile);
 
@@ -85,7 +85,7 @@ void WmfTest::testNonPlaceableWmf()
 
 void WmfTest::testSine()
 {
-    SvFileStream aFileStream(getFullUrl("sine_wave.emf"), STREAM_READ);
+    SvFileStream aFileStream(getFullUrl("sine_wave.emf"), StreamMode::READ);
     GDIMetaFile aGDIMetaFile;
     ReadWindowMetafile(aFileStream, aGDIMetaFile);
 
@@ -109,7 +109,7 @@ void WmfTest::testSine()
 
 void WmfTest::testEmfProblem()
 {
-    SvFileStream aFileStream(getFullUrl("computer_mail.emf"), STREAM_READ);
+    SvFileStream aFileStream(getFullUrl("computer_mail.emf"), StreamMode::READ);
     GDIMetaFile aGDIMetaFile;
     ReadWindowMetafile(aFileStream, aGDIMetaFile);
 
@@ -128,7 +128,7 @@ void WmfTest::testEmfProblem()
 
 void WmfTest::testWorldTransformFontSize()
 {
-    SvFileStream aFileStream(getFullUrl("image1.emf"), STREAM_READ);
+    SvFileStream aFileStream(getFullUrl("image1.emf"), StreamMode::READ);
     GDIMetaFile aGDIMetaFile;
     ReadWindowMetafile(aFileStream, aGDIMetaFile);
 
diff --git a/vcl/source/filter/GraphicNativeMetadata.cxx b/vcl/source/filter/GraphicNativeMetadata.cxx
index beb6787255f4..6503774a34b6 100644
--- a/vcl/source/filter/GraphicNativeMetadata.cxx
+++ b/vcl/source/filter/GraphicNativeMetadata.cxx
@@ -41,7 +41,7 @@ bool GraphicNativeMetadata::read(Graphic& rGraphic)
     boost::scoped_array<sal_uInt8> aBuffer(new sal_uInt8[aDataSize]);
 
     memcpy(aBuffer.get(), aLink.GetData(), aDataSize);
-    SvMemoryStream aMemoryStream(aBuffer.get(), aDataSize, STREAM_READ);
+    SvMemoryStream aMemoryStream(aBuffer.get(), aDataSize, StreamMode::READ);
 
     Exif aExif;
     aExif.read(aMemoryStream);
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index cff0fed318ba..0a3c6be29298 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -1281,7 +1281,7 @@ sal_uInt16 GraphicFilter::CanImportGraphic( const INetURLObject& rPath,
     DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::CanImportGraphic() : ProtType == INET_PROT_NOT_VALID" );
 
     OUString    aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
-    boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE ));
+    boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, StreamMode::READ | StreamMode::SHARE_DENYNONE ));
     if ( pStream )
     {
         nRetValue = CanImportGraphic( aMainUrl, *pStream, nFormat, pDeterminedFormat );
@@ -1311,7 +1311,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const INetURLObject&
     DBG_ASSERT( rPath.GetProtocol() != INET_PROT_NOT_VALID, "GraphicFilter::ImportGraphic() : ProtType == INET_PROT_NOT_VALID" );
 
     OUString    aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
-    boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_READ | STREAM_SHARE_DENYNONE ));
+    boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, StreamMode::READ | StreamMode::SHARE_DENYNONE ));
     if ( pStream )
     {
         nRetValue = ImportGraphic( rGraphic, aMainUrl, *pStream, nFormat, pDeterminedFormat, nImportFlags );
@@ -1463,7 +1463,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
                         if ( nChunkSize > 11 )
                         {
                             const std::vector< sal_uInt8 >& rData = aIter->aData;
-                            SvMemoryStream aIStrm( (void*)&rData[ 11 ], nChunkSize - 11, STREAM_READ );
+                            SvMemoryStream aIStrm( (void*)&rData[ 11 ], nChunkSize - 11, StreamMode::READ );
                             ImportGIF( aIStrm, rGraphic );
                             eLinkType = GFX_LINK_TYPE_NATIVE_PNG;
                             break;
@@ -1804,7 +1804,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const INetURLO
     bool bAlreadyExists = DirEntryExists( rPath );
 
     OUString    aMainUrl( rPath.GetMainURL( INetURLObject::NO_DECODE ) );
-    boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, STREAM_WRITE | STREAM_TRUNC ));
+    boost::scoped_ptr<SvStream> pStream(::utl::UcbStreamHelper::CreateStream( aMainUrl, StreamMode::WRITE | StreamMode::TRUNC ));
     if ( pStream )
     {
         nRetValue = ExportGraphic( rGraphic, aMainUrl, *pStream, nFormat, pFilterData );
@@ -2257,7 +2257,7 @@ int GraphicFilter::LoadGraphic( const OUString &rPath, const OUString &rFilterNa
     SvStream* pStream = NULL;
     if ( INET_PROT_FILE != aURL.GetProtocol() )
     {
-        pStream = ::utl::UcbStreamHelper::CreateStream( rPath, STREAM_READ );
+        pStream = ::utl::UcbStreamHelper::CreateStream( rPath, StreamMode::READ );
     }
 
     int nRes = GRFILTER_OK;
diff --git a/vcl/source/filter/graphicfilter2.cxx b/vcl/source/filter/graphicfilter2.cxx
index 2752eebb1ba3..1d55f8c51956 100644
--- a/vcl/source/filter/graphicfilter2.cxx
+++ b/vcl/source/filter/graphicfilter2.cxx
@@ -29,7 +29,7 @@
 #define DATA_SIZE           640
 
 GraphicDescriptor::GraphicDescriptor( const INetURLObject& rPath ) :
-    pFileStm( ::utl::UcbStreamHelper::CreateStream( rPath.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ) ),
+    pFileStm( ::utl::UcbStreamHelper::CreateStream( rPath.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ ) ),
     aPathExt( rPath.GetFileExtension().toAsciiLowerCase() ),
     bOwnStream( true )
 {
diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx
index 18c51f356ac0..956b8c049f2d 100644
--- a/vcl/source/filter/sgvmain.cxx
+++ b/vcl/source/filter/sgvmain.cxx
@@ -653,7 +653,7 @@ void BmapType::Draw(OutputDevice& rOut)
         (sal_Int32)Filename[ 0 ], RTL_TEXTENCODING_UTF8 );
     INetURLObject   aFNam( aStr );
 
-    SvStream* pInp = ::utl::UcbStreamHelper::CreateStream( aFNam.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
+    SvStream* pInp = ::utl::UcbStreamHelper::CreateStream( aFNam.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ );
     if ( pInp )
     {
         nSgfTyp=CheckSgfTyp( *pInp,nVersion);
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 290437c8f9f4..eaf080e4678c 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -413,7 +413,7 @@ void EnhWMFReader::ReadEMFPlusComment(sal_uInt32 length, bool& bHaveDC)
         // debug code - write the stream to debug file /tmp/emf-stream.emf
         int pos = pWMF->Tell();
         pWMF->Seek(0);
-        SvFileStream file( OUString( "/tmp/emf-stream.emf" ), STREAM_WRITE | STREAM_TRUNC );
+        SvFileStream file( OUString( "/tmp/emf-stream.emf" ), StreamMode::WRITE | StreamMode::TRUNC );
 
         pWMF->WriteStream(file);
         file.Flush();
@@ -1189,7 +1189,7 @@ bool EnhWMFReader::ReadEnhWMF()
                         if ( nSize <= ( nEndPos - nStartPos ) )
                         {
                             char* pBuf = new char[ nSize ];
-                            SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
+                            SvMemoryStream aTmp( pBuf, nSize, StreamMode::READ | StreamMode::WRITE );
                             aTmp.ObjectOwnsMemory( true );
                             aTmp.WriteUChar( 'B' )
                                 .WriteUChar( 'M' )
@@ -1253,7 +1253,7 @@ bool EnhWMFReader::ReadEnhWMF()
                         if ( nSize <= ( nEndPos - nStartPos ) )
                         {
                             char* pBuf = new char[ nSize ];
-                            SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
+                            SvMemoryStream aTmp( pBuf, nSize, StreamMode::READ | StreamMode::WRITE );
                             aTmp.ObjectOwnsMemory( true );
                             aTmp.WriteUChar( 'B' )
                                 .WriteUChar( 'M' )
@@ -1323,7 +1323,7 @@ bool EnhWMFReader::ReadEnhWMF()
                         if ( nSize <= ( nEndPos - nStartPos ) )
                         {
                             char* pBuf = new char[ nSize ];
-                            SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
+                            SvMemoryStream aTmp( pBuf, nSize, StreamMode::READ | StreamMode::WRITE );
                             aTmp.ObjectOwnsMemory( true );
                             aTmp.WriteUChar( 'B' )
                                .WriteUChar( 'M' )
@@ -1563,7 +1563,7 @@ bool EnhWMFReader::ReadEnhWMF()
                             {
                                 char*   pBuf = new char[ nSize ];
 
-                                SvMemoryStream aTmp( pBuf, nSize, STREAM_READ | STREAM_WRITE );
+                                SvMemoryStream aTmp( pBuf, nSize, StreamMode::READ | StreamMode::WRITE );
                                 aTmp.ObjectOwnsMemory( true );
                                 aTmp.WriteUChar( 'B' )
                                     .WriteUChar( 'M' )
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 81270c0adb4f..c9e53e25b703 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -657,7 +657,7 @@ void Font::GetFontAttributes( ImplFontAttributes& rAttrs ) const
 
 SvStream& ReadImpl_Font( SvStream& rIStm, Impl_Font& rImpl_Font )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
+    VersionCompat   aCompat( rIStm, StreamMode::READ );
     sal_uInt16          nTmp16;
     bool            bTmp;
     sal_uInt8           nTmp8;
@@ -702,7 +702,7 @@ SvStream& ReadImpl_Font( SvStream& rIStm, Impl_Font& rImpl_Font )
 
 SvStream& WriteImpl_Font( SvStream& rOStm, const Impl_Font& rImpl_Font )
 {
-    VersionCompat aCompat( rOStm, STREAM_WRITE, 3 );
+    VersionCompat aCompat( rOStm, StreamMode::WRITE, 3 );
     rOStm.WriteUniOrByteString( rImpl_Font.maFamilyName, rOStm.GetStreamCharSet() );
     rOStm.WriteUniOrByteString( rImpl_Font.maStyleName, rOStm.GetStreamCharSet() );
     WritePair( rOStm, rImpl_Font.maSize );
diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx
index e58fb0c2dadb..3fa559a6abb8 100644
--- a/vcl/source/gdi/gdimetafiletools.cxx
+++ b/vcl/source/gdi/gdimetafiletools.cxx
@@ -875,7 +875,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource)
                         tools::PolyPolygon aPath;
 
                         {   // read SvtGraphicFill
-                            SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),STREAM_READ);
+                            SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),StreamMode::READ);
                             ReadSvtGraphicFill( aMemStm, aFilling );
                         }
 
@@ -916,7 +916,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource)
                         Polygon aPath;
 
                         {   // read SvtGraphicFill
-                            SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),STREAM_READ);
+                            SvMemoryStream aMemStm((void*)pA->GetData(), pA->GetDataSize(),StreamMode::READ);
                             ReadSvtGraphicStroke( aMemStm, aStroke );
                         }
 
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 1a49cdcd6892..3a6159ec9313 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -1196,7 +1196,7 @@ void GDIMetaFile::Rotate( long nAngle10 )
                         {
                             if ( pCommentAct->GetDataSize() )
                             {
-                                SvMemoryStream aMemStm( (void*)pCommentAct->GetData(), pCommentAct->GetDataSize(), STREAM_READ );
+                                SvMemoryStream aMemStm( (void*)pCommentAct->GetData(), pCommentAct->GetDataSize(), StreamMode::READ );
                                 SvMemoryStream aDest;
                                 if ( bPathStroke )
                                 {
@@ -2763,7 +2763,7 @@ SvStream& ReadGDIMetaFile( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
             sal_uInt32     nStmCompressMode = 0;
             sal_uInt32     nCount = 0;
 
-            pCompat = new VersionCompat( rIStm, STREAM_READ );
+            pCompat = new VersionCompat( rIStm, StreamMode::READ );
 
             rIStm.ReadUInt32( nStmCompressMode );
             ReadMapMode( rIStm, rGDIMetaFile.aPrefMapMode );
@@ -2862,7 +2862,7 @@ SvStream& GDIMetaFile::Write( SvStream& rOStm )
     rOStm.SetEndian( SvStreamEndian::LITTLE );
     rOStm.Write( "VCLMTF", 6 );
 
-    pCompat = new VersionCompat( rOStm, STREAM_WRITE, 1 );
+    pCompat = new VersionCompat( rOStm, StreamMode::WRITE, 1 );
 
     rOStm.WriteUInt32( nStmCompressMode );
     WriteMapMode( rOStm, aPrefMapMode );
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 575a28488644..1c825bf09cc8 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -251,7 +251,7 @@ bool GfxLink::ExportNative( SvStream& rOStream ) const
 
 SvStream& WriteGfxLink( SvStream& rOStream, const GfxLink& rGfxLink )
 {
-    VersionCompat* pCompat = new VersionCompat( rOStream, STREAM_WRITE, 2 );
+    VersionCompat* pCompat = new VersionCompat( rOStream, StreamMode::WRITE, 2 );
 
     // Version 1
     rOStream.WriteUInt16( rGfxLink.GetType() ).WriteUInt32( rGfxLink.GetDataSize() ).WriteUInt32( rGfxLink.GetUserId() );
@@ -282,7 +282,7 @@ SvStream& ReadGfxLink( SvStream& rIStream, GfxLink& rGfxLink)
     sal_uInt16          nType;
     sal_uInt8*          pBuf;
     bool            bMapAndSizeValid( false );
-    VersionCompat*  pCompat = new VersionCompat( rIStream, STREAM_READ );
+    VersionCompat*  pCompat = new VersionCompat( rIStream, StreamMode::READ );
 
     // Version 1
     rIStream.ReadUInt16( nType ).ReadUInt32( nSize ).ReadUInt32( nUserId );
@@ -322,7 +322,7 @@ ImpSwap::ImpSwap( sal_uInt8* pData, sal_uLong nDataSize ) :
         maURL = aTempFile.GetURL();
         if( !maURL.isEmpty() )
         {
-            boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( maURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE ));
+            boost::scoped_ptr<SvStream> pOStm(::utl::UcbStreamHelper::CreateStream( maURL, STREAM_READWRITE | StreamMode::SHARE_DENYWRITE ));
             if( pOStm )
             {
                 pOStm->Write( pData, mnDataSize );
diff --git a/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 04fcea7a7c81..b8bca2ea5c6c 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.cxx
@@ -287,7 +287,7 @@ bool Gradient::operator==( const Gradient& rGradient ) const
 
 SvStream& ReadImpl_Gradient( SvStream& rIStm, Impl_Gradient& rImpl_Gradient )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
+    VersionCompat   aCompat( rIStm, StreamMode::READ );
     sal_uInt16          nTmp16;
 
     rIStm.ReadUInt16( nTmp16 ); rImpl_Gradient.meStyle = (GradientStyle) nTmp16;
@@ -301,7 +301,7 @@ SvStream& ReadImpl_Gradient( SvStream& rIStm, Impl_Gradient& rImpl_Gradient )
 
 SvStream& WriteImpl_Gradient( SvStream& rOStm, const Impl_Gradient& rImpl_Gradient )
 {
-    VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
+    VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 );
 
     rOStm.WriteUInt16( rImpl_Gradient.meStyle );
     WriteColor( rOStm, rImpl_Gradient.maStartColor );
diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx
index 9a53bb638368..8dfc8f3e2a5f 100644
--- a/vcl/source/gdi/graphictools.cxx
+++ b/vcl/source/gdi/graphictools.cxx
@@ -116,7 +116,7 @@ void SvtGraphicStroke::scale( double fXScale, double fYScale )
 
 SvStream& WriteSvtGraphicStroke( SvStream& rOStm, const SvtGraphicStroke& rClass )
 {
-    VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
+    VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 );
 
     rClass.maPath.Write( rOStm );
     rClass.maStartArrow.Write( rOStm );
@@ -139,7 +139,7 @@ SvStream& WriteSvtGraphicStroke( SvStream& rOStm, const SvtGraphicStroke& rClass
 
 SvStream& ReadSvtGraphicStroke( SvStream& rIStm, SvtGraphicStroke& rClass )
 {
-    VersionCompat aCompat( rIStm, STREAM_READ );
+    VersionCompat aCompat( rIStm, StreamMode::READ );
 
     rClass.maPath.Read( rIStm );
     rClass.maStartArrow.Read( rIStm );
@@ -241,7 +241,7 @@ void SvtGraphicFill::setPath( const tools::PolyPolygon& rPath )
 
 SvStream& WriteSvtGraphicFill( SvStream& rOStm, const SvtGraphicFill& rClass )
 {
-    VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
+    VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 );
 
     rClass.maPath.Write( rOStm );
     WriteColor( rOStm, rClass.maFillColor );
@@ -270,7 +270,7 @@ SvStream& WriteSvtGraphicFill( SvStream& rOStm, const SvtGraphicFill& rClass )
 
 SvStream& ReadSvtGraphicFill( SvStream& rIStm, SvtGraphicFill& rClass )
 {
-    VersionCompat aCompat( rIStm, STREAM_READ );
+    VersionCompat aCompat( rIStm, StreamMode::READ );
 
     rClass.maPath.Read( rIStm );
     ReadColor( rIStm, rClass.maFillColor );
diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx
index 8a131cd8e2db..a8df021002e5 100644
--- a/vcl/source/gdi/hatch.cxx
+++ b/vcl/source/gdi/hatch.cxx
@@ -120,7 +120,7 @@ void Hatch::SetAngle( sal_uInt16 nAngle10 )
 
 SvStream& ReadImplHatch( SvStream& rIStm, ImplHatch& rImplHatch )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
+    VersionCompat   aCompat( rIStm, StreamMode::READ );
     sal_uInt16          nTmp16;
     sal_Int32       nTmp32(0);
 
@@ -133,7 +133,7 @@ SvStream& ReadImplHatch( SvStream& rIStm, ImplHatch& rImplHatch )
 
 SvStream& WriteImplHatch( SvStream& rOStm, const ImplHatch& rImplHatch )
 {
-    VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
+    VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 );
 
     rOStm.WriteUInt16( rImplHatch.meStyle );
     WriteColor( rOStm, rImplHatch.maColor );
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 2c2a7473298f..308d65d667c2 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -958,7 +958,7 @@ bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm )
     if( GRAPHIC_FORMAT_50 == nId )
     {
         // read new style header
-        VersionCompat* pCompat = new VersionCompat( rIStm, STREAM_READ );
+        VersionCompat* pCompat = new VersionCompat( rIStm, StreamMode::READ );
 
         rIStm.ReadInt32( nType );
         rIStm.ReadInt32( nLen );
@@ -1094,7 +1094,7 @@ bool ImpGraphic::ImplWriteEmbedded( SvStream& rOStm )
             rOStm.WriteUInt32( GRAPHIC_FORMAT_50 );
 
             // write new style header
-            VersionCompat* pCompat = new VersionCompat( rOStm, STREAM_WRITE, 1 );
+            VersionCompat* pCompat = new VersionCompat( rOStm, StreamMode::WRITE, 1 );
 
             rOStm.WriteInt32( meType );
 
@@ -1164,7 +1164,7 @@ bool ImpGraphic::ImplSwapOut()
             boost::scoped_ptr<SvStream> pOStm;
             try
             {
-                pOStm.reset(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE ));
+                pOStm.reset(::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | StreamMode::SHARE_DENYWRITE ));
             }
             catch( const ::com::sun::star::uno::Exception& )
             {
@@ -1262,7 +1262,7 @@ bool ImpGraphic::ImplSwapIn()
             boost::scoped_ptr<SvStream> pIStm;
             try
             {
-                pIStm.reset(::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE ));
+                pIStm.reset(::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE | StreamMode::SHARE_DENYWRITE ));
             }
             catch( const ::com::sun::star::uno::Exception& )
             {
@@ -1449,7 +1449,7 @@ SvStream& ReadImpGraphic( SvStream& rIStm, ImpGraphic& rImpGraphic )
                 VersionCompat*  pCompat;
 
                 // read compat info
-                pCompat = new VersionCompat( rIStm, STREAM_READ );
+                pCompat = new VersionCompat( rIStm, StreamMode::READ );
                 delete pCompat;
 
                 ReadGfxLink( rIStm, aLink );
@@ -1589,7 +1589,7 @@ SvStream& WriteImpGraphic( SvStream& rOStm, const ImpGraphic& rImpGraphic )
                 rOStm.WriteUInt32( NATIVE_FORMAT_50 );
 
                 // write compat info
-                pCompat = new VersionCompat( rOStm, STREAM_WRITE, 1 );
+                pCompat = new VersionCompat( rOStm, StreamMode::WRITE, 1 );
                 delete pCompat;
 
                 rImpGraphic.mpGfxLink->SetPrefMapMode( rImpGraphic.ImplGetPrefMapMode() );
diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx
index d7ae97aa7d82..fc6fe4f6e7a8 100644
--- a/vcl/source/gdi/lineinfo.cxx
+++ b/vcl/source/gdi/lineinfo.cxx
@@ -190,7 +190,7 @@ bool LineInfo::IsDefault() const
 
 SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
+    VersionCompat   aCompat( rIStm, StreamMode::READ );
     sal_uInt16          nTmp16(0);
     sal_Int32       nTmp32(0);
 
@@ -226,7 +226,7 @@ SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo )
 
 SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo )
 {
-    VersionCompat aCompat( rOStm, STREAM_WRITE, 4 );
+    VersionCompat aCompat( rOStm, StreamMode::WRITE, 4 );
 
     // version 1
     rOStm.WriteUInt16( rImplLineInfo.meStyle ).WriteInt32( rImplLineInfo.mnWidth );
diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index a64f43b6aed6..2bf14e3fe112 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.cxx
@@ -68,7 +68,7 @@ MapMode::ImplMapMode::ImplMapMode( const ImplMapMode& rImplMapMode ) :
 
 SvStream& ReadImplMapMode(SvStream& rIStm, MapMode::ImplMapMode& rImplMapMode)
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
+    VersionCompat   aCompat( rIStm, StreamMode::READ );
     sal_uInt16          nTmp16;
 
     rIStm.ReadUInt16( nTmp16 ); rImplMapMode.meUnit = (MapUnit) nTmp16;
@@ -82,7 +82,7 @@ SvStream& ReadImplMapMode(SvStream& rIStm, MapMode::ImplMapMode& rImplMapMode)
 
 SvStream& WriteImplMapMode(SvStream& rOStm, const MapMode::ImplMapMode& rImplMapMode)
 {
-    VersionCompat aCompat( rOStm, STREAM_WRITE, 1 );
+    VersionCompat aCompat( rOStm, StreamMode::WRITE, 1 );
 
     rOStm.WriteUInt16( rImplMapMode.meUnit );
     WritePair( rOStm, rImplMapMode.maOrigin );
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 50b856b22f09..863258824054 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -262,7 +262,7 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData
 
         default:
         {
-            VersionCompat aCompat(rIStm, STREAM_READ);
+            VersionCompat aCompat(rIStm, StreamMode::READ);
         }
         break;
     }
@@ -317,14 +317,14 @@ bool MetaPixelAction::Compare( const MetaAction& rMetaAction ) const
 void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WritePair( rOStm, maPt );
     maColor.Write( rOStm, true );
 }
 
 void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadPair( rIStm, maPt );
     maColor.Read( rIStm, true );
 }
@@ -371,13 +371,13 @@ bool MetaPointAction::Compare( const MetaAction& rMetaAction ) const
 void MetaPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WritePair( rOStm, maPt );
 }
 
 void MetaPointAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadPair( rIStm, maPt );
 }
 
@@ -440,7 +440,7 @@ bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const
 void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 2);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 2);
 
     WritePair( rOStm, maStartPt );
     WritePair( rOStm, maEndPt );  // Version 1
@@ -449,7 +449,7 @@ void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
 
     // Version 1
     ReadPair( rIStm, maStartPt );
@@ -504,13 +504,13 @@ bool MetaRectAction::Compare( const MetaAction& rMetaAction ) const
 void MetaRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WriteRectangle( rOStm, maRect );
 }
 
 void MetaRectAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadRectangle( rIStm, maRect );
 }
 
@@ -565,14 +565,14 @@ bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const
 void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WriteRectangle( rOStm, maRect );
     rOStm.WriteUInt32( mnHorzRound ).WriteUInt32( mnVertRound );
 }
 
 void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadRectangle( rIStm, maRect ).ReadUInt32( mnHorzRound ).ReadUInt32( mnVertRound );
 }
 
@@ -618,13 +618,13 @@ bool MetaEllipseAction::Compare( const MetaAction& rMetaAction ) const
 void MetaEllipseAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WriteRectangle( rOStm, maRect );
 }
 
 void MetaEllipseAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadRectangle( rIStm, maRect );
 }
 
@@ -679,7 +679,7 @@ bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const
 void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WriteRectangle( rOStm, maRect );
     WritePair( rOStm, maStartPt );
     WritePair( rOStm, maEndPt );
@@ -687,7 +687,7 @@ void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadRectangle( rIStm, maRect );
     ReadPair( rIStm, maStartPt );
     ReadPair( rIStm, maEndPt );
@@ -744,7 +744,7 @@ bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const
 void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WriteRectangle( rOStm, maRect );
     WritePair( rOStm, maStartPt );
     WritePair( rOStm, maEndPt );
@@ -752,7 +752,7 @@ void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadRectangle( rIStm, maRect );
     ReadPair( rIStm, maStartPt );
     ReadPair( rIStm, maEndPt );
@@ -809,7 +809,7 @@ bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const
 void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WriteRectangle( rOStm, maRect );
     WritePair( rOStm, maStartPt );
     WritePair( rOStm, maEndPt );
@@ -817,7 +817,7 @@ void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadRectangle( rIStm, maRect );
     ReadPair( rIStm, maStartPt );
     ReadPair( rIStm, maEndPt );
@@ -881,7 +881,7 @@ bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const
 void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 3);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 3);
 
     Polygon aSimplePoly;
     maPoly.AdaptiveSubdivide( aSimplePoly );
@@ -897,7 +897,7 @@ void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
 
     // Version 1
     ReadPolygon( rIStm, maPoly );
@@ -956,7 +956,7 @@ bool MetaPolygonAction::Compare( const MetaAction& rMetaAction ) const
 void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 2);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 2);
 
     Polygon aSimplePoly;                            // Version 1
     maPoly.AdaptiveSubdivide( aSimplePoly );
@@ -970,7 +970,7 @@ void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
 
     ReadPolygon( rIStm, maPoly );       // Version 1
 
@@ -1026,7 +1026,7 @@ bool MetaPolyPolygonAction::Compare( const MetaAction& rMetaAction ) const
 void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 2);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 2);
 
     sal_uInt16 nNumberOfComplexPolygons = 0;
     sal_uInt16 i, nPolyCount = maPolyPoly.Count();
@@ -1058,7 +1058,7 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadPolyPolygon( rIStm, maPolyPoly );                // Version 1
 
     if ( aCompat.GetVersion() >= 2 )    // Version 2
@@ -1133,7 +1133,7 @@ bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 2);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 2);
     WritePair( rOStm, maPt );
     rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
     rOStm.WriteUInt16(mnIndex);
@@ -1144,7 +1144,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadPair( rIStm, maPt );
     maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet);
     sal_uInt16 nTmpIndex(0);
@@ -1252,7 +1252,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     const sal_Int32 nAryLen = mpDXAry ? mnLen : 0;
 
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 2);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 2);
     WritePair( rOStm, maStartPt );
     rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
     rOStm.WriteUInt16(mnIndex);
@@ -1269,7 +1269,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
     delete[] mpDXAry;
 
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadPair( rIStm, maStartPt );
     maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet);
     sal_uInt16 nTmpIndex(0);
@@ -1385,7 +1385,7 @@ bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const
 void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 2);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 2);
     WritePair( rOStm, maPt );
     rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
     rOStm.WriteUInt32( mnWidth );
@@ -1397,7 +1397,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadPair( rIStm, maPt );
     maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet);
     rIStm.ReadUInt32( mnWidth );
@@ -1460,7 +1460,7 @@ bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 2);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 2);
     WriteRectangle( rOStm, maRect );
     rOStm.WriteUniOrByteString( maStr, pData->meActualCharSet );
     rOStm.WriteUInt16( mnStyle );
@@ -1470,7 +1470,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadRectangle( rIStm, maRect );
     maStr = rIStm.ReadUniOrByteString(pData->meActualCharSet);
     rIStm  .ReadUInt16( mnStyle );
@@ -1537,7 +1537,7 @@ bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 2);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 2);
 
     WritePair( rOStm, maPos );
     rOStm.WriteInt32( mnWidth );
@@ -1549,7 +1549,7 @@ void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
 
     sal_Int32 nTempWidth(0);
     ReadPair( rIStm, maPos );
@@ -1614,7 +1614,7 @@ void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     if( !!maBmp )
     {
         MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
         WriteDIB(maBmp, rOStm, false, true);
         WritePair( rOStm, maPt );
     }
@@ -1622,7 +1622,7 @@ void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadDIB(maBmp, rIStm, true);
     ReadPair( rIStm, maPt );
 }
@@ -1679,7 +1679,7 @@ void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     if( !!maBmp )
     {
         MetaAction::Write(rOStm, pData);
-        VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+        VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
         WriteDIB(maBmp, rOStm, false, true);
         WritePair( rOStm, maPt );
         WritePair( rOStm, maSz );
@@ -1688,7 +1688,7 @@ void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadDIB(maBmp, rIStm, true);
     ReadPair( rIStm, maPt );
     ReadPair( rIStm, maSz );
@@ -1751,7 +1751,7 @@ void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     if( !!maBmp )
     {
         MetaAction::Write(rOStm, pData);
-        VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+        VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
         WriteDIB(maBmp, rOStm, false, true);
         WritePair( rOStm, maDstPt );
         WritePair( rOStm, maDstSz );
@@ -1762,7 +1762,7 @@ void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadDIB(maBmp, rIStm, true);
     ReadPair( rIStm, maDstPt );
     ReadPair( rIStm, maDstSz );
@@ -1816,7 +1816,7 @@ void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     if( !!maBmpEx.GetBitmap() )
     {
         MetaAction::Write(rOStm, pData);
-        VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+        VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
         WriteDIBBitmapEx(maBmpEx, rOStm);
         WritePair( rOStm, maPt );
     }
@@ -1824,7 +1824,7 @@ void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadDIBBitmapEx(maBmpEx, rIStm);
     ReadPair( rIStm, maPt );
 }
@@ -1881,7 +1881,7 @@ void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     if( !!maBmpEx.GetBitmap() )
     {
         MetaAction::Write(rOStm, pData);
-        VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+        VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
         WriteDIBBitmapEx(maBmpEx, rOStm);
         WritePair( rOStm, maPt );
         WritePair( rOStm, maSz );
@@ -1890,7 +1890,7 @@ void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadDIBBitmapEx(maBmpEx, rIStm);
     ReadPair( rIStm, maPt );
     ReadPair( rIStm, maSz );
@@ -1953,7 +1953,7 @@ void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData
     if( !!maBmpEx.GetBitmap() )
     {
         MetaAction::Write(rOStm, pData);
-        VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+        VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
         WriteDIBBitmapEx(maBmpEx, rOStm);
         WritePair( rOStm, maDstPt );
         WritePair( rOStm, maDstSz );
@@ -1964,7 +1964,7 @@ void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData
 
 void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadDIBBitmapEx(maBmpEx, rIStm);
     ReadPair( rIStm, maDstPt );
     ReadPair( rIStm, maDstSz );
@@ -2022,7 +2022,7 @@ void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     if( !!maBmp )
     {
         MetaAction::Write(rOStm, pData);
-        VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+        VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
         WriteDIB(maBmp, rOStm, false, true);
         WritePair( rOStm, maPt );
     }
@@ -2030,7 +2030,7 @@ void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadDIB(maBmp, rIStm, true);
     ReadPair( rIStm, maPt );
 }
@@ -2090,7 +2090,7 @@ void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     if( !!maBmp )
     {
         MetaAction::Write(rOStm, pData);
-        VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+        VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
         WriteDIB(maBmp, rOStm, false, true);
         WritePair( rOStm, maPt );
         WritePair( rOStm, maSz );
@@ -2099,7 +2099,7 @@ void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadDIB(maBmp, rIStm, true);
     ReadPair( rIStm, maPt );
     ReadPair( rIStm, maSz );
@@ -2165,7 +2165,7 @@ void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     if( !!maBmp )
     {
         MetaAction::Write(rOStm, pData);
-        VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+        VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
         WriteDIB(maBmp, rOStm, false, true);
         maColor.Write( rOStm, true );
         WritePair( rOStm, maDstPt );
@@ -2177,7 +2177,7 @@ void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadDIB(maBmp, rIStm, true);
     maColor.Read( rIStm, true );
     ReadPair( rIStm, maDstPt );
@@ -2230,14 +2230,14 @@ bool MetaGradientAction::Compare( const MetaAction& rMetaAction ) const
 void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WriteRectangle( rOStm, maRect );
     WriteGradient( rOStm, maGradient );
 }
 
 void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadRectangle( rIStm, maRect );
     ReadGradient( rIStm, maGradient );
 }
@@ -2291,7 +2291,7 @@ bool MetaGradientExAction::Compare( const MetaAction& rMetaAction ) const
 void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
 
     // #i105373# see comment at MetaTransparentAction::Write
     tools::PolyPolygon aNoCurvePolyPolygon;
@@ -2303,7 +2303,7 @@ void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadPolyPolygon( rIStm, maPolyPoly );
     ReadGradient( rIStm, maGradient );
 }
@@ -2353,7 +2353,7 @@ bool MetaHatchAction::Compare( const MetaAction& rMetaAction ) const
 void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
 
     // #i105373# see comment at MetaTransparentAction::Write
     tools::PolyPolygon aNoCurvePolyPolygon;
@@ -2365,7 +2365,7 @@ void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadPolyPolygon( rIStm, maPolyPoly );
     ReadHatch( rIStm, maHatch );
 }
@@ -2415,14 +2415,14 @@ bool MetaWallpaperAction::Compare( const MetaAction& rMetaAction ) const
 void MetaWallpaperAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
 
     WriteWallpaper( rOStm, maWallpaper );
 }
 
 void MetaWallpaperAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadWallpaper( rIStm, maWallpaper );
 }
 
@@ -2474,7 +2474,7 @@ bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const
 void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
 
     WriteRegion( rOStm, maRegion );
     rOStm.WriteUChar( mbClip );
@@ -2482,7 +2482,7 @@ void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadRegion( rIStm, maRegion );
     rIStm.ReadCharAsBool( mbClip );
 }
@@ -2529,13 +2529,13 @@ bool MetaISectRectClipRegionAction::Compare( const MetaAction& rMetaAction ) con
 void MetaISectRectClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WriteRectangle( rOStm, maRect );
 }
 
 void MetaISectRectClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadRectangle( rIStm, maRect );
 }
 
@@ -2582,13 +2582,13 @@ bool MetaISectRegionClipRegionAction::Compare( const MetaAction& rMetaAction ) c
 void MetaISectRegionClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WriteRegion( rOStm, maRegion );
 }
 
 void MetaISectRegionClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadRegion( rIStm, maRegion );
 }
 
@@ -2634,13 +2634,13 @@ bool MetaMoveClipRegionAction::Compare( const MetaAction& rMetaAction ) const
 void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     rOStm.WriteInt32( mnHorzMove ).WriteInt32( mnVertMove );
 }
 
 void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     sal_Int32 nTmpHM(0), nTmpVM(0);
     rIStm.ReadInt32( nTmpHM ).ReadInt32( nTmpVM );
     mnHorzMove = nTmpHM;
@@ -2685,14 +2685,14 @@ bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const
 void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     maColor.Write( rOStm, true );
     rOStm.WriteUChar( mbSet );
 }
 
 void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     maColor.Read( rIStm, true );
     rIStm.ReadCharAsBool( mbSet );
 }
@@ -2735,14 +2735,14 @@ bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const
 void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     maColor.Write( rOStm, true );
     rOStm.WriteUChar( mbSet );
 }
 
 void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     maColor.Read( rIStm, true );
     rIStm.ReadCharAsBool( mbSet );
 }
@@ -2779,13 +2779,13 @@ bool MetaTextColorAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     maColor.Write( rOStm, true );
 }
 
 void MetaTextColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     maColor.Read( rIStm, true );
 }
 
@@ -2827,14 +2827,14 @@ bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     maColor.Write( rOStm, true );
     rOStm.WriteUChar( mbSet );
 }
 
 void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     maColor.Read( rIStm, true );
     rIStm.ReadCharAsBool( mbSet );
 }
@@ -2877,14 +2877,14 @@ bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     maColor.Write( rOStm, true );
     rOStm.WriteUChar( mbSet );
 }
 
 void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     maColor.Read( rIStm, true );
     rIStm.ReadCharAsBool( mbSet );
 }
@@ -2927,14 +2927,14 @@ bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const
 void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     maColor.Write( rOStm, true );
     rOStm.WriteUChar( mbSet );
 }
 
 void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     maColor.Read( rIStm, true );
     rIStm.ReadCharAsBool( mbSet );
 }
@@ -2972,7 +2972,7 @@ bool MetaTextAlignAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     rOStm.WriteUInt16( maAlign );
 }
 
@@ -2980,7 +2980,7 @@ void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     sal_uInt16 nTmp16(0);
 
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     rIStm.ReadUInt16( nTmp16 ); maAlign = (TextAlign) nTmp16;
 }
 
@@ -3024,13 +3024,13 @@ bool MetaMapModeAction::Compare( const MetaAction& rMetaAction ) const
 void MetaMapModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WriteMapMode( rOStm, maMapMode );
 }
 
 void MetaMapModeAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadMapMode( rIStm, maMapMode );
 }
 
@@ -3084,7 +3084,7 @@ bool MetaFontAction::Compare( const MetaAction& rMetaAction ) const
 void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     WriteFont( rOStm, maFont );
     pData->meActualCharSet = maFont.GetCharSet();
     if ( pData->meActualCharSet == RTL_TEXTENCODING_DONTKNOW )
@@ -3093,7 +3093,7 @@ void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadFont( rIStm, maFont );
     pData->meActualCharSet = maFont.GetCharSet();
     if ( pData->meActualCharSet == RTL_TEXTENCODING_DONTKNOW )
@@ -3133,13 +3133,13 @@ bool MetaPushAction::Compare( const MetaAction& rMetaAction ) const
 void MetaPushAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     rOStm.WriteUInt16( static_cast<sal_uInt16>(mnFlags) );
 }
 
 void MetaPushAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     sal_uInt16 tmp;
     rIStm.ReadUInt16( tmp );
     mnFlags = static_cast<PushFlags>(tmp);
@@ -3167,12 +3167,12 @@ MetaAction* MetaPopAction::Clone()
 void MetaPopAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
 }
 
 void MetaPopAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
 }
 
 MetaRasterOpAction::MetaRasterOpAction() :
@@ -3209,7 +3209,7 @@ bool MetaRasterOpAction::Compare( const MetaAction& rMetaAction ) const
 void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     rOStm.WriteUInt16( meRasterOp );
 }
 
@@ -3217,7 +3217,7 @@ void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
     sal_uInt16 nTmp16(0);
 
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     rIStm.ReadUInt16( nTmp16 ); meRasterOp = (RasterOp) nTmp16;
 }
 
@@ -3267,7 +3267,7 @@ bool MetaTransparentAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
 
     // #i105373# The tools::PolyPolygon in this action may be a curve; this
     // was ignored until now what is an error. To make older office
@@ -3287,7 +3287,7 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadPolyPolygon( rIStm, maPolyPoly );
     rIStm.ReadUInt16( mnTransPercent );
 }
@@ -3344,7 +3344,7 @@ bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const
 void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
 
     maMtf.Write( rOStm );
     WritePair( rOStm,  maPoint );
@@ -3354,7 +3354,7 @@ void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pDat
 
 void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadGDIMetaFile( rIStm, maMtf );
     ReadPair( rIStm, maPoint );
     ReadPair( rIStm, maSize );
@@ -3413,7 +3413,7 @@ bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const
 void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
 
     WriteGfxLink( rOStm, maGfxLink );
     WritePair( rOStm, maPoint );
@@ -3423,7 +3423,7 @@ void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadGfxLink( rIStm, maGfxLink );
     ReadPair( rIStm, maPoint );
     ReadPair( rIStm, maSize );
@@ -3468,7 +3468,7 @@ bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const
 void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
 
     WritePair( rOStm, maRefPoint );
     rOStm.WriteUChar( mbSet );
@@ -3476,7 +3476,7 @@ void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     ReadPair( rIStm, maRefPoint ).ReadCharAsBool( mbSet );
 }
 
@@ -3548,7 +3548,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove )
             bool bPathStroke = (maComment == "XPATHSTROKE_SEQ_BEGIN");
             if ( bPathStroke || maComment == "XPATHFILL_SEQ_BEGIN" )
             {
-                SvMemoryStream  aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
+                SvMemoryStream  aMemStm( (void*)mpData, mnDataSize, StreamMode::READ );
                 SvMemoryStream  aDest;
                 if ( bPathStroke )
                 {
@@ -3604,7 +3604,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
             bool bPathStroke = (maComment == "XPATHSTROKE_SEQ_BEGIN");
             if ( bPathStroke || maComment == "XPATHFILL_SEQ_BEGIN" )
             {
-                SvMemoryStream  aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
+                SvMemoryStream  aMemStm( (void*)mpData, mnDataSize, StreamMode::READ );
                 SvMemoryStream  aDest;
                 if ( bPathStroke )
                 {
@@ -3626,7 +3626,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
                 delete[] mpData;
                 ImplInitDynamicData( static_cast<const sal_uInt8*>( aDest.GetData() ), aDest.Tell() );
             } else if( maComment == "EMF_PLUS_HEADER_INFO" ){
-                SvMemoryStream  aMemStm( (void*)mpData, mnDataSize, STREAM_READ );
+                SvMemoryStream  aMemStm( (void*)mpData, mnDataSize, StreamMode::READ );
                 SvMemoryStream  aDest;
 
                 sal_Int32 nLeft(0), nRight(0), nTop(0), nBottom(0);
@@ -3667,7 +3667,7 @@ bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const
 void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     write_uInt16_lenPrefixed_uInt8s_FromOString(rOStm, maComment);
     rOStm.WriteInt32( mnValue ).WriteUInt32( mnDataSize );
 
@@ -3677,7 +3677,7 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 
 void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     maComment = read_uInt16_lenPrefixed_uInt8s_ToOString(rIStm);
     rIStm.ReadInt32( mnValue ).ReadUInt32( mnDataSize );
 
@@ -3727,13 +3727,13 @@ bool MetaLayoutModeAction::Compare( const MetaAction& rMetaAction ) const
 void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     rOStm.WriteUInt32( mnLayoutMode );
 }
 
 void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     sal_uInt32 tmp;
     rIStm.ReadUInt32( tmp );
     mnLayoutMode = static_cast<ComplexTextLayoutMode>(tmp);
@@ -3772,13 +3772,13 @@ bool MetaTextLanguageAction::Compare( const MetaAction& rMetaAction ) const
 void MetaTextLanguageAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     MetaAction::Write(rOStm, pData);
-    VersionCompat aCompat(rOStm, STREAM_WRITE, 1);
+    VersionCompat aCompat(rOStm, StreamMode::WRITE, 1);
     rOStm.WriteUInt16( meTextLanguage );
 }
 
 void MetaTextLanguageAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
-    VersionCompat aCompat(rIStm, STREAM_READ);
+    VersionCompat aCompat(rIStm, StreamMode::READ);
     rIStm.ReadUInt16( meTextLanguage );
 }
 
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 02bfad35e478..c87993434880 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -550,7 +550,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
                         const sal_uInt8* pData = pA->GetData();
                         if ( pData )
                         {
-                            SvMemoryStream  aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ );
+                            SvMemoryStream  aMemStm( (void*)pData, pA->GetDataSize(), StreamMode::READ );
                             bool            bSkipSequence = false;
                             OString sSeqEnd;
 
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 8c30c45e2d89..4e08ba694e14 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.cxx
@@ -901,7 +901,7 @@ void PNGReaderImpl::ImplReadIDAT()
             mpZCodec.BeginCompression( ZCODEC_NO_COMPRESSION, true );
         }
         mpZCodec.SetBreak( mnChunkLen );
-        SvMemoryStream aIStrm( &(*maDataIter), mnChunkLen, STREAM_READ );
+        SvMemoryStream aIStrm( &(*maDataIter), mnChunkLen, StreamMode::READ );
 
         while ( ( mpZCodec.GetBreak() ) )
         {
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index fd23d197f64c..bdbe2e2263b6 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -389,7 +389,7 @@ bool QueueInfo::operator==( const QueueInfo& rInfo ) const
 
 SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo )
 {
-    VersionCompat aCompat( rOStream, STREAM_WRITE, 1 );
+    VersionCompat aCompat( rOStream, StreamMode::WRITE, 1 );
 
     write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8);
     write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8);
@@ -403,7 +403,7 @@ SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo )
 
 SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo )
 {
-    VersionCompat aCompat( rIStream, STREAM_READ );
+    VersionCompat aCompat( rIStream, StreamMode::READ );
 
     rInfo.maPrinterName = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
     rInfo.maDriver = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8);
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 9b8e2a996a67..fa908deeb253 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -1567,7 +1567,7 @@ bool vcl::Region::operator==( const vcl::Region& rRegion ) const
 
 SvStream& ReadRegion(SvStream& rIStrm, vcl::Region& rRegion)
 {
-    VersionCompat aCompat(rIStrm, STREAM_READ);
+    VersionCompat aCompat(rIStrm, StreamMode::READ);
     sal_uInt16 nVersion(0);
     sal_uInt16 nTmp16(0);
 
@@ -1627,7 +1627,7 @@ SvStream& ReadRegion(SvStream& rIStrm, vcl::Region& rRegion)
 SvStream& WriteRegion( SvStream& rOStrm, const vcl::Region& rRegion )
 {
     const sal_uInt16 nVersion(2);
-    VersionCompat aCompat(rOStrm, STREAM_WRITE, nVersion);
+    VersionCompat aCompat(rOStrm, StreamMode::WRITE, nVersion);
 
     // put version
     rOStrm.WriteUInt16( nVersion );
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 00031a3c829d..b4208f262891 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -87,7 +87,7 @@ void ImplWallpaper::ImplReleaseCachedBitmap()
 
 SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
 {
-    VersionCompat   aCompat( rIStm, STREAM_READ );
+    VersionCompat   aCompat( rIStm, StreamMode::READ );
     sal_uInt16          nTmp16;
 
     delete rImplWallpaper.mpRect;
@@ -140,7 +140,7 @@ SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
 
 SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper )
 {
-    VersionCompat   aCompat( rOStm, STREAM_WRITE, 3 );
+    VersionCompat   aCompat( rOStm, StreamMode::WRITE, 3 );
     bool            bRect = ( rImplWallpaper.mpRect != NULL );
     bool            bGrad = ( rImplWallpaper.mpGradient != NULL );
     bool            bBmp = ( rImplWallpaper.mpBitmap != NULL );
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index ddb0e7cb4404..99ef093fffe2 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -179,7 +179,7 @@ void OpenGLHelper::renderToFile(long nWidth, long nHeight, const OUString& rFile
     BitmapEx aBitmap = ConvertBGRABufferToBitmapEx(pBuffer.get(), nWidth, nHeight);
     try {
         vcl::PNGWriter aWriter( aBitmap );
-        SvFileStream sOutput( rFileName, STREAM_WRITE );
+        SvFileStream sOutput( rFileName, StreamMode::WRITE );
         aWriter.Write( sOutput );
         sOutput.Close();
     } catch (...) {
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 3a9d7d400681..55c645e85aad 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -286,7 +286,7 @@ void X11SalInstance::FillFontPathList( std::list< OString >& o_rFontPaths )
         aOpenWinDir += OUString::createFromAscii( lang );
         aOpenWinDir += "/OWfontpath";
 
-        SvFileStream aStream( aOpenWinDir, STREAM_READ );
+        SvFileStream aStream( aOpenWinDir, StreamMode::READ );
 
         // TODO: replace environment variables
         while( aStream.IsOpen() && ! aStream.IsEof() )
diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx
index e57fb93c7240..0c8e1318e735 100644
--- a/vcl/unx/generic/dtrans/bmp.cxx
+++ b/vcl/unx/generic/dtrans/bmp.cxx
@@ -735,7 +735,7 @@ css::uno::Sequence<sal_Int8> x11::convertBitmapDepth(
     SolarMutexGuard g;
     SvMemoryStream in(
         const_cast<sal_Int8 *>(data.getConstArray()), data.getLength(),
-        STREAM_READ);
+        StreamMode::READ);
     Bitmap bm;
     ReadDIB(bm, in, true);
     if (bm.GetBitCount() == 24 && depth <= 8) {
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 389f74dc8be8..ae7604098065 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -188,7 +188,7 @@ bool JobData::getStreamBuffer( void*& pData, int& bytes )
 
 bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobData )
 {
-    SvMemoryStream aStream( pData, bytes, STREAM_READ );
+    SvMemoryStream aStream( pData, bytes, StreamMode::READ );
     OString aLine;
     bool bVersion       = false;
     bool bPrinter       = false;
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index ff4cdd685fd7..4ee389592c6b 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -303,7 +303,7 @@ void PPDDecompressStream::Open( const OUString& i_rFile )
 {
     Close();
 
-    mpFileStream = new SvFileStream( i_rFile, STREAM_READ );
+    mpFileStream = new SvFileStream( i_rFile, StreamMode::READ );
     maFileName = mpFileStream->GetFileName();
 
     if( ! mpFileStream->IsOpen() )
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 1272792c6250..0b2c13d7812c 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -573,7 +573,7 @@ static bool checkWriteability( const OUString& rUniPath )
     bool bRet = false;
     OUString aSysPath;
     FileBase::getSystemPathFromFileURL( rUniPath, aSysPath );
-    SvFileStream aStream( aSysPath, STREAM_READ | STREAM_WRITE );
+    SvFileStream aStream( aSysPath, StreamMode::READ | StreamMode::WRITE );
     if( aStream.IsOpen() && aStream.IsWritable() )
         bRet = true;
     return bRet;
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 71fb8251c4ff..2b4b45444240 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -922,7 +922,7 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe
         if (xController.is())
             xDoc = uno::Reference< XComponent >(xController->getModel(), UNO_QUERY);
 
-        SvFileStream aStream(rFileURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC);
+        SvFileStream aStream(rFileURL, STREAM_READWRITE | StreamMode::SHARE_DENYWRITE | STREAM_TRUNC);
         uno::Reference< XOutputStream > xOStm(new utl::OOutputStreamWrapper(aStream));
 
         uno::Reference< XExporter > xExport(xFilter, UNO_QUERY);
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index ba3f5d7e7400..f8da349aa85f 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -104,7 +104,7 @@ ImplFontAttrCache::ImplFontAttrCache( const OUString& rFileNameURL, const OUStri
 
     // open the cache file
     osl::FileBase::getSystemPathFromFileURL( rFileNameURL, aCacheFileName );
-    SvFileStream aCacheFile( aCacheFileName, STREAM_READ );
+    SvFileStream aCacheFile( aCacheFileName, StreamMode::READ );
     if( !aCacheFile.IsOpen() )
         return;
 
diff --git a/vcl/workben/icontest.cxx b/vcl/workben/icontest.cxx
index 74b4df8873ff..3710a16ce152 100644
--- a/vcl/workben/icontest.cxx
+++ b/vcl/workben/icontest.cxx
@@ -93,7 +93,7 @@ MyWorkWindow::MyWorkWindow( vcl::Window* pParent, WinBits nWinStyle )
 
 void MyWorkWindow::LoadGraphic( const OUString& sImageFile )
 {
-    SvFileStream aFileStream( sImageFile, STREAM_READ );
+    SvFileStream aFileStream( sImageFile, StreamMode::READ );
     GraphicFilter aGraphicFilter(false);
     if (aGraphicFilter.ImportGraphic(maGraphic, sImageFile, aFileStream) != 0)
     {
diff --git a/vcl/workben/mtfdemo.cxx b/vcl/workben/mtfdemo.cxx
index 6e4d73d353b1..4f65b0ff12ce 100644
--- a/vcl/workben/mtfdemo.cxx
+++ b/vcl/workben/mtfdemo.cxx
@@ -43,7 +43,7 @@ public:
     DemoMtfWin(OUString& aFileName)
         : WorkWindow(NULL, WB_APP | WB_STDWORK)
     {
-        SvFileStream aFileStream(aFileName, STREAM_READ);
+        SvFileStream aFileStream(aFileName, StreamMode::READ);
 
         if (aFileStream.IsOpen())
         {