svl/source/numbers/zforlist.cxx | 81 +++++++++++++++++++---------------------
1 file changed, 40 insertions(+), 41 deletions(-)
New commits:
commit f7d0c6b42a0a5ec98876006cd5048589219be741
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Thu Sep 23 19:19:31 2021 +0200
Commit: Eike Rathke <er...@redhat.com>
CommitDate: Thu Sep 23 20:28:42 2021 +0200
Sort ZF_STANDARD_NEWEXTENDED_DATE_... into ZF_STANDARD_DATE category
The legacy of binary file format compatible internal indices is
gone so categories can as well be enlargened. It doesn't really
matter, just a "nicer to see" sequence.
Change-Id: Id20e08e8564a281859164d44e2e863e46689b2b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122540
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 721c71ce8b0a..755dda187b9b 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -68,26 +68,25 @@ using namespace ::std;
#define ZF_STANDARD_PERCENT 10
#define ZF_STANDARD_CURRENCY 20
#define ZF_STANDARD_DATE 30
-#define ZF_STANDARD_TIME 40
+#define ZF_STANDARD_TIME 60
#define ZF_STANDARD_DURATION (ZF_STANDARD_TIME + 4)
-#define ZF_STANDARD_DATETIME 50
-#define ZF_STANDARD_SCIENTIFIC 60
-#define ZF_STANDARD_FRACTION 65
-
-// Additional builtin formats not fitting into the first 10 of a category (TLOT
-// = The Legacy Of Templin; unfortunately TLOT intended only 10 builtin formats
-// per category, more would overwrite the next category):
-#define ZF_STANDARD_NEWEXTENDED_DATE_SYS_DMMMYYYY 75
-#define ZF_STANDARD_NEWEXTENDED_DATE_SYS_DMMMMYYYY 76
-#define ZF_STANDARD_NEWEXTENDED_DATE_SYS_NNDMMMYY 77
-#define ZF_STANDARD_NEWEXTENDED_DATE_SYS_NNDMMMMYYYY 78
-#define ZF_STANDARD_NEWEXTENDED_DATE_SYS_NNNNDMMMMYYYY 79
-#define ZF_STANDARD_NEWEXTENDED_DATE_DIN_DMMMYYYY 80
-#define ZF_STANDARD_NEWEXTENDED_DATE_DIN_DMMMMYYYY 81
-#define ZF_STANDARD_NEWEXTENDED_DATE_DIN_MMDD 82
-#define ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYMMDD 83
-#define ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYYYMMDD 84
-#define ZF_STANDARD_NEWEXTENDED_DATE_WW 85
+#define ZF_STANDARD_DATETIME 70
+#define ZF_STANDARD_SCIENTIFIC 80
+#define ZF_STANDARD_FRACTION 85
+
+// Additional builtin formats, historically not fitting into the first 10 of a
+// category. Make sure it doesn't spill over to the next category.
+#define ZF_STANDARD_DATE_SYS_DMMMYYYY (ZF_STANDARD_DATE + 10)
+#define ZF_STANDARD_DATE_SYS_DMMMMYYYY (ZF_STANDARD_DATE + 11)
+#define ZF_STANDARD_DATE_SYS_NNDMMMYY (ZF_STANDARD_DATE + 12)
+#define ZF_STANDARD_DATE_SYS_NNDMMMMYYYY (ZF_STANDARD_DATE + 13)
+#define ZF_STANDARD_DATE_SYS_NNNNDMMMMYYYY (ZF_STANDARD_DATE + 14)
+#define ZF_STANDARD_DATE_DIN_DMMMYYYY (ZF_STANDARD_DATE + 15)
+#define ZF_STANDARD_DATE_DIN_DMMMMYYYY (ZF_STANDARD_DATE + 16)
+#define ZF_STANDARD_DATE_DIN_MMDD (ZF_STANDARD_DATE + 17)
+#define ZF_STANDARD_DATE_DIN_YYMMDD (ZF_STANDARD_DATE + 18)
+#define ZF_STANDARD_DATE_DIN_YYYYMMDD (ZF_STANDARD_DATE + 19)
+#define ZF_STANDARD_DATE_WW (ZF_STANDARD_DATE + 20)
#define ZF_STANDARD_LOGICAL SV_MAX_COUNT_STANDARD_FORMATS-1 // 99
#define ZF_STANDARD_TEXT SV_MAX_COUNT_STANDARD_FORMATS // 100
@@ -133,22 +132,22 @@ sal_uInt32 const indexTable[NF_INDEX_TABLE_ENTRIES] = {
ZF_STANDARD_DATE + 7, // NF_DATE_SYS_DDMMYY
ZF_STANDARD_DATE + 6, // NF_DATE_SYS_DDMMYYYY
ZF_STANDARD_DATE + 9, // NF_DATE_SYS_DMMMYY
- ZF_STANDARD_NEWEXTENDED_DATE_SYS_DMMMYYYY, // NF_DATE_SYS_DMMMYYYY
- ZF_STANDARD_NEWEXTENDED_DATE_DIN_DMMMYYYY, // NF_DATE_DIN_DMMMYYYY
- ZF_STANDARD_NEWEXTENDED_DATE_SYS_DMMMMYYYY, // NF_DATE_SYS_DMMMMYYYY
- ZF_STANDARD_NEWEXTENDED_DATE_DIN_DMMMMYYYY, // NF_DATE_DIN_DMMMMYYYY
- ZF_STANDARD_NEWEXTENDED_DATE_SYS_NNDMMMYY, // NF_DATE_SYS_NNDMMMYY
+ ZF_STANDARD_DATE_SYS_DMMMYYYY, // NF_DATE_SYS_DMMMYYYY
+ ZF_STANDARD_DATE_DIN_DMMMYYYY, // NF_DATE_DIN_DMMMYYYY
+ ZF_STANDARD_DATE_SYS_DMMMMYYYY, // NF_DATE_SYS_DMMMMYYYY
+ ZF_STANDARD_DATE_DIN_DMMMMYYYY, // NF_DATE_DIN_DMMMMYYYY
+ ZF_STANDARD_DATE_SYS_NNDMMMYY, // NF_DATE_SYS_NNDMMMYY
ZF_STANDARD_DATE + 1, // NF_DATE_DEF_NNDDMMMYY
- ZF_STANDARD_NEWEXTENDED_DATE_SYS_NNDMMMMYYYY, // NF_DATE_SYS_NNDMMMMYYYY
- ZF_STANDARD_NEWEXTENDED_DATE_SYS_NNNNDMMMMYYYY, //
NF_DATE_SYS_NNNNDMMMMYYYY
- ZF_STANDARD_NEWEXTENDED_DATE_DIN_MMDD, // NF_DATE_DIN_MMDD
- ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYMMDD, // NF_DATE_DIN_YYMMDD
- ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYYYMMDD, // NF_DATE_DIN_YYYYMMDD
+ ZF_STANDARD_DATE_SYS_NNDMMMMYYYY, // NF_DATE_SYS_NNDMMMMYYYY
+ ZF_STANDARD_DATE_SYS_NNNNDMMMMYYYY, // NF_DATE_SYS_NNNNDMMMMYYYY
+ ZF_STANDARD_DATE_DIN_MMDD, // NF_DATE_DIN_MMDD
+ ZF_STANDARD_DATE_DIN_YYMMDD, // NF_DATE_DIN_YYMMDD
+ ZF_STANDARD_DATE_DIN_YYYYMMDD, // NF_DATE_DIN_YYYYMMDD
ZF_STANDARD_DATE + 2, // NF_DATE_SYS_MMYY
ZF_STANDARD_DATE + 3, // NF_DATE_SYS_DDMMM
ZF_STANDARD_DATE + 4, // NF_DATE_MMMM
ZF_STANDARD_DATE + 5, // NF_DATE_QQJJ
- ZF_STANDARD_NEWEXTENDED_DATE_WW, // NF_DATE_WW
+ ZF_STANDARD_DATE_WW, // NF_DATE_WW
ZF_STANDARD_TIME, // NF_TIME_HHMM
ZF_STANDARD_TIME + 1, // NF_TIME_HHMMSS
ZF_STANDARD_TIME + 2, // NF_TIME_HHMMAMPM
@@ -2768,54 +2767,54 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32
CLOffset, bool bNoAdditio
// D. MMM YYYY def/System
nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_SYS_DMMMYYYY );
ImpInsertFormat( aFormatSeq[nIdx],
- CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_SYS_DMMMYYYY /*
NF_DATE_SYS_DMMMYYYY */ );
+ CLOffset + ZF_STANDARD_DATE_SYS_DMMMYYYY /*
NF_DATE_SYS_DMMMYYYY */ );
// D. MMMM YYYY def/System
nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_SYS_DMMMMYYYY );
ImpInsertFormat( aFormatSeq[nIdx],
- CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_SYS_DMMMMYYYY /*
NF_DATE_SYS_DMMMMYYYY */ );
+ CLOffset + ZF_STANDARD_DATE_SYS_DMMMMYYYY /*
NF_DATE_SYS_DMMMMYYYY */ );
// NN, D. MMM YY def/System
nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_SYS_NNDMMMYY );
ImpInsertFormat( aFormatSeq[nIdx],
- CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_SYS_NNDMMMYY /*
NF_DATE_SYS_NNDMMMYY */ );
+ CLOffset + ZF_STANDARD_DATE_SYS_NNDMMMYY /*
NF_DATE_SYS_NNDMMMYY */ );
// NN, D. MMMM YYYY def/System
nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_SYS_NNDMMMMYYYY );
ImpInsertFormat( aFormatSeq[nIdx],
- CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_SYS_NNDMMMMYYYY
/* NF_DATE_SYS_NNDMMMMYYYY */ );
+ CLOffset + ZF_STANDARD_DATE_SYS_NNDMMMMYYYY /*
NF_DATE_SYS_NNDMMMMYYYY */ );
// NNN, D. MMMM YYYY def/System
nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_SYS_NNNNDMMMMYYYY );
ImpInsertFormat( aFormatSeq[nIdx],
- CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_SYS_NNNNDMMMMYYYY
/* NF_DATE_SYS_NNNNDMMMMYYYY */ );
+ CLOffset + ZF_STANDARD_DATE_SYS_NNNNDMMMMYYYY /*
NF_DATE_SYS_NNNNDMMMMYYYY */ );
// Hard coded DIN (Deutsche Industrie Norm) and EN (European Norm) date
formats
// D. MMM. YYYY DIN/EN
nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_DIN_DMMMYYYY );
ImpInsertFormat( aFormatSeq[nIdx],
- CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_DIN_DMMMYYYY /*
NF_DATE_DIN_DMMMYYYY */ );
+ CLOffset + ZF_STANDARD_DATE_DIN_DMMMYYYY /*
NF_DATE_DIN_DMMMYYYY */ );
// D. MMMM YYYY DIN/EN
nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_DIN_DMMMMYYYY );
ImpInsertFormat( aFormatSeq[nIdx],
- CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_DIN_DMMMMYYYY /*
NF_DATE_DIN_DMMMMYYYY */ );
+ CLOffset + ZF_STANDARD_DATE_DIN_DMMMMYYYY /*
NF_DATE_DIN_DMMMMYYYY */ );
// MM-DD DIN/EN
nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_DIN_MMDD );
ImpInsertFormat( aFormatSeq[nIdx],
- CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_DIN_MMDD /*
NF_DATE_DIN_MMDD */ );
+ CLOffset + ZF_STANDARD_DATE_DIN_MMDD /* NF_DATE_DIN_MMDD
*/ );
// YY-MM-DD DIN/EN
nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_DIN_YYMMDD );
ImpInsertFormat( aFormatSeq[nIdx],
- CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYMMDD /*
NF_DATE_DIN_YYMMDD */ );
+ CLOffset + ZF_STANDARD_DATE_DIN_YYMMDD /*
NF_DATE_DIN_YYMMDD */ );
// YYYY-MM-DD DIN/EN/ISO
nIdx = ImpGetFormatCodeIndex( aFormatSeq, NF_DATE_DIN_YYYYMMDD );
ImpInsertFormat( aFormatSeq[nIdx],
- CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYYYMMDD /*
NF_DATE_DIN_YYYYMMDD */ );
+ CLOffset + ZF_STANDARD_DATE_DIN_YYYYMMDD /*
NF_DATE_DIN_YYYYMMDD */ );
// Time
@@ -3004,7 +3003,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32
CLOffset, bool bNoAdditio
// Week of year
aSingleFormatCode.Code = rKeyword[NF_KEY_WW];
ImpInsertFormat( aSingleFormatCode,
- CLOffset + ZF_STANDARD_NEWEXTENDED_DATE_WW /* NF_DATE_WW
*/ );
+ CLOffset + ZF_STANDARD_DATE_WW /* NF_DATE_WW */ );
// Now all additional format codes provided by I18N, but only if not
// changing SystemCL, then they are appended last after user defined.
