From 539856dbb789d23c7904163c85fb72fcc710fbbf Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Mon, 16 Sep 2024 17:12:22 +0500 Subject: [PATCH] Fix formatting of dates Redression after commit 81e1e0a2a671f19950c1bd3c69f9aa24b0c562e7 (Refactor SbxValue::Format, 2024-09-13). Change-Id: Ie7eb50c32f3c1a3aec73fc882dc33cce42734747 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173449 Reviewed-by: Mike Kaganski Tested-by: Jenkins --- .../basic_coverage/test_format_function.bas | 27 +++++++++++++++++++ basic/source/sbx/sbxscan.cxx | 1 + 2 files changed, 28 insertions(+) create mode 100644 basic/qa/basic_coverage/test_format_function.bas diff --git a/basic/qa/basic_coverage/test_format_function.bas b/basic/qa/basic_coverage/test_format_function.bas new file mode 100644 index 000000000000..00d7d54a9f3f --- /dev/null +++ b/basic/qa/basic_coverage/test_format_function.bas @@ -0,0 +1,27 @@ +' +' This file is part of the LibreOffice project. +' +' This Source Code Form is subject to the terms of the Mozilla Public +' License, v. 2.0. If a copy of the MPL was not distributed with this +' file, You can obtain one at http://mozilla.org/MPL/2.0/. +' + +Option Explicit + +Function doUnitTest as String + TestUtil.TestInit + verify_testFormat + doUnitTest = TestUtil.GetResult() +End Function + +Sub verify_testFormat + On Error GoTo errorHandler + + Dim d As Date + d = "2024-09-16 17:03:30" + TestUtil.AssertEqual(Format(d, "YYYY-MM-DD"), "2024-09-16", "Format(d, ""YYYY-MM-DD"")") + + Exit Sub +errorHandler: + TestUtil.ReportErrorHandler("verify_testFormat", Err, Error$, Erl) +End Sub diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index da863a6cec81..bc87c2af158f 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -550,6 +550,7 @@ bool GetNumberIntl(const SbxValue& val, double& ret) case SbxUINT: case SbxSINGLE: case SbxDOUBLE: + case SbxDATE: ret = val.GetDouble(); return true; case SbxSTRING: