tdf#147132 Flatten Basic function implementations in methods1.cxx
Change-Id: I21eea12876303ef132f4c1922e501db987f352c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209030 Reviewed-by: Neil Roberts <nroberts@libreoffice.org> Tested-by: Jenkins
This commit is contained in:
committed by
Neil Roberts
parent
ee9332dbbe
commit
0709a6c543
@@ -243,15 +243,11 @@ void SbRtl_CDec(StarBASIC *, SbxArray & rPar, bool)
|
||||
{
|
||||
#ifdef _WIN32
|
||||
SbxDecimal* pDec = nullptr;
|
||||
if (rPar.Count() == 2)
|
||||
{
|
||||
SbxVariable* pSbxVariable = rPar.Get(1);
|
||||
pDec = pSbxVariable->GetDecimal();
|
||||
}
|
||||
else
|
||||
{
|
||||
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
|
||||
}
|
||||
if (rPar.Count() != 2)
|
||||
return StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT);
|
||||
|
||||
SbxVariable* pSbxVariable = rPar.Get(1);
|
||||
pDec = pSbxVariable->GetDecimal();
|
||||
rPar.Get(0)->PutDecimal(pDec);
|
||||
#else
|
||||
rPar.Get(0)->PutEmpty();
|
||||
@@ -543,8 +539,9 @@ void SbRtl_Choose(StarBASIC *, SbxArray & rPar, bool)
|
||||
{
|
||||
if (rPar.Count() < 2)
|
||||
{
|
||||
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
|
||||
return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
|
||||
}
|
||||
|
||||
sal_Int16 nIndex = rPar.Get(1)->GetInteger();
|
||||
sal_uInt32 nCount = rPar.Count();
|
||||
nCount--;
|
||||
@@ -606,8 +603,9 @@ void SbRtl_FreeLibrary(StarBASIC *, SbxArray & rPar, bool)
|
||||
{
|
||||
if (rPar.Count() != 2)
|
||||
{
|
||||
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
|
||||
return StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
|
||||
}
|
||||
|
||||
GetSbData()->pInst->GetDllMgr()->FreeDll(rPar.Get(1)->GetOUString());
|
||||
}
|
||||
bool IsBaseIndexOne()
|
||||
|
||||
Reference in New Issue
Block a user