mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removetooltypes01: #i112600# adjust basic and scaddins

Browse Source
This commit is contained in:
Mikhail Voytenko
2011-01-10 14:40:57 +01:00
parent f8431bc530
commit 642cfe8ac2
136 changed files with 4231 additions and 4231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
basic/source/runtime/step0.cxx
View File

@@ -147,7 +147,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
if( !pTRUE )
{
pTRUE = new SbxVariable;
pTRUE->PutBool( TRUE );
pTRUE->PutBool( sal_True );
pTRUE->AddRef();
}
PushVar( pTRUE );
@@ -157,7 +157,7 @@ void SbiRuntime::StepCompare( SbxOperator eOp )
if( !pFALSE )
{
pFALSE = new SbxVariable;
pFALSE->PutBool( FALSE );
pFALSE->PutBool( sal_False );
pFALSE->AddRef();
}
PushVar( pFALSE );
@@ -320,7 +320,7 @@ void SbiRuntime::StepIS()
eType2 = refVar2->GetType();
}
BOOL bRes = BOOL( eType1 == SbxOBJECT && eType2 == SbxOBJECT );
sal_Bool bRes = sal_Bool( eType1 == SbxOBJECT && eType2 == SbxOBJECT );
if ( bVBAEnabled && !bRes )
Error( SbERR_INVALID_USAGE_OBJECT );
bRes = ( bRes && refVar1->GetObject() == refVar2->GetObject() );
@@ -379,11 +379,11 @@ void SbiRuntime::StepPUT()
SbxVariableRef refVal = PopVar();
SbxVariableRef refVar = PopVar();
// Store auf die eigene Methode (innerhalb einer Function)?
BOOL bFlagsChanged = FALSE;
USHORT n = 0;
sal_Bool bFlagsChanged = sal_False;
sal_uInt16 n = 0;
if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
{
bFlagsChanged = TRUE;
bFlagsChanged = sal_True;
n = refVar->GetFlags();
refVar->SetFlag( SBX_WRITE );
}
@@ -515,11 +515,11 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
else
{
// Store auf die eigene Methode (innerhalb einer Function)?
BOOL bFlagsChanged = FALSE;
USHORT n = 0;
sal_Bool bFlagsChanged = sal_False;
sal_uInt16 n = 0;
if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
{
bFlagsChanged = TRUE;
bFlagsChanged = sal_True;
n = refVar->GetFlags();
refVar->SetFlag( SBX_WRITE );
}
@@ -569,13 +569,13 @@ void SbiRuntime::StepSET_Impl( SbxVariableRef& refVal, SbxVariableRef& refVar, b
}
// Handle Dim As New
BOOL bDimAsNew = bVBAEnabled && refVar->IsSet( SBX_DIM_AS_NEW );
sal_Bool bDimAsNew = bVBAEnabled && refVar->IsSet( SBX_DIM_AS_NEW );
SbxBaseRef xPrevVarObj;
if( bDimAsNew )
xPrevVarObj = refVar->GetObject();
// Handle withevents
BOOL bWithEvents = refVar->IsSet( SBX_WITH_EVENTS );
sal_Bool bWithEvents = refVar->IsSet( SBX_WITH_EVENTS );
if ( bWithEvents )
{
Reference< XInterface > xComListener;
@@ -704,14 +704,14 @@ void SbiRuntime::StepLSET()
else
{
// Store auf die eigene Methode (innerhalb einer Function)?
USHORT n = refVar->GetFlags();
sal_uInt16 n = refVar->GetFlags();
if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
refVar->SetFlag( SBX_WRITE );
String aRefVarString = refVar->GetString();
String aRefValString = refVal->GetString();
USHORT nVarStrLen = aRefVarString.Len();
USHORT nValStrLen = aRefValString.Len();
sal_uInt16 nVarStrLen = aRefVarString.Len();
sal_uInt16 nValStrLen = aRefValString.Len();
String aNewStr;
if( nVarStrLen > nValStrLen )
{
@@ -740,14 +740,14 @@ void SbiRuntime::StepRSET()
else
{
// Store auf die eigene Methode (innerhalb einer Function)?
USHORT n = refVar->GetFlags();
sal_uInt16 n = refVar->GetFlags();
if( (SbxVariable*) refVar == (SbxVariable*) pMeth )
refVar->SetFlag( SBX_WRITE );
String aRefVarString = refVar->GetString();
String aRefValString = refVal->GetString();
USHORT nPos = 0;
USHORT nVarStrLen = aRefVarString.Len();
sal_uInt16 nPos = 0;
sal_uInt16 nVarStrLen = aRefVarString.Len();
if( nVarStrLen > aRefValString.Len() )
{
aRefVarString.Fill(nVarStrLen,' ');
@@ -797,10 +797,10 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar )
// AB 2.4.1996, auch Arrays ohne Dimensionsangaben zulassen (VB-komp.)
if( pDims )
{
for( USHORT i = 1; i < pDims->Count(); )
for( sal_uInt16 i = 1; i < pDims->Count(); )
{
INT32 lb = pDims->Get( i++ )->GetLong();
INT32 ub = pDims->Get( i++ )->GetLong();
sal_Int32 lb = pDims->Get( i++ )->GetLong();
sal_Int32 ub = pDims->Get( i++ )->GetLong();
if( ub < lb )
Error( SbERR_OUT_OF_RANGE ), ub = lb;
pArray->AddDim32( lb, ub );
@@ -814,7 +814,7 @@ void SbiRuntime::DimImpl( SbxVariableRef refVar )
// Uno-Sequences der Laenge 0 eine Dimension anlegen
pArray->unoAddDim( 0, -1 );
}
USHORT nSavFlags = refVar->GetFlags();
sal_uInt16 nSavFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->PutObject( pArray );
refVar->SetFlags( nSavFlags );
@@ -876,7 +876,7 @@ void SbiRuntime::StepREDIMP()
short nDimsNew = pNewArray->GetDims();
short nDimsOld = pOldArray->GetDims();
short nDims = nDimsNew;
BOOL bRangeError = FALSE;
sal_Bool bRangeError = sal_False;
// Store dims to use them for copying later
sal_Int32* pLowerBounds = new sal_Int32[nDims];
@@ -885,7 +885,7 @@ void SbiRuntime::StepREDIMP()
if( nDimsOld != nDimsNew )
{
bRangeError = TRUE;
bRangeError = sal_True;
}
else
{
@@ -902,7 +902,7 @@ void SbiRuntime::StepREDIMP()
// All bounds but the last have to be the same
if( i < nDims && ( lBoundNew != lBoundOld || uBoundNew != uBoundOld ) )
{
bRangeError = TRUE;
bRangeError = sal_True;
break;
}
else
@@ -961,7 +961,7 @@ void SbiRuntime::StepREDIMP_ERASE()
}
// As in ERASE
USHORT nSavFlags = refVar->GetFlags();
sal_uInt16 nSavFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->SetType( SbxDataType(eType & 0x0FFF) );
refVar->SetFlags( nSavFlags );
@@ -976,7 +976,7 @@ void SbiRuntime::StepREDIMP_ERASE()
void lcl_clearImpl( SbxVariableRef& refVar, SbxDataType& eType )
{
USHORT nSavFlags = refVar->GetFlags();
sal_uInt16 nSavFlags = refVar->GetFlags();
refVar->ResetFlag( SBX_FIXED );
refVar->SetType( SbxDataType(eType & 0x0FFF) );
refVar->SetFlags( nSavFlags );
@@ -1148,7 +1148,7 @@ void SbiRuntime::StepINPUT()
// zu fuellen, dann mit einem Stringwert
if( !pVar->IsFixed() || pVar->IsNumeric() )
{
USHORT nLen = 0;
sal_uInt16 nLen = 0;
if( !pVar->Scan( s, &nLen ) )
{
err = SbxBase::GetError();
@@ -1271,7 +1271,7 @@ void SbiRuntime::StepENDCASE()
void SbiRuntime::StepSTDERROR()
{
pError = NULL; bError = TRUE;
pError = NULL; bError = sal_True;
pInst->aErrorMsg = String();
pInst->nErr = 0L;
pInst->nErl = 0;
@@ -1286,14 +1286,14 @@ void SbiRuntime::StepNOERROR()
pInst->nErl = 0;
nError = 0L;
SbxErrObject::getUnoErrObject()->Clear();
bError = FALSE;
bError = sal_False;
}
// UP verlassen
void SbiRuntime::StepLEAVE()
{
bRun = FALSE;
bRun = sal_False;
// If VBA and we are leaving an ErrorHandler then clear the error ( it's been processed )
if ( bInError && pError )
SbxErrObject::getUnoErrObject()->Clear();
@@ -1428,7 +1428,7 @@ void SbiRuntime::StepEMPTY()
void SbiRuntime::StepERROR()
{
SbxVariableRef refCode = PopVar();
USHORT n = refCode->GetUShort();
sal_uInt16 n = refCode->GetUShort();
SbError error = StarBASIC::GetSfxFromVBError( n );
if ( bVBAEnabled )
pInst->Error( error );