diff options
| author | Eike Rathke <erack@redhat.com> | 2021-08-08 15:42:19 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-08-09 17:48:58 +0200 |
| commit | 1db5e59aa2fcccb070388c2b817737caa17ed4f0 (patch) | |
| tree | d0958e6a7553f5ade71c44b713962769778142dc /svl | |
| parent | cb97358ab845f13f1c57b410e59126f20652d552 (diff) | |
Year without leading 0 if era code is also used
YYYY GG or GG YYYY
shall display 1 BC not 0001 BC, or AD 1 not AD 0001
Change-Id: I1955f55d37a4af5075c9cfc20c3ea200ba340765
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120174
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 5e69c5fbdb44cd782080e7f4d9ad89dc48b2d1b1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120133
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/numbers/zformat.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index d14bf73841ee..255bfb09b5f7 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -3834,7 +3834,7 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber, sBuff.append('-'); } aStr = rCal.getDisplayString( CalendarDisplayCode::LONG_YEAR, nNatNum ); - if (aStr.getLength() < 4) + if (aStr.getLength() < 4 && !lcl_hasEra(NumFor[nIx])) { using namespace comphelper::string; // Ensure that year consists of at least 4 digits, so it @@ -4199,7 +4199,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber, sBuff.append('-'); } aYear = rCal.getDisplayString( CalendarDisplayCode::LONG_YEAR, nNatNum ); - if (aYear.getLength() < 4) + if (aYear.getLength() < 4 && !lcl_hasEra(NumFor[nIx])) { using namespace comphelper::string; // Ensure that year consists of at least 4 digits, so it |