diff options
-rw-r--r-- | include/svl/zforlist.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/unoobj/cellsuno.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/view/viewfunc.cxx | 2 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 14 |
4 files changed, 11 insertions, 11 deletions
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx index a22e05afb731..6c1036b98ea8 100644 --- a/include/svl/zforlist.hxx +++ b/include/svl/zforlist.hxx @@ -51,8 +51,8 @@ namespace com { namespace sun { namespace star { } }}} -#define SV_COUNTRY_LANGUAGE_OFFSET 10000 // Max count of formats per country/language -#define SV_MAX_ANZ_STANDARD_FORMATE 100 // Max count of builtin default formats per CL +#define SV_COUNTRY_LANGUAGE_OFFSET 10000 // Max count of formats per country/language +#define SV_MAX_COUNT_STANDARD_FORMATS 100 // Max count of builtin default formats per CL #define NUMBERFORMAT_ENTRY_NOT_FOUND (sal_uInt32)(0xffffffff) /// MAX_ULONG diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 19e54619e45e..84d97df0f383 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -2166,7 +2166,7 @@ static void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const // don't touch number format attribute sal_uLong nNewMod = nNewFormat % SV_COUNTRY_LANGUAGE_OFFSET; if ( nNewMod == ( nOldFormat % SV_COUNTRY_LANGUAGE_OFFSET ) && - nNewMod <= SV_MAX_ANZ_STANDARD_FORMATE ) + nNewMod <= SV_MAX_COUNT_STANDARD_FORMATS ) { rFirstItemId = 0; // don't use ATTR_VALUE_FORMAT value } diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 8175d3b767de..bb2dfeda707d 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -918,7 +918,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, // only the language has changed -> do not touch numberformat-attribute sal_uInt32 nNewMod = nNewFormat % SV_COUNTRY_LANGUAGE_OFFSET; if ( nNewMod == ( nOldFormat % SV_COUNTRY_LANGUAGE_OFFSET ) && - nNewMod <= SV_MAX_ANZ_STANDARD_FORMATE ) + nNewMod <= SV_MAX_COUNT_STANDARD_FORMATS ) aNewAttrs.GetItemSet().ClearItem( ATTR_VALUE_FORMAT ); } } 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 } |