ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#147132 Flatten basic function SbRtl_CDbl

Browse Source 
Change-Id: I875d48e4f55f1d70aaf279542efeeb5297c450f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208199
Reviewed-by: Neil Roberts <nroberts@libreoffice.org>
Tested-by: Jenkins
This commit is contained in:
Marios
2026-07-22 10:10:28 +02:00
committed by Ilmari Lauhakangas
parent 21b9909afa
commit d84a82ad7a
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
basic/source/runtime/methods1.cxx
+11 -15
View File
@@ -273,27 +273,23 @@ void SbRtl_CDate(StarBASIC *, SbxArray & rPar, bool) // JSM
void SbRtl_CDbl(StarBASIC *, SbxArray & rPar, bool) // JSM
{
double nVal = 0.0;
if (rPar.Count() == 2)
if (rPar.Count() != 2)
return StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT);
SbxVariable* pSbxVariable = rPar.Get(1);
if( pSbxVariable->GetType() == SbxSTRING )
{
SbxVariable* pSbxVariable = rPar.Get(1);
if( pSbxVariable->GetType() == SbxSTRING )
// #41690
OUString aScanStr = pSbxVariable->GetOUString();
ErrCode Error = SbxValue::ScanNumIntnl( aScanStr, nVal );
if( Error != ERRCODE_NONE )
{
// #41690
OUString aScanStr = pSbxVariable->GetOUString();
ErrCode Error = SbxValue::ScanNumIntnl( aScanStr, nVal );
if( Error != ERRCODE_NONE )
{
StarBASIC::Error( Error );
}
}
else
{
nVal = pSbxVariable->GetDouble();
StarBASIC::Error( Error );
}
}
else
{
StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
nVal = pSbxVariable->GetDouble();
}
rPar.Get(0)->PutDouble(nVal);