diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-21 12:45:21 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-06-21 20:58:36 +0200 |
| commit | 14c763e793780fec3f4e6280db437e4cda8bbd7c (patch) | |
| tree | 48ce5fdc506b70ee7856677052759d3c9802d890 /basic/source/runtime | |
| parent | 6580e171ad054dca38f55822e67a400191cecdf5 (diff) | |
s/ERRCODE_SBX_OK/ERRCODE_NONE
adds no value
Change-Id: Iedf7a6a7be28fed4059b576312890be8cbb980d7
Reviewed-on: https://gerrit.libreoffice.org/39056
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basic/source/runtime')
| -rw-r--r-- | basic/source/runtime/methods1.cxx | 4 | ||||
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index f8ad651fae30..d6badbf225c9 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -334,7 +334,7 @@ RTLFUNC(CDbl) // JSM // #41690 OUString aScanStr = pSbxVariable->GetOUString(); ErrCode Error = SbxValue::ScanNumIntnl( aScanStr, nVal ); - if( Error != ERRCODE_SBX_OK ) + if( Error != ERRCODE_NONE ) { StarBASIC::Error( Error ); } @@ -403,7 +403,7 @@ RTLFUNC(CSng) // JSM double dVal = 0.0; OUString aScanStr = pSbxVariable->GetOUString(); ErrCode Error = SbxValue::ScanNumIntnl( aScanStr, dVal, /*bSingle=*/true ); - if( SbxBase::GetError() == ERRCODE_SBX_OK && Error != ERRCODE_SBX_OK ) + if( SbxBase::GetError() == ERRCODE_NONE && Error != ERRCODE_NONE ) { StarBASIC::Error( Error ); } diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index f8c8ed9aec2d..998e61133fb3 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -1604,7 +1604,7 @@ inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef& refVal, SbxVariableRe // Alternatively it is possible that the same scenario // could overwrite and existing error. Lets prevent that SbxObjectRef xVarObj = static_cast<SbxObject*>(refVar->GetObject()); - if ( eOldErr != ERRCODE_SBX_OK ) + if ( eOldErr != ERRCODE_NONE ) SbxBase::SetError( eOldErr ); else SbxBase::ResetError(); |