implement possessive genitive case month names locale data

New optional element GenitiveMonths within the Calendar element, after
MonthsOfYear. If not specified, the MonthsOfYear elements are taken.

3 files changed, 125 insertions, 31 deletions

diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 83c197251bd3..0dbb77045a31 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -1145,6 +1145,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
     ::rtl::OUString str;
     sal_Int16 * nbOfDays = new sal_Int16[nbOfCalendars];
     sal_Int16 * nbOfMonths = new sal_Int16[nbOfCalendars];
+    sal_Int16 * nbOfGenitiveMonths = new sal_Int16[nbOfCalendars];
     sal_Int16 * nbOfEras = new sal_Int16[nbOfCalendars];
     sal_Int16 j;
     sal_Int16 i;
@@ -1161,10 +1162,12 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
         str = calNode -> getAttr().getValueByName("default");
         of.writeDefaultParameter("Calendar", str, i);
 
+        sal_Int16 nChild = 0;
+
         // Generate Days of Week
         const sal_Char *elementTag;
         LocaleNode * daysNode = NULL;
-        ::rtl::OUString ref_name = calNode->getChildAt(0)->getAttr().getValueByName("ref");
+        ::rtl::OUString ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
         if (ref_name.getLength() > 0 && i > 0) {
             for (j = 0; j < i; j++) {
                 str = getChildAt(j)->getAttr().getValueByName("unoid");
@@ -1178,7 +1181,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
             nbOfDays[i] = 0;
         } else {
             if (daysNode == NULL)
-                daysNode = calNode -> getChildAt(0);
+                daysNode = calNode -> getChildAt(nChild);
             nbOfDays[i] = sal::static_int_cast<sal_Int16>( daysNode->getNumberOfChildren() );
             if (bGregorian && nbOfDays[i] != 7)
                 incErrorInt( "A Gregorian calendar must have 7 days per week, this one has %d", nbOfDays[i]);
@@ -1193,10 +1196,11 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
                 of.writeParameter(elementTag, "DefaultFullName",currNode->getChildAt(2)->getValue() , i, j);
             }
         }
+        ++nChild;
 
         // Generate Months of Year
         LocaleNode * monthsNode = NULL;
-        ref_name = calNode->getChildAt(1)->getAttr().getValueByName("ref");
+        ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
         if (ref_name.getLength() > 0 && i > 0) {
             for (j = 0; j < i; j++) {
                 str = getChildAt(j)->getAttr().getValueByName("unoid");
@@ -1210,7 +1214,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
             nbOfMonths[i] = 0;
         } else {
             if (monthsNode == NULL)
-                monthsNode = calNode -> getChildAt(1);
+                monthsNode = calNode -> getChildAt(nChild);
             nbOfMonths[i] = sal::static_int_cast<sal_Int16>( monthsNode->getNumberOfChildren() );
             if (bGregorian && nbOfMonths[i] != 12)
                 incErrorInt( "A Gregorian calendar must have 12 months, this one has %d", nbOfMonths[i]);
@@ -1225,10 +1229,47 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
                 of.writeParameter(elementTag, "DefaultFullName",currNode->getChildAt(2)->getValue() , i, j);
             }
         }
+        ++nChild;
+
+        // Generate genitive Months of Year
+        // Optional, if not present fall back to month nouns.
+        if (!calNode->getChildAt(nChild)->getName().equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "GenitiveMonths")))
+            --nChild;
+        LocaleNode * genitiveMonthsNode = NULL;
+        ref_name = calNode->getChildAt(nChild)->getAttr().getValueByName("ref");
+        if (ref_name.getLength() > 0 && i > 0) {
+            for (j = 0; j < i; j++) {
+                str = getChildAt(j)->getAttr().getValueByName("unoid");
+                if (str.equals(ref_name))
+                    genitiveMonthsNode = getChildAt(j)->getChildAt(1);
+            }
+        }
+        if (ref_name.getLength() > 0 && genitiveMonthsNode == NULL) {
+            of.writeParameter("genitiveMonthRef", OUString(RTL_CONSTASCII_USTRINGPARAM("ref")), i);
+            of.writeParameter("genitiveMonthRefName", ref_name, i);
+            nbOfGenitiveMonths[i] = 0;
+        } else {
+            if (genitiveMonthsNode == NULL)
+                genitiveMonthsNode = calNode -> getChildAt(nChild);
+            nbOfGenitiveMonths[i] = sal::static_int_cast<sal_Int16>( genitiveMonthsNode->getNumberOfChildren() );
+            if (bGregorian && nbOfGenitiveMonths[i] != 12)
+                incErrorInt( "A Gregorian calendar must have 12 genitive months, this one has %d", nbOfGenitiveMonths[i]);
+            elementTag = "genitiveMonth";
+            for (j = 0; j < nbOfGenitiveMonths[i]; j++) {
+                LocaleNode *currNode = genitiveMonthsNode -> getChildAt(j);
+                OUString genitiveMonthID( currNode->getChildAt(0)->getValue());
+                of.writeParameter("genitiveMonthID", genitiveMonthID, i, j);
+                if (j == 0 && bGregorian && !genitiveMonthID.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "jan")))
+                    incError( "First genitive month of a year of a Gregorian calendar must be <MonthID>jan</MonthID>");
+                of.writeParameter(elementTag, "DefaultAbbrvName",currNode->getChildAt(1)->getValue() ,i, j);
+                of.writeParameter(elementTag, "DefaultFullName",currNode->getChildAt(2)->getValue() , i, j);
+            }
+        }
+        ++nChild;
 
         // Generate Era name
         LocaleNode * erasNode = NULL;
-        ref_name =   calNode -> getChildAt(2) ->getAttr().getValueByName("ref");
+        ref_name =   calNode -> getChildAt(nChild) ->getAttr().getValueByName("ref");
         if (ref_name.getLength() > 0 && i > 0) {
             for (j = 0; j < i; j++) {
                 str = getChildAt(j)->getAttr().getValueByName("unoid");
@@ -1242,7 +1283,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
             nbOfEras[i] = 0;
         } else {
             if (erasNode == NULL)
-                erasNode = calNode -> getChildAt(2);
+                erasNode = calNode -> getChildAt(nChild);
             nbOfEras[i] = sal::static_int_cast<sal_Int16>( erasNode->getNumberOfChildren() );
             if (bGregorian && nbOfEras[i] != 2)
                 incErrorInt( "A Gregorian calendar must have 2 eras, this one has %d", nbOfEras[i]);
@@ -1260,7 +1301,9 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
                 of.writeParameter(elementTag, "DefaultFullName",currNode->getChildAt(2)->getValue() , i, j);
             }
         }
-        str = calNode->getChildAt(3)->getChildAt(0)->getValue();
+        ++nChild;
+
+        str = calNode->getChildAt(nChild)->getChildAt(0)->getValue();
         if (nbOfDays[i])
         {
             for (j = 0; j < nbOfDays[i]; j++)
@@ -1274,7 +1317,9 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
                 incErrorStr( "<StartDayOfWeek> <DayID> must be one of the <DaysOfWeek>, but is", str);
         }
         of.writeParameter("startDayOfWeek", str, i);
-        str = calNode ->getChildAt(4)-> getValue();
+        ++nChild;
+
+        str = calNode ->getChildAt(nChild)-> getValue();
         sal_Int16 nDays = sal::static_int_cast<sal_Int16>( str.toInt32() );
         if (nDays < 1 || (0 < nbOfDays[i] && nbOfDays[i] < nDays))
             incErrorInt( "Bad value of MinimalDaysInFirstWeek: %d, must be 1 <= value <= days_in_week",  nDays);
@@ -1303,6 +1348,14 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
     of.writeInt(nbOfMonths[i]);
     of.writeAsciiString("};\n");
 
+    of.writeAsciiString("static const sal_Unicode nbOfGenitiveMonths[] = {");
+    for(i = 0; i < nbOfCalendars - 1; i++) {
+        of.writeInt(nbOfGenitiveMonths[i]);
+        of.writeAsciiString(", ");
+    };
+    of.writeInt(nbOfGenitiveMonths[i]);
+    of.writeAsciiString("};\n");
+
     of.writeAsciiString("static const sal_Unicode nbOfEras[] = {");
     for(i = 0; i < nbOfCalendars - 1; i++) {
         of.writeInt(nbOfEras[i]);
@@ -1315,6 +1368,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
     of.writeAsciiString("static const sal_Unicode* calendars[] = {\n");
     of.writeAsciiString("\tnbOfDays,\n");
     of.writeAsciiString("\tnbOfMonths,\n");
+    of.writeAsciiString("\tnbOfGenitiveMonths,\n");
     of.writeAsciiString("\tnbOfEras,\n");
     for(i = 0; i < nbOfCalendars; i++) {
         of.writeAsciiString("\tcalendarID");
@@ -1349,6 +1403,18 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
                 of.writeAsciiString("\tmonthDefaultFullName");of.writeInt(i);of.writeInt(j);of.writeAsciiString(",\n");
             }
         }
+        if (nbOfGenitiveMonths[i] == 0) {
+            of.writeAsciiString("\tgenitiveMonthRef");
+            of.writeInt(i); of.writeAsciiString(",\n");
+            of.writeAsciiString("\tgenitiveMonthRefName");
+            of.writeInt(i); of.writeAsciiString(",\n");
+        } else {
+            for(j = 0; j < nbOfGenitiveMonths[i]; j++) {
+                of.writeAsciiString("\tgenitiveMonthID");of.writeInt(i);of.writeInt(j);of.writeAsciiString(",\n");
+                of.writeAsciiString("\tgenitiveMonthDefaultAbbrvName");of.writeInt(i);of.writeInt(j);of.writeAsciiString(",\n");
+                of.writeAsciiString("\tgenitiveMonthDefaultFullName");of.writeInt(i);of.writeInt(j);of.writeAsciiString(",\n");
+            }
+        }
         if (nbOfEras[i] == 0) {
             of.writeAsciiString("\teraRef");
             of.writeInt(i); of.writeAsciiString(",\n");
@@ -1370,6 +1436,7 @@ void LCCalendarNode::generateCode (const OFileWriter &of) const
 
     delete []nbOfDays;
     delete []nbOfMonths;
+    delete []nbOfGenitiveMonths;
     delete []nbOfEras;
 }
 
@@ -1397,12 +1464,12 @@ void LCCurrencyNode :: generateCode (const OFileWriter &of) const
     bool bTheDefault= false;
     bool bTheCompatible = false;
     for ( i = 0; i < getNumberOfChildren(); i++,nbOfCurrencies++) {
-        LocaleNode * calNode = getChildAt (i);
-        str = calNode->getAttr().getValueByName("default");
+        LocaleNode * currencyNode = getChildAt (i);
+        str = currencyNode->getAttr().getValueByName("default");
         bool bDefault = of.writeDefaultParameter("Currency", str, nbOfCurrencies);
-        str = calNode->getAttr().getValueByName("usedInCompatibleFormatCodes");
+        str = currencyNode->getAttr().getValueByName("usedInCompatibleFormatCodes");
         bool bCompatible = of.writeDefaultParameter("CurrencyUsedInCompatibleFormatCodes", str, nbOfCurrencies);
-        str = calNode->getAttr().getValueByName("legacyOnly");
+        str = currencyNode->getAttr().getValueByName("legacyOnly");
         bool bLegacy = of.writeDefaultParameter("CurrencyLegacyOnly", str, nbOfCurrencies);
         if (bLegacy && (bDefault || bCompatible))
             incError( "Currency: if legacyOnly==true, both 'default' and 'usedInCompatibleFormatCodes' must be false.");
@@ -1418,22 +1485,22 @@ void LCCurrencyNode :: generateCode (const OFileWriter &of) const
                 incError( "Currency: more than one currency flagged as usedInCompatibleFormatCodes.");
             bTheCompatible = true;
         }
-        str = calNode -> findNode ("CurrencyID") -> getValue();
+        str = currencyNode -> findNode ("CurrencyID") -> getValue();
         of.writeParameter("currencyID", str, nbOfCurrencies);
         // CurrencyID MUST be ISO 4217.
         if (!bLegacy && !isIso4217(str))
             incError( "CurrencyID is not ISO 4217");
-        str = calNode -> findNode ("CurrencySymbol") -> getValue();
+        str = currencyNode -> findNode ("CurrencySymbol") -> getValue();
         of.writeParameter("currencySymbol", str, nbOfCurrencies);
-        str = calNode -> findNode ("BankSymbol") -> getValue();
+        str = currencyNode -> findNode ("BankSymbol") -> getValue();
         of.writeParameter("bankSymbol", str, nbOfCurrencies);
         // BankSymbol currently must be ISO 4217. May change later if
         // application always uses CurrencyID instead of BankSymbol.
         if (!bLegacy && !isIso4217(str))
             incError( "BankSymbol is not ISO 4217");
-        str = calNode -> findNode ("CurrencyName") -> getValue();
+        str = currencyNode -> findNode ("CurrencyName") -> getValue();
         of.writeParameter("currencyName", str, nbOfCurrencies);
-        str = calNode -> findNode ("DecimalPlaces") -> getValue();
+        str = currencyNode -> findNode ("DecimalPlaces") -> getValue();
         sal_Int16 nDecimalPlaces = (sal_Int16)str.toInt32();
         of.writeIntParameter("currencyDecimalPlaces", nbOfCurrencies, nDecimalPlaces);
         of.writeAsciiString("\n");
@@ -1490,8 +1557,8 @@ void LCTransliterationNode::generateCode (const OFileWriter &of) const
     sal_Int16 i;
 
     for ( i = 0; i < getNumberOfChildren(); i++,nbOfModules++) {
-        LocaleNode * calNode = getChildAt (i);
-        str = calNode->getAttr().getValueByIndex(0);
+        LocaleNode * transNode = getChildAt (i);
+        str = transNode->getAttr().getValueByIndex(0);
         of.writeParameter("Transliteration", str, nbOfModules);
     }
     of.writeAsciiString("static const sal_Int16 nbOfTransliterations = ");
diff --git a/i18npool/source/localedata/data/locale.dtd b/i18npool/source/localedata/data/locale.dtd
index c18ca8d34453..8a0a9e781a0d 100644
--- a/i18npool/source/localedata/data/locale.dtd
+++ b/i18npool/source/localedata/data/locale.dtd
@@ -254,7 +254,7 @@
 <!-- At least one Calendar element must be given if the RefLocale mechanism is not used! -->
 <!ATTLIST LC_CALENDAR %RefLocale;>
 
-<!ELEMENT Calendar (DaysOfWeek, MonthsOfYear, Eras, StartDayOfWeek, MinimalDaysInFirstWeek) >
+<!ELEMENT Calendar (DaysOfWeek, MonthsOfYear, GenitiveMonths*, Eras, StartDayOfWeek, MinimalDaysInFirstWeek) >
 <!ATTLIST Calendar %UNOModule;>
 <!-- The unoid of a gregorian calendar MUST be lower case "gregorian",
      calendars MUST match the names defined in the OASIS OpenDocument Format
@@ -283,6 +283,17 @@
 <!-- Sequence of months is important, MUST start with the first month of a
      year, e.g. January in a Gregorian calendar.
  -->
+
+<!ELEMENT GenitiveMonths (Month*)>
+<!-- Possessive genitive case month names, for example in Slavic locales. The
+     element is optional, but if present all Month elements of a Calendar must
+     be given if the RefLocale mechanism is not used! If not present,
+     MonthsOfYear names will be used. -->
+<!ATTLIST GenitiveMonths %RefLocale;>
+<!-- Sequence of months is important, MUST start with the first month of a
+     year, e.g. January in a Gregorian calendar.
+ -->
+
 <!ELEMENT Month (MonthID, DefaultAbbrvName, DefaultFullName)>
 <!ELEMENT MonthID (#PCDATA)>
 <!-- Preferably the lower case abbreviated English name like jan for January. -->
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 06b1433946c5..8b5b58de146f 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -459,9 +459,13 @@ oslGenericFunction SAL_CALL lcl_LookupTableHelper::getFunctionSymbolByName(
 
 } // anonymous namespace
 
-#define REF_DAYS 0
-#define REF_MONTHS 1
-#define REF_ERAS 2
+
+// REF values equal offsets of counts within getAllCalendars() data structure!
+#define REF_DAYS         0
+#define REF_MONTHS       1
+#define REF_GMONTHS      2
+#define REF_ERAS         3
+#define REF_OFFSET_COUNT 4
 
 Sequence< CalendarItem > &LocaleData::getCalendarItemByName(const OUString& name,
         const Locale& rLocale, const Sequence< Calendar >& calendarsSeq, sal_Int16 item)
@@ -485,7 +489,7 @@ Sequence< CalendarItem > &LocaleData::getCalendarItemByName(const OUString& name
                     break;
                 }
             }
-            // Refered locale does not found, return name for en_US locale.
+            // Referred locale not found, return name for en_US locale.
             if (index == cals.getLength()) {
                 cals = getAllCalendars(
                         Locale(OUString(RTL_CONSTASCII_USTRINGPARAM("en")), OUString(RTL_CONSTASCII_USTRINGPARAM("US")), OUString()));
@@ -513,12 +517,13 @@ LocaleData::getAllCalendars( const Locale& rLocale ) throw(RuntimeException)
             allCalendars = func(calendarsCount);
 
             Sequence< Calendar > calendarsSeq(calendarsCount);
-            sal_Int16 offset = 3;
+            sal_Int16 offset = REF_OFFSET_COUNT;
             sal_Int16 i, j;
             for(i = 0; i < calendarsCount; i++) {
-                Sequence< CalendarItem > days(allCalendars[0][i]);
-                Sequence< CalendarItem > months(allCalendars[1][i]);
-                Sequence< CalendarItem > eras(allCalendars[2][i]);
+                Sequence< CalendarItem > days(allCalendars[REF_DAYS][i]);
+                Sequence< CalendarItem > months(allCalendars[REF_MONTHS][i]);
+//prep                Sequence< CalendarItem > gmonths(allCalendars[REF_GMONTHS][i]);
+                Sequence< CalendarItem > eras(allCalendars[REF_ERAS][i]);
                 OUString calendarID(allCalendars[offset]);
                 offset++;
                 sal_Bool defaultCalendar = sal::static_int_cast<sal_Bool>( allCalendars[offset][0] );
@@ -527,7 +532,7 @@ LocaleData::getAllCalendars( const Locale& rLocale ) throw(RuntimeException)
                     days = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, REF_DAYS);
                     offset += 2;
                 } else {
-                    for(j = 0; j < allCalendars[0][i]; j++) {
+                    for(j = 0; j < allCalendars[REF_DAYS][i]; j++) {
                         CalendarItem day(allCalendars[offset],
                             allCalendars[offset+1], allCalendars[offset+2]);
                         days[j] = day;
@@ -538,7 +543,7 @@ LocaleData::getAllCalendars( const Locale& rLocale ) throw(RuntimeException)
                     months = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, REF_MONTHS);
                     offset += 2;
                 } else {
-                    for(j = 0; j < allCalendars[1][i]; j++) {
+                    for(j = 0; j < allCalendars[REF_MONTHS][i]; j++) {
                         CalendarItem month(allCalendars[offset],
                             allCalendars[offset+1], allCalendars[offset+2]);
                         months[j] = month;
@@ -546,10 +551,21 @@ LocaleData::getAllCalendars( const Locale& rLocale ) throw(RuntimeException)
                     }
                 }
                 if (OUString(allCalendars[offset]).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ref"))) {
+//prep                    gmonths = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, REF_GMONTHS);
+                    offset += 2;
+                } else {
+                    for(j = 0; j < allCalendars[REF_GMONTHS][i]; j++) {
+//prep                        CalendarItem gmonth(allCalendars[offset],
+//prep                            allCalendars[offset+1], allCalendars[offset+2]);
+//prep                        gmonths[j] = gmonth;
+                        offset += 3;
+                    }
+                }
+                if (OUString(allCalendars[offset]).equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("ref"))) {
                     eras = getCalendarItemByName(OUString(allCalendars[offset+1]), rLocale, calendarsSeq, REF_ERAS);
                     offset += 2;
                 } else {
-                    for(j = 0; j < allCalendars[2][i]; j++) {
+                    for(j = 0; j < allCalendars[REF_ERAS][i]; j++) {
                         CalendarItem era(allCalendars[offset],
                             allCalendars[offset+1], allCalendars[offset+2]);
                         eras[j] = era;