diff options
| author | Eike Rathke <erack@redhat.com> | 2013-06-15 16:27:05 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-06-15 17:11:39 +0200 |
| commit | 9cf2d50ed5f53f5c40ce576c5bc370c18b9f67b7 (patch) | |
| tree | 561aa8dd18789d6c85b909e36ac0bd7da87b15b7 /xmloff/source/style/xmlnumfi.cxx | |
| parent | 94ae882b2eacc183be65f928891ba174a059e3e5 (diff) | |
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
(cherry picked from commit e7d73b42bd71aaab862c3e519348507a84f74754)
Diffstat (limited to 'xmloff/source/style/xmlnumfi.cxx')
| -rw-r--r-- | xmloff/source/style/xmlnumfi.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index beb620591c3a..7fc2d973597d 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, |