summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-08-03 11:01:18 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-03 11:49:11 +0200
commitfad0ddcb8804e16c7eba5c8582c9a189a962abaf (patch)
tree4f7db7bc0b047f1ccc4c0742e10891f750e3df1c /svl
parent1972e4691961a6424b772dcf7570181d3c50369a (diff)
rename SV_MAX_ANZ_STANDARD_FORMATE->SV_MAX_COUNT_STANDARD_FORMATS
Change-Id: I83df4ecabcbc98b5a75f93e44b584291068c6e94 Reviewed-on: https://gerrit.libreoffice.org/40702 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svl')
-rw-r--r--svl/source/numbers/zforlist.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index d22f489a8a41..6756639e2cf0 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -83,8 +83,8 @@ using namespace ::std;
#define ZF_STANDARD_NEWEXTENDED_DATE_DIN_YYYYMMDD 84
#define ZF_STANDARD_NEWEXTENDED_DATE_WW 85
-#define ZF_STANDARD_LOGICAL SV_MAX_ANZ_STANDARD_FORMATE-1 // 99
-#define ZF_STANDARD_TEXT SV_MAX_ANZ_STANDARD_FORMATE // 100
+#define ZF_STANDARD_LOGICAL SV_MAX_COUNT_STANDARD_FORMATS-1 // 99
+#define ZF_STANDARD_TEXT SV_MAX_COUNT_STANDARD_FORMATS // 100
/* Locale that is set if an unknown locale (from another system) is loaded of
* legacy documents. Can not be SYSTEM because else, for example, a German "DM"
@@ -427,7 +427,7 @@ void SvNumberFormatter::ReplaceSystemCL( LanguageType eOldLanguage )
{
return ; // no SYSTEM entries to replace
}
- const sal_uInt32 nMaxBuiltin = nCLOffset + SV_MAX_ANZ_STANDARD_FORMATE;
+ const sal_uInt32 nMaxBuiltin = nCLOffset + SV_MAX_COUNT_STANDARD_FORMATS;
const sal_uInt32 nNextCL = nCLOffset + SV_COUNTRY_LANGUAGE_OFFSET;
sal_uInt32 nKey;
@@ -2241,7 +2241,7 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, bool bNoAdditio
}
pStdFormat->SetType( css::util::NumberFormat::NUMBER );
pStdFormat->SetStandard();
- pStdFormat->SetLastInsertKey( SV_MAX_ANZ_STANDARD_FORMATE, SvNumberformat::FormatterPrivateAccess() );
+ pStdFormat->SetLastInsertKey( SV_MAX_COUNT_STANDARD_FORMATS, SvNumberformat::FormatterPrivateAccess() );
}
else
{
@@ -3052,7 +3052,7 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter
{
nCLOffset = ImpGenerateCL(pFormat->GetLanguage());
}
- if (nOffset <= SV_MAX_ANZ_STANDARD_FORMATE) // Std.form.
+ if (nOffset <= SV_MAX_COUNT_STANDARD_FORMATS) // Std.form.
{
nNewKey = nCLOffset + nOffset;
if (aFTable.find( nNewKey) == aFTable.end()) // not already present
@@ -3142,7 +3142,7 @@ sal_uInt32 SvNumberFormatter::GetFormatForLanguageIfBuiltIn( sal_uInt32 nFormat,
return nFormat; // it stays as it is
}
sal_uInt32 nOffset = nFormat % SV_COUNTRY_LANGUAGE_OFFSET; // relative index
- if ( nOffset > SV_MAX_ANZ_STANDARD_FORMATE )
+ if ( nOffset > SV_MAX_COUNT_STANDARD_FORMATS )
{
return nFormat; // not a built-in format
}
@@ -3172,7 +3172,7 @@ sal_uInt32 SvNumberFormatter::GetFormatIndex( NfIndexTableOffset nTabOff,
NfIndexTableOffset SvNumberFormatter::GetIndexTableOffset( sal_uInt32 nFormat ) const
{
sal_uInt32 nOffset = nFormat % SV_COUNTRY_LANGUAGE_OFFSET; // relative index
- if ( nOffset > SV_MAX_ANZ_STANDARD_FORMATE )
+ if ( nOffset > SV_MAX_COUNT_STANDARD_FORMATS )
{
return NF_INDEX_TABLE_ENTRIES; // not a built-in format
}