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

Change-Id: Ibbf14c7e9a5c1883c1311d4c86f948f74f8e473e

7 files changed, 42 insertions, 42 deletions

diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index a9ef314baf9c..224d1af368da 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -100,8 +100,8 @@ static const char szCryptingKey[] = "CryptedBasic";
 
 TYPEINIT1( BasicManager, SfxBroadcaster );
 
-StreamMode eStreamReadMode = STREAM_READ | STREAM_NOCREATE | STREAM_SHARE_DENYALL;
-StreamMode eStorageReadMode = STREAM_READ | STREAM_SHARE_DENYWRITE;
+const StreamMode eStreamReadMode = StreamMode::READ | StreamMode::NOCREATE | StreamMode::SHARE_DENYALL;
+const StreamMode eStorageReadMode = StreamMode::READ | StreamMode::SHARE_DENYWRITE;
 
 
 // BasicManager impl data
@@ -1536,7 +1536,7 @@ StarBASIC* BasicManager::CreateLib( const OUString& rLibName, const OUString& Pa
         {
             try
             {
-                SotStorageRef xStorage = new SotStorage(false, LinkTargetURL, STREAM_READ | STREAM_SHARE_DENYWRITE);
+                SotStorageRef xStorage = new SotStorage(false, LinkTargetURL, StreamMode::READ | StreamMode::SHARE_DENYWRITE);
                 if (!xStorage->GetError())
                 {
                     pLib = AddLib(*xStorage, rLibName, true);
@@ -2049,7 +2049,7 @@ uno::Sequence< sal_Int8 > implGetDialogData( SbxObject* pDialog )
 SbxObject* implCreateDialog( const uno::Sequence< sal_Int8 >& aData )
 {
     sal_Int8* pData = const_cast< uno::Sequence< sal_Int8 >& >(aData).getArray();
-    SvMemoryStream aMemStream( pData, aData.getLength(), STREAM_READ );
+    SvMemoryStream aMemStream( pData, aData.getLength(), StreamMode::READ );
     SbxBase* pBase = SbxBase::Load( aMemStream );
     return dynamic_cast<SbxObject*>(pBase);
 }
diff --git a/basic/source/comp/io.cxx b/basic/source/comp/io.cxx
index 0ac30a693ded..2265ed530649 100644
--- a/basic/source/comp/io.cxx
+++ b/basic/source/comp/io.cxx
@@ -173,20 +173,20 @@ void SbiParser::Open()
     SbiExpression aFileName( this );
     SbiToken eTok;
     TestToken( FOR );
-    short nMode = 0;
+    StreamMode nMode = StreamMode::NONE;
     short nFlags = 0;
     switch( Next() )
     {
         case INPUT:
-            nMode = STREAM_READ;  nFlags |= SBSTRM_INPUT; break;
+            nMode = StreamMode::READ;  nFlags |= SBSTRM_INPUT; break;
         case OUTPUT:
-            nMode = STREAM_WRITE | STREAM_TRUNC; nFlags |= SBSTRM_OUTPUT; break;
+            nMode = StreamMode::WRITE | StreamMode::TRUNC; nFlags |= SBSTRM_OUTPUT; break;
         case APPEND:
-            nMode = STREAM_WRITE; nFlags |= SBSTRM_APPEND; break;
+            nMode = StreamMode::WRITE; nFlags |= SBSTRM_APPEND; break;
         case RANDOM:
-            nMode = STREAM_READ | STREAM_WRITE; nFlags |= SBSTRM_RANDOM; break;
+            nMode = StreamMode::READ | StreamMode::WRITE; nFlags |= SBSTRM_RANDOM; break;
         case BINARY:
-            nMode = STREAM_READ | STREAM_WRITE; nFlags |= SBSTRM_BINARY; break;
+            nMode = StreamMode::READ | StreamMode::WRITE; nFlags |= SBSTRM_BINARY; break;
         default:
             Error( SbERR_SYNTAX );
     }
@@ -194,20 +194,20 @@ void SbiParser::Open()
     {
         Next();
         eTok = Next();
-        // influence only STREAM_READ,STREAM_WRITE-Flags in nMode
-        nMode &= ~(STREAM_READ | STREAM_WRITE);     // delete
+        // influence only READ,WRITE-Flags in nMode
+        nMode &= ~StreamMode(StreamMode::READ | StreamMode::WRITE);     // delete
         if( eTok == READ )
         {
             if( Peek() == WRITE )
             {
                 Next();
-                nMode |= (STREAM_READ | STREAM_WRITE);
+                nMode |= (StreamMode::READ | StreamMode::WRITE);
             }
             else
-                nMode |= STREAM_READ;
+                nMode |= StreamMode::READ;
         }
         else if( eTok == WRITE )
-            nMode |= STREAM_WRITE;
+            nMode |= StreamMode::WRITE;
         else
             Error( SbERR_SYNTAX );
     }
@@ -218,7 +218,7 @@ void SbiParser::Open()
 #define tmpSHARED
 #endif
         case SHARED:
-            Next(); nMode |= STREAM_SHARE_DENYNONE; break;
+            Next(); nMode |= StreamMode::SHARE_DENYNONE; break;
 #ifdef tmpSHARED
 #define SHARED
 #undef tmpSHARED
@@ -228,11 +228,11 @@ void SbiParser::Open()
             eTok = Next();
             if( eTok == READ )
             {
-                if( Peek() == WRITE ) Next(), nMode |= STREAM_SHARE_DENYALL;
-                else nMode |= STREAM_SHARE_DENYREAD;
+                if( Peek() == WRITE ) Next(), nMode |= StreamMode::SHARE_DENYALL;
+                else nMode |= StreamMode::SHARE_DENYREAD;
             }
             else if( eTok == WRITE )
-                nMode |= STREAM_SHARE_DENYWRITE;
+                nMode |= StreamMode::SHARE_DENYWRITE;
             else
                 Error( SbERR_SYNTAX );
             break;
@@ -262,7 +262,7 @@ void SbiParser::Open()
     if( pChan )
         pChan->Gen();
     aFileName.Gen();
-    aGen.Gen( _OPEN, nMode, nFlags );
+    aGen.Gen( _OPEN, static_cast<sal_uInt32>(nMode), nFlags );
     bInStatement = false;
 }
 
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index 80ba1ee95086..85c29ca60d25 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -51,7 +51,7 @@ class SbiStream
 public:
     SbiStream();
    ~SbiStream();
-    SbError Open( short, const OString&, short, short, short );
+    SbError Open( short, const OString&, StreamMode, short, short );
     SbError Close();
     SbError Read(OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false);
     SbError Read( char& );
@@ -89,7 +89,7 @@ public:
     void  SetChannel( short n  )       { nChan = n;   }
     short GetChannel() const           { return nChan;}
     void  ResetChannel()               { nChan = 0;   }
-    void  Open( short, const OString&, short, short, short );
+    void  Open( short, const OString&, StreamMode, short, short );
     void  Close();
     void  Read(OString&, short = 0);
     char  Read();
diff --git a/basic/source/inc/opcodes.hxx b/basic/source/inc/opcodes.hxx
index 38948d7ca2f0..669933117ecb 100644
--- a/basic/source/inc/opcodes.hxx
+++ b/basic/source/inc/opcodes.hxx
@@ -136,7 +136,7 @@ enum SbiOpcode {
     // management
     _STMNT,             // begin of a statement (+Line+Col)
     // E/A
-    _OPEN,              // (+SvStreamFlags+Flags)
+    _OPEN,              // (+StreamMode+Flags)
     // objects
     _LOCAL,             // define locals variables (+StringID+Typ)
     _PUBLIC,            // module global variables (+StringID+Typ)
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index 4627218ce6a6..82da67828eca 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -311,7 +311,7 @@ class OslStream : public SvStream
     osl::File maFile;
 
 public:
-                        OslStream( const OUString& rName, short nStrmMode );
+                        OslStream( const OUString& rName, StreamMode nStrmMode );
                        virtual ~OslStream();
     virtual sal_Size GetData( void* pData, sal_Size nSize ) SAL_OVERRIDE;
     virtual sal_Size PutData( const void* pData, sal_Size nSize ) SAL_OVERRIDE;
@@ -320,20 +320,20 @@ public:
     virtual void        SetSize( sal_uInt64 nSize) SAL_OVERRIDE;
 };
 
-OslStream::OslStream( const OUString& rName, short nStrmMode )
+OslStream::OslStream( const OUString& rName, StreamMode nStrmMode )
     : maFile( rName )
 {
     sal_uInt32 nFlags;
 
-    if( (nStrmMode & (STREAM_READ | STREAM_WRITE)) == (STREAM_READ | STREAM_WRITE) )
+    if( (nStrmMode & (StreamMode::READ | StreamMode::WRITE)) == (StreamMode::READ | StreamMode::WRITE) )
     {
         nFlags = osl_File_OpenFlag_Read | osl_File_OpenFlag_Write;
     }
-    else if( nStrmMode & STREAM_WRITE )
+    else if( nStrmMode & StreamMode::WRITE )
     {
         nFlags = osl_File_OpenFlag_Write;
     }
-    else //if( nStrmMode & STREAM_READ )
+    else //if( nStrmMode & StreamMode::READ )
     {
         nFlags = osl_File_OpenFlag_Read;
     }
@@ -562,16 +562,16 @@ void    UCBStream::SetSize( sal_uInt64 nSize )
 
 
 SbError SbiStream::Open
-( short nCh, const OString& rName, short nStrmMode, short nFlags, short nL )
+( short nCh, const OString& rName, StreamMode nStrmMode, short nFlags, short nL )
 {
     nMode   = nFlags;
     nLen    = nL;
     nChan   = nCh;
     nLine   = 0;
     nExpandOnWriteTo = 0;
-    if( ( nStrmMode & ( STREAM_READ|STREAM_WRITE ) ) == STREAM_READ )
+    if( ( nStrmMode & ( StreamMode::READ|StreamMode::WRITE ) ) == StreamMode::READ )
     {
-        nStrmMode |= STREAM_NOCREATE;
+        nStrmMode |= StreamMode::NOCREATE;
     }
     OUString aStr(OStringToOUString(rName, osl_getThreadTextEncoding()));
     OUString aNameStr = getFullPath( aStr );
@@ -583,23 +583,23 @@ SbError SbiStream::Open
         {
 
         // #??? For write access delete file if it already exists (not for appending)
-        if( (nStrmMode & STREAM_WRITE) != 0 && !IsAppend() && !IsBinary() &&
+        if( (nStrmMode & StreamMode::WRITE) && !IsAppend() && !IsBinary() &&
             xSFI->exists( aNameStr ) && !xSFI->isFolder( aNameStr ) )
         {
             xSFI->kill( aNameStr );
         }
 
-        if( (nStrmMode & (STREAM_READ | STREAM_WRITE)) == (STREAM_READ | STREAM_WRITE) )
+        if( (nStrmMode & (StreamMode::READ | StreamMode::WRITE)) == (StreamMode::READ | StreamMode::WRITE) )
         {
             Reference< XStream > xIS = xSFI->openFileReadWrite( aNameStr );
             pStrm = new UCBStream( xIS );
         }
-        else if( nStrmMode & STREAM_WRITE )
+        else if( nStrmMode & StreamMode::WRITE )
         {
             Reference< XStream > xIS = xSFI->openFileReadWrite( aNameStr );
             pStrm = new UCBStream( xIS );
         }
-        else //if( nStrmMode & STREAM_READ )
+        else //if( nStrmMode & StreamMode::READ )
         {
             Reference< XInputStream > xIS = xSFI->openFileRead( aNameStr );
             pStrm = new UCBStream( xIS );
@@ -787,7 +787,7 @@ SbError SbiIoSystem::GetError()
     return n;
 }
 
-void SbiIoSystem::Open(short nCh, const OString& rName, short nMode, short nFlags, short nLen)
+void SbiIoSystem::Open(short nCh, const OString& rName, StreamMode nMode, short nFlags, short nLen)
 {
     nError = 0;
     if( nCh >= CHANNELS || !nCh )
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 6bf3a936aef0..7ccbab73430d 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4476,7 +4476,7 @@ RTLFUNC(LoadPicture)
     }
 
     OUString aFileURL = getFullPath( rPar.Get(1)->GetOUString() );
-    boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aFileURL, STREAM_READ ));
+    boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aFileURL, StreamMode::READ ));
     if( pStream )
     {
         Bitmap aBmp;
@@ -4504,7 +4504,7 @@ RTLFUNC(SavePicture)
     SbxBase* pObj = static_cast<SbxObject*>(rPar.Get(1)->GetObject());
     if( pObj->IsA( TYPE( SbStdPicture ) ) )
     {
-        SvFileStream aOStream( rPar.Get(2)->GetOUString(), STREAM_WRITE | STREAM_TRUNC );
+        SvFileStream aOStream( rPar.Get(2)->GetOUString(), StreamMode::WRITE | StreamMode::TRUNC );
         Graphic aGraphic = static_cast<SbStdPicture*>(pObj)->GetGraphic();
         WriteGraphic( aOStream, aGraphic );
     }
@@ -4716,7 +4716,7 @@ RTLFUNC(DumpAllObjects)
             p = p->GetParent();
         }
         SvFileStream aStrm( rPar.Get( 1 )->GetOUString(),
-                            STREAM_WRITE | STREAM_TRUNC );
+                            StreamMode::WRITE | StreamMode::TRUNC );
         p->Dump( aStrm, rPar.Get( 2 )->GetBool() );
         aStrm.Close();
         if( aStrm.GetError() != SVSTREAM_OK )
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index e05ea92551d6..1595d5cd313e 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -227,7 +227,7 @@ SbiRuntime::pStep2 SbiRuntime::aStep2[] = {// all opcodes with two operands
     // Verwaltung
     &SbiRuntime::StepSTMNT,         // beginning of a statement (+Line+Col)
     // E/A
-    &SbiRuntime::StepOPEN,          // (+SvStreamFlags+Flags)
+    &SbiRuntime::StepOPEN,          // (+StreamMode+Flags)
     // Objects
     &SbiRuntime::StepLOCAL,     // define local variable (+StringId+Typ)
     &SbiRuntime::StepPUBLIC,        // module global variable (+StringID+Typ)
@@ -4304,7 +4304,7 @@ void SbiRuntime::StepSTMNT( sal_uInt32 nOp1, sal_uInt32 nOp2 )
     }
 }
 
-// (+SvStreamFlags+Flags)
+// (+StreamMode+Flags)
 // Stack: block length
 //        channel number
 //        file name
@@ -4317,7 +4317,7 @@ void SbiRuntime::StepOPEN( sal_uInt32 nOp1, sal_uInt32 nOp2 )
     short nBlkLen = pLen->GetInteger();
     short nChan   = pChan->GetInteger();
     OString aName(OUStringToOString(pName->GetOUString(), osl_getThreadTextEncoding()));
-    pIosys->Open( nChan, aName, static_cast<short>( nOp1 ),
+    pIosys->Open( nChan, aName, static_cast<StreamMode>( nOp1 ),
                   static_cast<short>( nOp2 ), nBlkLen );
     Error( pIosys->GetError() );
 }