diff options
Diffstat (limited to 'basic/source/runtime')
| -rw-r--r-- | basic/source/runtime/iosys.cxx | 6 | ||||
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index f6e9487b8a6a..a6cdf58a33d7 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -620,7 +620,8 @@ SbError SbiStream::Open MapError(); if( nError ) { - delete pStrm, pStrm = nullptr; + delete pStrm; + pStrm = nullptr; } return nError; } @@ -793,7 +794,8 @@ void SbiIoSystem::Open(short nCh, const OString& rName, StreamMode nMode, SbiStr nError = pChan[ nCh ]->Open( nCh, rName, nMode, nFlags, nLen ); if( nError ) { - delete pChan[ nCh ], pChan[ nCh ] = nullptr; + delete pChan[ nCh ]; + pChan[ nCh ] = nullptr; } } nChan = 0; diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index a92b12bb0f6b..b3c092b4715c 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1092,7 +1092,8 @@ void SbiRuntime::ClearGosubStack() SbiGosubStack* p; while(( p = pGosubStk ) != nullptr ) { - pGosubStk = p->pNext, delete p; + pGosubStk = p->pNext; + delete p; } nGosubLvl = 0; } @@ -2168,7 +2169,8 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar ) sal_Int32 ub = pDims->Get( i++ )->GetLong(); if( ub < lb ) { - Error( ERRCODE_BASIC_OUT_OF_RANGE ), ub = lb; + Error( ERRCODE_BASIC_OUT_OF_RANGE ); + ub = lb; } pArray->AddDim32( lb, ub ); if ( lb != ub ) @@ -3542,7 +3544,8 @@ SbxVariable* SbiRuntime::FindElement( SbxObject* pObj, sal_uInt32 nOp1, sal_uInt if( t != SbxVARIANT && t != t2 && t >= SbxINTEGER && t <= SbxSTRING ) { - pElem->SetType( t ), bSet = true; + pElem->SetType( t ); + bSet = true; } } // assign pElem to a Ref, to delete a temp-var if applicable |