diff options
| author | Eike Rathke <erack@redhat.com> | 2013-10-30 01:04:44 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-10-30 01:27:59 +0100 |
| commit | 19bae2d3e36052cd902d6f127128c8aa91b937bb (patch) | |
| tree | ad3ba9024a46077d6a6280fc21ab2edfa1a1f1fc /sc | |
| parent | bc131959ad0cd58262859a11af1977e47d62cb32 (diff) | |
renamed STR_COUNT to SC_GLOBSTR_STR_COUNT to clarify ...
... that it is not an ID of a string but indeed the count of global
strings.
Change-Id: Ia4ebc389bad86333bae6a3ce761399b9248f2696
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/globstr.hrc | 2 | ||||
| -rw-r--r-- | sc/source/core/data/global.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 275f7b94ec45..25a5a018cc00 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -688,7 +688,7 @@ #define STR_CTRLCLICKHYPERLINK 551 #define STR_CLICKHYPERLINK 552 -#define STR_COUNT 553 +#define SC_GLOBSTR_STR_COUNT 553 /**< the count of permanently resident strings */ #endif diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index fed00ee61583..f6a376befc22 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -346,7 +346,7 @@ void ScGlobal::SetUserList( const ScUserList* pNewList ) const OUString& ScGlobal::GetRscString( sal_uInt16 nIndex ) { - OSL_ENSURE( nIndex < STR_COUNT, "ScGlobal::GetRscString - invalid string index"); + OSL_ENSURE( nIndex < SC_GLOBSTR_STR_COUNT, "ScGlobal::GetRscString - invalid string index"); if( !ppRscString[ nIndex ] ) { OpCode eOp = ocNone; @@ -539,8 +539,8 @@ void ScGlobal::Init() pCharClass = pSysLocale->GetCharClassPtr(); pLocaleData = pSysLocale->GetLocaleDataPtr(); - ppRscString = new OUString *[ STR_COUNT ]; - for( sal_uInt16 nC = 0 ; nC < STR_COUNT ; nC++ ) ppRscString[ nC ] = NULL; + ppRscString = new OUString *[ SC_GLOBSTR_STR_COUNT ]; + for( sal_uInt16 nC = 0 ; nC < SC_GLOBSTR_STR_COUNT ; nC++ ) ppRscString[ nC ] = NULL; pEmptyBrushItem = new SvxBrushItem( Color( COL_TRANSPARENT ), ATTR_BACKGROUND ); pButtonBrushItem = new SvxBrushItem( Color(), ATTR_BACKGROUND ); @@ -645,7 +645,7 @@ void ScGlobal::Clear() DELETEZ(pAddInCollection); DELETEZ(pUserList); - for( sal_uInt16 nC = 0 ; nC < STR_COUNT ; nC++ ) + for( sal_uInt16 nC = 0 ; nC < SC_GLOBSTR_STR_COUNT ; nC++ ) if( ppRscString ) delete ppRscString[ nC ]; delete[] ppRscString; ppRscString = NULL; |