diff options
| author | Eike Rathke <erack@redhat.com> | 2021-03-15 15:57:18 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2021-03-15 20:25:47 +0100 |
| commit | c98891a4ba67a73d7a683ffb24845512705a4bbf (patch) | |
| tree | 50940bce0074dd6dd524f5461fc09c33b34140d6 /sc | |
| parent | 8a7b46c0372eb2445c0bd35c1ebe4a7c96115e5c (diff) | |
xls load: suppress secondary [~gengou] calendar modifier in format code
ja-JP Gengou calendar is an implicit secondary calendar switched
to and from by format codes.
Change-Id: Iea268310ac5e917f2168fec0166754424baa925d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112511
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/subsequent_export-test.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sc/qa/unit/subsequent_export-test.cxx b/sc/qa/unit/subsequent_export-test.cxx index 0d14b1046793..b0f390206129 100644 --- a/sc/qa/unit/subsequent_export-test.cxx +++ b/sc/qa/unit/subsequent_export-test.cxx @@ -4725,7 +4725,10 @@ void ScExportTest::testExtendedLCIDXLSX() SvNumberFormatter* pNumFormatter = rDoc.GetFormatTable(); sal_uInt32 nNumberFormat; const OUString aLang[5] = { "[$-41E]", "[$-411]", "[$-40D]", "[$-401]", "[$-500]" }; - const OUString aCalendar[5] = { "[~buddhist]DD-MM-YYYY", "[~gengou]DD-MM-EE", "[~jewish]DD-MM-YYYY", "[~hijri]DD-MM-YYYY", "[~dangi]YYYY/MM/DD" }; + const OUString aCalendar[5] = { "[~buddhist]DD-MM-YYYY", "DD-MM-EE", "[~jewish]DD-MM-YYYY", "[~hijri]DD-MM-YYYY", "[~dangi]YYYY/MM/DD" }; + // Note: ja-JP Gengou calendar is an implicit secondary (non-gregorian) + // calendar, the explicit [~gengou] calendar modifier does not need to be + // present, the E and EE keywords are used instead of YY and YYYY. for ( sal_Int16 nCol = 1; nCol <= 2; nCol++ ) { for ( sal_Int16 nRow = 1; nRow <= 4; nRow++ ) |