[Libreoffice-commits] core.git: include/svl svl/source xmloff/source

[Eike Rathke]

 include/svl/zforlist.hxx         |    4 +++-
 svl/source/numbers/zforlist.cxx  |    8 ++++----
 xmloff/source/style/xmlnumfi.cxx |    2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit e7d73b42bd71aaab862c3e519348507a84f74754
Author: Eike Rathke <erack at redhat.com>
Date:   Sat Jun 15 16:27:05 2013 +0200

    use proper offset for additional locale data formats, fdo#64947 related
    
    Old number formats had predefined formats from 0..49, locale data could
    define additional formats from index 50 on. Internal (fractional)
    formats were added to the number formatter, shifting the number of
    predefined entries NF_INDEX_TABLE_ENTRIES by two that was also used as
    an offset to determine whether a format needed to be added additionally.
    
    As a consequece, formats defined with index values 50 and 51 in locale
    data were ignored and not available in the dialog.
    
    Introduced a new enum constant NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS to
    use as the old offset value for not having to change all locale data
    definitions everytime an internally generated format is added.
    
    Change-Id: I94bdaabf360f7b9c253b1e3f5b73087f0c45fb44

diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index a18f8f2..311e013 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -176,10 +176,12 @@ enum NfIndexTableOffset
     NF_BOOLEAN,                             // BOOLEAN
     NF_TEXT,                                // @
 
+    NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS,    // old number of predefined entries, locale data additions start after this
+
     // From here on are values of new built-in formats that are not in the
     // original NumberFormatIndex.idl
 
-    NF_FRACTION_3,                          // # ?/4
+    NF_FRACTION_3 = NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS,    // # ?/4
     NF_FRACTION_4,                          // # ?/100
 
     NF_INDEX_TABLE_ENTRIES
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 1a34380..99c3da2 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -1825,7 +1825,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
                                                     sal_Int16 nOrgIndex )
 {
     String aCodeStr( rCode.Code );
-    if ( rCode.Index < NF_INDEX_TABLE_ENTRIES &&
+    if ( rCode.Index < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS &&
             rCode.Usage == ::com::sun::star::i18n::KNumberFormatUsage::CURRENCY &&
             rCode.Index != NF_CURRENCY_1000DEC2_CCC )
     {   // strip surrounding [$...] on automatic currency
@@ -1865,7 +1865,7 @@ SvNumberformat* SvNumberFormatter::ImpInsertFormat( const ::com::sun::star::i18n
         delete pFormat;
         return NULL;
     }
-    if ( rCode.Index >= NF_INDEX_TABLE_ENTRIES )
+    if ( rCode.Index >= NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS )
     {
         sal_uInt32 nCLOffset = nPos - (nPos % SV_COUNTRY_LANGUAGE_OFFSET);
         sal_uInt32 nKey = ImpIsEntry( aCodeStr, nCLOffset, ActLnge );
@@ -2714,7 +2714,7 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset,
             SAL_WARN( "svl.numbers", "ImpGenerateAdditionalFormats: too many formats" );
             break;  // for
         }
-        if ( pFormatArr[j].Index < NF_INDEX_TABLE_ENTRIES &&
+        if ( pFormatArr[j].Index < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS &&
                 pFormatArr[j].Index != NF_CURRENCY_1000DEC2_CCC )
         {   // Insert only if not already inserted, but internal index must be
             // above so ImpInsertFormat can distinguish it.
@@ -2750,7 +2750,7 @@ void SvNumberFormatter::ImpGenerateAdditionalFormats( sal_uInt32 CLOffset,
                 SAL_WARN( "svl.numbers", "ImpGenerateAdditionalFormats: too many formats" );
                 break;  // for
             }
-            if ( pFormatArr[j].Index >= NF_INDEX_TABLE_ENTRIES )
+            if ( pFormatArr[j].Index >= NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS )
                 if ( ImpInsertNewStandardFormat( pFormatArr[j], nPos+1,
                         SV_NUMBERFORMATTER_VERSION_ADDITIONAL_I18N_FORMATS,
                         bAfterChangingSystemCL ) )
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index beb6205..7fc2d97 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -1612,7 +1612,7 @@ sal_Int32 SvXMLNumFormatContext::CreateAndInsert(SvNumberFormatter* pFormatter)
         NfIndexTableOffset eFormat = (NfIndexTableOffset) SvXMLNumFmtDefaults::GetDefaultDateFormat(
             eDateDOW, eDateDay, eDateMonth, eDateYear,
             eDateHours, eDateMins, eDateSecs, bFromSystem );
-        if ( eFormat < NF_INDEX_TABLE_ENTRIES )
+        if ( eFormat < NF_INDEX_TABLE_LOCALE_DATA_DEFAULTS )
         {
             //  #109651# if a date format has the automatic-order attribute and
             //  contains exactly the elements of one of the default date formats,