#125264# add support for ca-XR similar to ca-XV, UI support only

i18npool/inc/i18npool/lang.h

@@ -459,6 +459,7 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_GASCON                0x0636  /* Gascon France */
 #define LANGUAGE_USER_GERMAN_BELGIUM        0x8007  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_GERMAN)) */
 #define LANGUAGE_USER_CATALAN_VALENCIAN     0x8003  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_CATALAN)) */
+#define LANGUAGE_USER_CATALAN_VALENCIAN_RACV     0x8004  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_CATALAN)) */
 #define LANGUAGE_USER_HAUSA_GHANA           0x8068  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_HAUSA_NIGERIA)) */
 #define LANGUAGE_USER_EWE_GHANA             0x0637
 #define LANGUAGE_USER_ENGLISH_GHANA         0x8409  /* makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_ENGLISH_US)) */

i18npool/source/isolang/isolang.cxx

@@ -283,7 +283,8 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
     { LANGUAGE_BELARUSIAN,                  "be", "BY" },
     { LANGUAGE_CATALAN,                     "ca", "ES" },   // Spain (default)
     { LANGUAGE_CATALAN,                     "ca", "AD" },   // Andorra
-    { LANGUAGE_USER_CATALAN_VALENCIAN,                     "ca", "XV" },   // XV: ISO 3166 user-assigned; workaround for UI localization only, do not use in document content!
+    { LANGUAGE_USER_CATALAN_VALENCIAN_RACV, "ca", "XR" },   // XR: ISO ???? user-assigned; workaround for UI localization only, do not use in document content!
+    { LANGUAGE_USER_CATALAN_VALENCIAN,      "ca", "XV" },   // XV: ISO 3166 user-assigned; workaround for UI localization only, do not use in document content!
     { LANGUAGE_CATALAN,                    "qcv", "ES" },   // qcv: ISO 639-3 reserved-for-local-use; UI localization quirk only, do not use in document content!
 //    { LANGUAGE_USER_CATALAN_VALENCIAN,      "ca", "ES" },   // In case MS format files escaped into the wild, map them back.
     { LANGUAGE_FRENCH_CAMEROON,             "fr", "CM" },

i18npool/source/isolang/mslangid.cxx

@@ -455,9 +455,10 @@ LanguageType MsLangId::getReplacementForObsoleteLanguage( LanguageType nLang )
             nLang = LANGUAGE_SPANISH_MODERN;
             break;
 
-         // Do not use ca-XV for document content.
+         // Do not use ca-XV, ca-XR for document content.
          /* TODO: remove in case we implement BCP47 language tags. */
         case LANGUAGE_USER_CATALAN_VALENCIAN:
+        case LANGUAGE_USER_CATALAN_VALENCIAN_RACV:
             nLang = LANGUAGE_CATALAN;
             break;
     }

instsetoo_native/util/pack.lst

@@ -15,5 +15,5 @@ OpenOffice_Dev_SDK  unxlngi6.pro,unxmacxi.pro,unxsoli4.pro,unxsols4.pro,wntmsci1
 #URE             unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngi6,unxsoli4,unxsols4,wntmsci12  en-US   ure
 OpenOfficeLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro    de|ja       ooolanguagepack
 OpenOfficeLanguagepack   unxlngi6,unxsoli4,unxsols4,wntmsci12,unxmacxi                                     de      ooolanguagepack
-OpenOfficeDevLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro     ar|as|ast|be-BY|bg|bn|ca|ca-XV|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW   ooodevlanguagepack
+OpenOfficeDevLanguagepack   unxlngi6.pro,unxsoli4.pro,unxsols4.pro,wntmsci12.pro,unxlngx6.pro,unxmacxi.pro     ar|as|ast|be-BY|bg|bn|ca|ca-XR|ca-XV|cs|da|de|dz|el|en-GB|eo|es|et|eu|fi|fr|ga|gl|gu|he|hi|hu|id|is|it|ja|ka|km|kn|ko|ku|lt|lv|mk|ml|mr|my|nb|nl|nn|oc|om|or|pa-IN|pl|pt|pt-BR|ro|ru|sh|si|sk|sl|sr|sv|ta|te|th|tr|ug|uk|uz|vi|zh-CN|zh-TW   ooodevlanguagepack
 

setup_native/source/win32/msi-encodinglist.txt

@@ -36,7 +36,8 @@ br    1252  1150   # Breton
 brx      0  1603   # Bodo (India)
 bs       0  5146   # bosnian
 ca    1252  1027   # Catalan
-ca-XV   1252  32771  # Catalan Valencian
+ca-XR   1252  32772  # Catalan Valencian RACV
+ca-XV   1252  32771  # Catalan Valencian AVL
 cs    1250  1029   # Czech
 cy    1252  1106   # Welsh
 da    1252  1030

solenv/bin/modules/installer/globals.pm

@@ -78,6 +78,7 @@ BEGIN
         "kok",
         "mni",
         "ca-XV",
+        "ca-XR",
         "sat",
         "ug",
         "om",

solenv/inc/langlist.mk

@@ -37,6 +37,7 @@ bn-IN \
 bs \
 by \
 ca \
+ca-XR \
 ca-XV \
 cs \
 cy \