summaryrefslogtreecommitdiff
path: root/basic/source/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'basic/source/runtime')
-rw-r--r--basic/source/runtime/iosys.cxx26
-rw-r--r--basic/source/runtime/methods.cxx6
-rw-r--r--basic/source/runtime/runtime.cxx6
3 files changed, 19 insertions, 19 deletions
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() );
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 05:39:07 +0000