some changes for new fixed fraction built-in formats

Moved new fixed fraction built-in formats into the fixed set so they keep
their relative key position when switching system locale.

2 files changed, 23 insertions, 10 deletions

diff --git a/svl/inc/svl/nfversi.hxx b/svl/inc/svl/nfversi.hxx
index bd1fd3f740c2..65fe52111dc7 100644
--- a/svl/inc/svl/nfversi.hxx
+++ b/svl/inc/svl/nfversi.hxx
@@ -31,19 +31,20 @@
 
 //      file IDs
 
-#define SV_NUMBERFORMATTER_VERSION_SYSTORE      0x0004
-#define SV_NUMBERFORMATTER_VERSION_KEYWORDS     0x0005
-#define SV_NUMBERFORMATTER_VERSION_NEWSTANDARD  0x0006
-#define SV_NUMBERFORMATTER_VERSION_NF_TIME_HH_MMSS00    0x0007
-#define SV_NUMBERFORMATTER_VERSION_NF_DATE_WW   0x0008
-#define SV_NUMBERFORMATTER_VERSION_NEW_CURR     0x0009
-#define SV_NUMBERFORMATTER_VERSION_YEAR2000     0x000a
-#define SV_NUMBERFORMATTER_VERSION_TWODIGITYEAR 0x000b
+#define SV_NUMBERFORMATTER_VERSION_SYSTORE                  0x0004
+#define SV_NUMBERFORMATTER_VERSION_KEYWORDS                 0x0005
+#define SV_NUMBERFORMATTER_VERSION_NEWSTANDARD              0x0006
+#define SV_NUMBERFORMATTER_VERSION_NF_TIME_HH_MMSS00        0x0007
+#define SV_NUMBERFORMATTER_VERSION_NF_DATE_WW               0x0008
+#define SV_NUMBERFORMATTER_VERSION_NEW_CURR                 0x0009
+#define SV_NUMBERFORMATTER_VERSION_YEAR2000                 0x000a
+#define SV_NUMBERFORMATTER_VERSION_TWODIGITYEAR             0x000b
 #define SV_NUMBERFORMATTER_VERSION_NF_DATETIME_SYS_DDMMYYYY_HHMMSS  0x000c
-#define SV_NUMBERFORMATTER_VERSION_CALENDAR     0x000d
+#define SV_NUMBERFORMATTER_VERSION_CALENDAR                 0x000d
 #define SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS  0x000e
+#define SV_NUMBERFORMATTER_VERSION_FIXED_FRACTION           0x000f
 
-#define SV_NUMBERFORMATTER_VERSION              0x000e
+#define SV_NUMBERFORMATTER_VERSION                          0x000f
 
 // 1 to 1996-01-18
 // 2    1996-01-19 added TT.MM.JJJJ
@@ -64,6 +65,8 @@
 // C    ????-??-?? date/time format of system variables
 // D    2000-11-23 new calendar
 // E    2001-01-19 additional formats provided by i18n
+// F    2012-04-27 fixed fraction formats ?/4 and ??/100, actually added
+//                  already 2010/2011 but without versioning
 
 #endif
 
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index fd3a7b913ff1..96a8955936e5 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -101,6 +101,9 @@ namespace rtl {
     <li>DIN: all settings hard coded as DIN (Deutsche Industrie Norm) and EN (European Norm) require.
     <li>all other: hard coded
     </ul>
+
+    Do NOT insert any new values!
+    The values here correspond with those in offapi/com/sun/star/i18n/NumberFormatIndex.idl
  */
 enum NfIndexTableOffset
 {
@@ -182,6 +185,13 @@ enum NfIndexTableOffset
 
     NF_BOOLEAN,                             // BOOLEAN
     NF_TEXT,                                // @
+
+    // From here on are values of new built-in formats that are not in the
+    // original NumberFormatIndex.idl
+
+    NF_FRACTION_3,                          // # ?/4
+    NF_FRACTION_4,                          // # ?/100
+
     NF_INDEX_TABLE_ENTRIES
 };