summaryrefslogtreecommitdiff
path: root/include/i18npool
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2020-02-22 18:52:06 +0100
committerEike Rathke <erack@redhat.com>2020-02-22 20:17:54 +0100
commit8453f6e5d1fd98700a37e30346a1af0daf8fb753 (patch)
tree9d5ee1a300bc922dd4c577365e598a2e7a814218 /include/i18npool
parent3ac9f491c20fb56c4544444d876687dd6d8de231 (diff)
Resolves: tdf#130563 Add predefined 4-digit year date+time format
Add a predefined NF_DATETIME_SYS_DDMMYYYY_HHMM format code with formatindex="50" to all locale data files, which shifts all reserved area internally generated built-in formats up by one. Reserved area was filled already so that boundary has to be increased as well. Add some flexibility for future additions by setting the new boundary to 65, free first format index to be used by additional locale data formats is 66 now. Adapt all locales to the new boundary. The existing predefined NF_DATETIME_SYSTEM_SHORT_HHMM format code with formatindex="46" mostly was and is used with 2-digit years (stemming back from the old binary format and Excel compatibility), some locales that don't use 2-digit years at all already defined it to 4-digit years. Keep those but move the default="true" attribute (if so) to the new "50" format. Modify populating the format list such that resulting duplicates will be suppressed there as well. Also try to match the new format in ODF import if a long year was requested with date+time. Finally set the new format as default for all *_IT locales. In future changing the default date+time format to 4-digit year is just a matter of moving the default="true" attribute to the new format. Change-Id: Ib16aa9fda0e71b2d03f78e3dd013785de03cd288 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89265 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
Diffstat (limited to 'include/i18npool')
-rw-r--r--include/i18npool/reservedconstants.hxx12
1 files changed, 10 insertions, 2 deletions
diff --git a/include/i18npool/reservedconstants.hxx b/include/i18npool/reservedconstants.hxx
index 400344ce5a8d..6f707f83ac3d 100644
--- a/include/i18npool/reservedconstants.hxx
+++ b/include/i18npool/reservedconstants.hxx
@@ -12,10 +12,18 @@
/** Constant values shared between i18npool and, for example, the number formatter. */
namespace i18npool
{
+/** The number of predefined format code indices that must be defined by
+ locale data, except BOOLEAN and TEXT, exclusive.
+ This later in the build is static asserted to be equal to
+ NfIndexTableOffset::NF_INDEX_TABLE_RESERVED_START. */
+constexpr sal_Int16 nStopPredefinedFormatIndex = 51;
+
/** The number of reserved (with defined meaning) built-in format code indices,
additional locale data format codes can be defined starting at this index
- value. */
-constexpr sal_Int16 nFirstFreeFormatIndex = 60;
+ value.
+ This later in the build is static asserted to be greater or equal to
+ NfIndexTableOffset::NF_INDEX_TABLE_ENTRIES */
+constexpr sal_Int16 nFirstFreeFormatIndex = 66;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */