diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 840a0720d86c..690bfebf204f 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -709,6 +709,10 @@ void LCFormatNode::generateCode (const OFileWriter &of) const
aFormatIndex = currNodeAttr.getValueByName("formatindex");
sal_Int16 formatindex = (sal_Int16)aFormatIndex.toInt32();
+ // Ensure the new reserved range is not used anymore, free usage start
+ // was up'ed from 50 to 60.
+ if (50 <= formatindex && formatindex < 60)
+ incErrorInt( "Error: Reserved formatindex=\"%d\" in FormatElement, free usage starts at 60.\n", formatindex);
if (!aFormatIndexSet.insert( formatindex).second)
incErrorInt( "Error: Duplicated formatindex=\"%d\" in FormatElement.\n", formatindex);
of.writeIntParameter("Formatindex", formatCount, formatindex);
diff --git a/i18npool/source/localedata/data/ar_DZ.xml b/i18npool/source/localedata/data/ar_DZ.xml
index 3116c846bac0..16362ced8c01 100644
--- a/i18npool/source/localedata/data/ar_DZ.xml
+++ b/i18npool/source/localedata/data/ar_DZ.xml
@@ -195,16 +195,16 @@
[NatNum1][~hijri]AM/PMHH:MM YYYY/MM/D
-
+
AM/PMHH:MM YYYY/MM/D
-
+
[NatNum1]AM/PMHH:MM YYYY/MM/D
-
+
[NatNum1]YYYY/MM/DD
-
+
[NatNum1]General
diff --git a/i18npool/source/localedata/data/ar_EG.xml b/i18npool/source/localedata/data/ar_EG.xml
index 0d0ea2f9bec6..4dfe9bec8ff1 100644
--- a/i18npool/source/localedata/data/ar_EG.xml
+++ b/i18npool/source/localedata/data/ar_EG.xml
@@ -195,16 +195,16 @@
[NatNum1][~hijri]AM/PMHH:MM YYYY/MM/D
-
+
AM/PMHH:MM YYYY/MM/D
-
+
[NatNum1]AM/PMHH:MM YYYY/MM/D
-
+
[NatNum1]YYYY/MM/DD
-
+
[NatNum1]General
diff --git a/i18npool/source/localedata/data/ar_OM.xml b/i18npool/source/localedata/data/ar_OM.xml
index 99c95748cba9..51a9eceb1a3d 100644
--- a/i18npool/source/localedata/data/ar_OM.xml
+++ b/i18npool/source/localedata/data/ar_OM.xml
@@ -195,7 +195,7 @@
DD/MM/YYYY HH:MM:SS AM/PM
-
+
[NatNum1]General
diff --git a/i18npool/source/localedata/data/bo_CN.xml b/i18npool/source/localedata/data/bo_CN.xml
index 3e7d79426f6e..ba01d817d226 100644
--- a/i18npool/source/localedata/data/bo_CN.xml
+++ b/i18npool/source/localedata/data/bo_CN.xml
@@ -164,19 +164,19 @@
[NatNum1]#,###.00
-
+
0
-
+
0.00
-
+
#,##0
-
+
#,##0.00
-
+
#,###.00
@@ -205,10 +205,10 @@
[NatNum1]0.00%
-
+
0%
-
+
0.00%
@@ -217,7 +217,7 @@
0.00E+00
-
+
[NatNum1]0.00E+00
diff --git a/i18npool/source/localedata/data/bo_IN.xml b/i18npool/source/localedata/data/bo_IN.xml
index 53e76f5c7485..b1dd81824776 100644
--- a/i18npool/source/localedata/data/bo_IN.xml
+++ b/i18npool/source/localedata/data/bo_IN.xml
@@ -164,19 +164,19 @@
[NatNum1]#,###.00
-
+
0
-
+
0.00
-
+
#,##0
-
+
#,##0.00
-
+
#,###.00
@@ -204,10 +204,10 @@
[NatNum1]0.00%
-
+
0%
-
+
0.00%
@@ -216,7 +216,7 @@
0.00E+00
-
+
[NatNum1]0.00E+00
diff --git a/i18npool/source/localedata/data/cu_RU.xml b/i18npool/source/localedata/data/cu_RU.xml
index fd28ddfeeeab..0d580af0fbf3 100644
--- a/i18npool/source/localedata/data/cu_RU.xml
+++ b/i18npool/source/localedata/data/cu_RU.xml
@@ -73,7 +73,7 @@
# ###,00
-
+
[NatNum1]0;-0
diff --git a/i18npool/source/localedata/data/dz_BT.xml b/i18npool/source/localedata/data/dz_BT.xml
index d85b1ae42bbf..0f6a0673746b 100644
--- a/i18npool/source/localedata/data/dz_BT.xml
+++ b/i18npool/source/localedata/data/dz_BT.xml
@@ -164,19 +164,19 @@
[NatNum1]#,###.00
-
+
0
-
+
0.00
-
+
#,##0
-
+
#,##0.00
-
+
#,###.00
@@ -197,22 +197,22 @@
[NatNum1][CURRENCY]#,##0.--;[NatNum1][RED]-[CURRENCY]#,##0.--
-
+
[CURRENCY]#,##0;-[CURRENCY]#,##0
-
+
[CURRENCY]#,##0.00;-[CURRENCY]#,##0.00
-
+
[CURRENCY]#,##0;[RED]-[CURRENCY]#,##0
-
+
[CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00
-
+
#,##0.00 CCC
-
+
[CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--
@@ -222,10 +222,10 @@
[NatNum1]0.00%
-
+
0%
-
+
0.00%
@@ -234,7 +234,7 @@
0.00E+00
-
+
[NatNum1]0.00E+00
diff --git a/i18npool/source/localedata/data/en_US.xml b/i18npool/source/localedata/data/en_US.xml
index b1cd3336d6a5..c765bc5a63cc 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -71,10 +71,10 @@
#,###.00
-
+
#,##0_);(#,##0)
-
+
#,##0.00_);(#,##0.00)
@@ -110,10 +110,10 @@
[CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--
-
+
[CURRENCY]* #,##0;-[CURRENCY]* #,##0
-
+
[CURRENCY]* #,##0.00;-[CURRENCY]* #,##0.00
@@ -209,34 +209,34 @@
-
+
[~jewish]NNNND MMMM YYYY
-
+
[~jewish]NNNNMMMM D YYYY
-
+
[~jewish]NN MMMM D YYYY
-
+
[~jewish]NN D MMMM YYYY
-
+
[~jewish]D MMMM YYYY
-
+
[~jewish]MMMM D YYYY
-
+
[~jewish]D MMMM
-
+
[~jewish]MMMM D
-
+
[~jewish]MMMM YYYY
-
+
[~jewish]MMMM
diff --git a/i18npool/source/localedata/data/he_IL.xml b/i18npool/source/localedata/data/he_IL.xml
index 3dc0c7c4e21c..541bfe8719c3 100644
--- a/i18npool/source/localedata/data/he_IL.xml
+++ b/i18npool/source/localedata/data/he_IL.xml
@@ -117,13 +117,13 @@
WW
-
+
[NatNum2][~jewish]YY
-
+
[NatNum2][~jewish]NNN DD MMMM YY
-
+
[NatNum2][~jewish]"יום "NN"׳ "DD MMMM YY
diff --git a/i18npool/source/localedata/data/hr_HR.xml b/i18npool/source/localedata/data/hr_HR.xml
index e51dfc29e1de..b54594db88af 100644
--- a/i18npool/source/localedata/data/hr_HR.xml
+++ b/i18npool/source/localedata/data/hr_HR.xml
@@ -198,16 +198,16 @@
DD.MM.YYYY HH:MM:SS AM/PM
-
+
#.##0,00;[RED]-#.##0,00
-
+
#.###,00;[RED]-#.###,00
-
+
DD. MM. YYYY.
-
+
MM/YY
diff --git a/i18npool/source/localedata/data/ja_JP.xml b/i18npool/source/localedata/data/ja_JP.xml
index 5ecd321ed21f..7d7526062799 100644
--- a/i18npool/source/localedata/data/ja_JP.xml
+++ b/i18npool/source/localedata/data/ja_JP.xml
@@ -195,10 +195,10 @@
[HH]:MM:SS.00
-
+
H時MM分
-
+
H時MM分SS秒
@@ -207,10 +207,10 @@
YYYY/M/D H:MM:SS
-
+
YYYY/M/D H:MM
-
+
GE.MM.DD
diff --git a/i18npool/source/localedata/data/km_KH.xml b/i18npool/source/localedata/data/km_KH.xml
index 6bdbce72c09d..61195ea91c7a 100644
--- a/i18npool/source/localedata/data/km_KH.xml
+++ b/i18npool/source/localedata/data/km_KH.xml
@@ -71,13 +71,13 @@
#.###,00
-
+
[NatNum1]0
-
+
[NatNum1]0,00
-
+
[NatNum1]#.###,00
@@ -89,10 +89,10 @@
##0,00E+00
-
+
[NatNum1]0%
-
+
[NatNum1]0,00%
@@ -119,13 +119,13 @@
#.##0[CURRENCY].--;[RED]-#.##0[CURRENCY].--
-
+
[NatNum1]#.##0[CURRENCY];-#.##0[CURRENCY]
-
+
[NatNum1]#.##0[CURRENCY].--;[RED]-#.##0[CURRENCY].--
-
+
[NatNum1]#.##0,00[CURRENCY];[RED]-#.##0,00[CURRENCY]
diff --git a/i18npool/source/localedata/data/ko_KR.xml b/i18npool/source/localedata/data/ko_KR.xml
index 8c3f8307685a..cf3ad3e4d812 100644
--- a/i18npool/source/localedata/data/ko_KR.xml
+++ b/i18npool/source/localedata/data/ko_KR.xml
@@ -77,7 +77,7 @@
0.00E+00
-
+
##0.00E+00
@@ -168,88 +168,88 @@
"제"WW"주"
-
+
YYYY"년" M"월"
-
+
YYYY"년도 제"Q"사분기"
-
+
YY"年" M"月"
-
+
YYYY"年" M"月"
-
+
[NatNum1]YYYY"年度 第"QQ"四分期"
-
+
[NatNum1]YY"年度 第"QQ"四分期"
-
+
M"月"
-
+
"第"WW"週"
-
+
YY-M
-
+
YYYY-M
-
+
YY/M/D NNNN
-
+
YYYY/M/D NNNN
-
+
YY/M
-
+
M/D
-
+
YYYY. M. D.
-
+
YYYY. M. D. (NN)
-
+
YYYY. M. D. NNNN
-
+
[~hanja]YYYY. M. D. (NN)
-
+
[~hanja]YYYY. M. D. NNNN
-
+
YY. M. D.
-
+
YY. M. D. (NN)
-
+
YY. M. D. NNNN
-
+
[~hanja]YY. M. D. (NN)
-
+
[~hanja]YY. M. D. NNNN
-
+
YY"년" M"월" D"일" (NN)
-
+
YYYY"년" M"월" D"일" (NN)
-
+
[~hanja]YYYY"年" M"月" D"日" (NN)
-
+
[~hanja]YY"年" M"月" D"日" (NN)
@@ -273,28 +273,28 @@
[H]:M:S.00
-
+
H"時" M"分"
-
+
H:M
-
+
H"時" M"分" S"秒"
-
+
H:M:S
-
+
[~hanja]AM/PM H"時" M"分" S"秒"
-
+
AM/PM H:M:S
-
+
[~hanja]AM/PM H"時" M"分"
-
+
AM/PM H:M
@@ -303,19 +303,19 @@
YYYY. M. D. H:M:S
-
+
YYYY"년" M"월" D"일" H"시" M"분" S"초"
-
+
YY"年" M"月" D"日" H"時" M"分" S"秒"
-
+
YY/M/D H:M
-
+
YY. M. D. H:M
-
+
YYYY"年" M"月" D"日" H"時" M"分" S"秒"
diff --git a/i18npool/source/localedata/data/lo_LA.xml b/i18npool/source/localedata/data/lo_LA.xml
index 5bea07457bff..f9a9260e36c1 100644
--- a/i18npool/source/localedata/data/lo_LA.xml
+++ b/i18npool/source/localedata/data/lo_LA.xml
@@ -168,7 +168,7 @@
WW
-
+
NNNN "ວັນທີ" DD "ເດືອນ" MMMM "ປີ" YYYY
diff --git a/i18npool/source/localedata/data/locale.dtd b/i18npool/source/localedata/data/locale.dtd
index 99f07780cf90..2898ee4bb04e 100644
--- a/i18npool/source/localedata/data/locale.dtd
+++ b/i18npool/source/localedata/data/locale.dtd
@@ -205,8 +205,8 @@
The following FormatElements must follow specific rules:
All:
- The format indices 0..49 are reserved and, for backwards compatibility,
- MUST be used as stated in
+ The format indices 0..59 are reserved and, for backwards compatibility,
+ indices 0..49 MUST be used as stated in
offapi/com/sun/star/i18n/NumberFormatIndex.idl (
http://opengrok.libreoffice.org/xref/core/offapi/com/sun/star/i18n/NumberFormatIndex.idl )
Note that indices 10 ("# ?/?"), 11 ("# ??/??"), 48 (BOOLEAN) and 49 (@
@@ -236,7 +236,7 @@
If you want to define yet more formats than the preset and reserved
0..49 range that's fine, only make sure those formatindex="..." values
- are each >=50 and all values are unique within one locale.
+ are each >=60 and all values are unique within one locale.
Of usage="FIXED_NUMBER":
formatindex="0" MUST be the format containing the 'General' keyword.
diff --git a/i18npool/source/localedata/data/lt_LT.xml b/i18npool/source/localedata/data/lt_LT.xml
index c5a532384030..345c5d3e4335 100644
--- a/i18npool/source/localedata/data/lt_LT.xml
+++ b/i18npool/source/localedata/data/lt_LT.xml
@@ -169,7 +169,7 @@
WW
-
+
YYYY MMMM DD NN
@@ -193,19 +193,19 @@
[HH]:MM:SS,00
-
+
H"."MM "val."
-
+
H "val." M "min."
-
+
H "val." MM "min." SS "sek."
-
+
H "h" M "min"
-
+
H "h" M "min" S "s"
diff --git a/i18npool/source/localedata/data/my_MM.xml b/i18npool/source/localedata/data/my_MM.xml
index b48e4eedbcb0..c78b9497e71a 100644
--- a/i18npool/source/localedata/data/my_MM.xml
+++ b/i18npool/source/localedata/data/my_MM.xml
@@ -71,22 +71,22 @@
[NatNum1]#,###.00
-
+
General
-
+
0
-
+
0.00
-
+
#,##0
-
+
#,##0.00
-
+
#,###.00
@@ -98,10 +98,10 @@
##0.00E+00
-
+
[NatNum1]0%
-
+
[NatNum1]0.00%
@@ -128,13 +128,13 @@
[CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--
-
+
[NatNum1]#,##0[CURRENCY];[NatNum1]-#,##0[CURRENCY]
-
+
[NatNum1]#,##0 [CURRENCY];[NatNum1]-#,##0 [CURRENCY]
-
+
[NatNum1]#,##0 [CURRENCY];[RED][NatNum1]-#,##0 [CURRENCY]
@@ -201,31 +201,31 @@
WW
-
+
[NatNum1]DD/MM/YY
-
+
[NatNum1]D/M/YY
-
+
[NatNum1]DD/MM/YYYY
-
+
[NatNum1]DD-MM-YYYY
-
+
[NatNum1]D. MMM. YYYY
-
+
[NatNum1]D. MMMM YYYY
-
+
[NatNum1]NNN၊ MMMM D၊ YYYY
-
+
[NatNum1]MMMM D
-
+
[NatNum1]YYYYခုနှစ်၊ MMMMလ Dရက် NNNနေ့
@@ -249,13 +249,13 @@
[HH]:MM:SS.00
-
+
[NatNum1]HH:MM
-
+
[NatNum1]HH:MM:SS
-
+
[NatNum1]HHနာရီ MMမိနစ်
@@ -264,7 +264,7 @@
DD/MM/YYYY HH:MM:SS
-
+
[NatNum1]DD/MM/YYYY HH:MM:SS
diff --git a/i18npool/source/localedata/data/pl_PL.xml b/i18npool/source/localedata/data/pl_PL.xml
index c8d2dbc1d62b..b05b213efcfa 100644
--- a/i18npool/source/localedata/data/pl_PL.xml
+++ b/i18npool/source/localedata/data/pl_PL.xml
@@ -195,7 +195,7 @@
YYYY-MM-DD HH:MM:SS
-
+
YYYY-MM-DD HH:MM
diff --git a/i18npool/source/localedata/data/pt_PT.xml b/i18npool/source/localedata/data/pt_PT.xml
index a28c64282dae..a8bb011a15bf 100644
--- a/i18npool/source/localedata/data/pt_PT.xml
+++ b/i18npool/source/localedata/data/pt_PT.xml
@@ -117,43 +117,43 @@
WW
-
+
QQ "de" AAAA
-
+
Q "de" AA
-
+
Q "de" AAAA
-
+
DD-MMM-AA
-
+
DD-MMM-AAAA
-
+
MMMM-AAAA
-
+
MMM-AAAA
-
+
MMMM-AA
-
+
MMM-AA
-
+
D-MMMM-AAAA
-
+
D-MMMM-AA
-
+
MMMM "de" AAAA
-
+
MMM "de" AAAA
@@ -183,7 +183,7 @@
DD-MM-AAAA HH:MM:SS
-
+
AAAA-MM-DD HH:MM
diff --git a/i18npool/source/localedata/data/th_TH.xml b/i18npool/source/localedata/data/th_TH.xml
index 50051441e2b1..a3a94e02c120 100644
--- a/i18npool/source/localedata/data/th_TH.xml
+++ b/i18npool/source/localedata/data/th_TH.xml
@@ -192,115 +192,115 @@
0.00E+00
-
+
##0.00E+00
-
+
[~buddhist]DD/MM/YY
-
+
[~buddhist]DD/MM/YYYY
-
+
[~buddhist]DD/MM/YY HH:MM
-
+
[~buddhist]DD/MM/YYYY HH:MM:SS
-
+
D/M/YY
-
+
D MMM YY
-
+
[NatNum1][~buddhist]D/M/YY
-
+
[NatNum1][~buddhist]DD/MM/YY
-
+
[NatNum1][~buddhist]DD/MM/YYYY
-
+
[NatNum1][~buddhist]D MMM YY
-
+
[NatNum1][~buddhist]NN D MMM YY
-
+
[NatNum1][~buddhist]D MMM YYYY
-
+
[NatNum1][~buddhist]D MMMM YYYY
-
+
[NatNum1][~buddhist]NN D MMMM YYYY
-
+
[NatNum1][~buddhist]วันNNNNที่ D MMMM GG YYYY
-
+
[NatNum1][~buddhist]วันNNNNที่ D MMMM YYYY
-
+
[NatNum1][~buddhist]DD/MM/YY HH:MM
-
+
[NatNum1][~buddhist]DD/MM/YYYY HH:MM:SS
-
+
[NatNum1]HH:MM
-
+
[NatNum1]HH:MM:SS
-
+
[NatNum1]0%
-
+
[NatNum1]0.00%
-
+
[NatNum1]Standard
-
+
[NatNum1]0
-
+
[NatNum1]0.00
-
+
[NatNum1]#,##0
-
+
[NatNum1]#,##0.00
-
+
[NatNum1]#,###.00
-
+
#,##0 [$บาท-41E];-#,##0 [$บาท-41E]
-
+
#,##0.00 [$บาท-41E];-#,##0.00 [$บาท-41E]
-
+
#,##0 [$บาท-41E];[RED]-#,##0 [$บาท-41E]
-
+
#,##0.00 [$บาท-41E];[RED]-#,##0.00 [$บาท-41E]
-
+
[NatNum1]#,##0 [$บาท-41E];[NatNum1]-#,##0 [$บาท-41E]
-
+
[NatNum1]#,##0.00 [$บาท-41E];[NatNum1]-#,##0.00 [$บาท-41E]
-
+
[NatNum1]#,##0 [$บาท-41E];[NatNum1][RED]-#,##0 [$บาท-41E]
-
+
[NatNum1]#,##0.00 [$บาท-41E];[NatNum1][RED]-#,##0.00 [$บาท-41E]
diff --git a/i18npool/source/localedata/data/tr_TR.xml b/i18npool/source/localedata/data/tr_TR.xml
index 04b840a7350e..a1b9ba901606 100644
--- a/i18npool/source/localedata/data/tr_TR.xml
+++ b/i18npool/source/localedata/data/tr_TR.xml
@@ -199,16 +199,16 @@
DD.MM.YYYY HH:MM:SS
-
+
DD/MM/YYYY
-
+
DD/MM/YY
-
+
DD/MMM/YYYY
-
+
DD/MM/YYYY HH:MM:SS
diff --git a/i18npool/source/localedata/data/zh_CN.xml b/i18npool/source/localedata/data/zh_CN.xml
index d5bf09dc659c..0a159324c817 100644
--- a/i18npool/source/localedata/data/zh_CN.xml
+++ b/i18npool/source/localedata/data/zh_CN.xml
@@ -202,25 +202,25 @@
[HH]:MM:SS.00
-
+
HH"时"MM"分"
-
+
HH"时"MM"分"SS"秒"
-
+
AM/PM HH"时"MM"分"
-
+
AM/PM HH"时"MM"分"SS"秒"
-
+
[HH]"时"MM"分"SS"秒"
-
+
MM"分"SS"秒"00
-
+
[HH]"时"MM"分"SS"秒"00
@@ -230,10 +230,10 @@
YYYY/MM/DD HH:MM:SS
-
+
M/D/YY HH:MM
-
+
MM/DD/YYYY HH:MM:SS
diff --git a/i18npool/source/localedata/data/zh_HK.xml b/i18npool/source/localedata/data/zh_HK.xml
index 1d99909bc16a..ade663f6b3de 100644
--- a/i18npool/source/localedata/data/zh_HK.xml
+++ b/i18npool/source/localedata/data/zh_HK.xml
@@ -174,22 +174,22 @@
[HH]:MM:SS.00
-
+
HH"時"MM"分"
-
+
HH"時"MM"分"SS"秒"
-
+
AM/PM HH"時"MM"分"
-
+
AM/PM HH"時"MM"分"SS"秒"
-
+
[HH] "時"MM"分"SS"秒"
-
+
MM"分"SS"秒"00
@@ -200,10 +200,10 @@
DD/MM/YYYY HH:MM:SS
-
+
YY"年"M"月"D"日" HH"時"MM"分"SS"秒"
-
+
D/M/YY HH:MM
diff --git a/i18npool/source/localedata/data/zh_MO.xml b/i18npool/source/localedata/data/zh_MO.xml
index 120f3249b288..055136725050 100644
--- a/i18npool/source/localedata/data/zh_MO.xml
+++ b/i18npool/source/localedata/data/zh_MO.xml
@@ -173,22 +173,22 @@
[HH]:MM:SS.00
-
+
HH"時"MM"分"
-
+
HH"時"MM"分"SS"秒"
-
+
AM/PM HH"時"MM"分"
-
+
AM/PM HH"時"MM"分"SS"秒"
-
+
[HH] "時"MM"分"SS"秒"
-
+
MM"分"SS"秒"00
@@ -198,13 +198,13 @@
DD/MM/YYYY HH:MM:SS
-
+
YYYY"年"M"月"D"日" HH"時"MM"分"SS"秒"
-
+
YY"年"M"月"D"日" HH"時"MM"分"SS"秒"
-
+
D-M-YYYY
diff --git a/i18npool/source/localedata/data/zh_SG.xml b/i18npool/source/localedata/data/zh_SG.xml
index 062e3de5381d..b2f33c39345b 100644
--- a/i18npool/source/localedata/data/zh_SG.xml
+++ b/i18npool/source/localedata/data/zh_SG.xml
@@ -173,25 +173,25 @@
[HH]:MM:SS.00
-
+
HH"时"MM"分"
-
+
HH"时"MM"分"SS"秒"
-
+
AM/PM HH"时"MM"分"
-
+
AM/PM HH"时"MM"分"SS"秒"
-
+
[HH]"时"MM"分"SS"秒"
-
+