basic/source/runtime/methods.cxx | 29 ++++++++++++-----------------
1 file changed, 12 insertions(+), 17 deletions(-)
New commits:
commit d8f405ccf6aa5c44a2fca659e62d7a8c09d9db7d
Author: Manish Bera <mbera.de...@gmail.com>
AuthorDate: Wed Jan 29 11:02:44 2025 +0530
Commit: Hossein <hoss...@libreoffice.org>
CommitDate: Mon Feb 3 12:49:54 2025 +0100
tdf#147132 Flatten Basic function implementations
Change-Id: I3a9fe3c74b869195ffa9b34f180e8e58c841d9ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180312
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index b36c734253c7..c5a36e7f24a5 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -1742,24 +1742,19 @@ void SbRtl_CDateFromUnoDateTime(StarBASIC *, SbxArray &
rPar, bool)
// Function to convert date to ISO 8601 date format YYYYMMDD
void SbRtl_CDateToIso(StarBASIC *, SbxArray & rPar, bool)
{
- if (rPar.Count() == 2)
- {
- double aDate = rPar.Get(1)->GetDate();
+ if (rPar.Count() != 2)
+ return StarBASIC::Error(ERRCODE_BASIC_BAD_ARGUMENT);
- // Date may actually even be -YYYYYMMDD
- char Buffer[11];
- sal_Int16 nYear = implGetDateYear( aDate );
- snprintf( Buffer, sizeof( Buffer ), (nYear < 0 ? "%05d%02d%02d" :
"%04d%02d%02d"),
- static_cast<int>(nYear),
- static_cast<int>(implGetDateMonth( aDate )),
- static_cast<int>(implGetDateDay( aDate )) );
- OUString aRetStr = OUString::createFromAscii( Buffer );
- rPar.Get(0)->PutString(aRetStr);
- }
- else
- {
- StarBASIC::Error( ERRCODE_BASIC_BAD_ARGUMENT );
- }
+ double aDate = rPar.Get(1)->GetDate();
+
+ // Date may actually even be -YYYYYMMDD
+ char Buffer[11];
+ sal_Int16 nYear = implGetDateYear(aDate);
+ snprintf(Buffer, sizeof(Buffer), (nYear < 0 ? "%05d%02d%02d" :
"%04d%02d%02d"),
+ static_cast<int>(nYear),
static_cast<int>(implGetDateMonth(aDate)),
+ static_cast<int>(implGetDateDay(aDate)));
+ OUString aRetStr = OUString::createFromAscii(Buffer);
+ rPar.Get(0)->PutString(aRetStr);
}
// Function to convert date from ISO 8601 date format YYYYMMDD or YYYY-MM-DD
