diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 09:54:17 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-12 15:50:26 +0200 |
| commit | 1c2c47ca580eeb6b825c0ea8d929967a49a51bec (patch) | |
| tree | a492a06ed23837da3d2f456b8fa8a68e55cd7ac3 /sc | |
| parent | 682ffda0902c56f6d2ac06fada618d51216091c9 (diff) | |
Avoid reserved identifier
Change-Id: I3b1505e788af009a0ff4bb2502883de5bfb45617
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/inc/tool.h | 8 | ||||
| -rw-r--r-- | sc/source/filter/lotus/tool.cxx | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h index c02ae6a6fe40..1bf337fd811d 100644 --- a/sc/source/filter/inc/tool.h +++ b/sc/source/filter/inc/tool.h @@ -85,14 +85,14 @@ public: }; -#define __nSize 2048 +#define nSize_ 2048 class FormCache { private: - FormIdent aIdents[ __nSize ]; //gepufferte Formate - sal_Bool bValid[ __nSize ]; + FormIdent aIdents[ nSize_ ]; //gepufferte Formate + sal_Bool bValid[ nSize_ ]; FormIdent aCompareIdent; // zum Vergleichen sal_uInt8 nDefaultFormat; // Defaultformat der Datei SvNumberFormatter* pFormTable; // Value-Format-Table-Anker @@ -118,7 +118,7 @@ inline const SfxUInt32Item* FormCache::GetAttr( sal_uInt8 nFormat, sal_uInt8 nSt aCompareIdent.SetStamp( nFormat, nSt ); nIndex = aCompareIdent.GetStamp(); - OSL_ENSURE( nIndex < __nSize, "FormCache::GetAttr(): Oups... not this way!" ); + OSL_ENSURE( nIndex < nSize_, "FormCache::GetAttr(): Oups... not this way!" ); if( bValid[ nIndex ] ) pRet = aIdents[ nIndex ].GetAttr(); else diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index d6c7449392eb..8deb70b32224 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.cxx @@ -152,14 +152,14 @@ FormCache::FormCache( ScDocument* pDoc1, sal_uInt8 nNewDefaultFormat ) { // Default format is 'Default' nDefaultFormat = nNewDefaultFormat; pFormTable = pDoc1->GetFormatTable(); - for( sal_uInt16 nC = 0 ; nC < __nSize ; nC++ ) + for( sal_uInt16 nC = 0 ; nC < nSize_ ; nC++ ) bValid[ nC ] = false; eLanguage = ScGlobal::eLnge; } FormCache::~FormCache() { - for( sal_uInt16 nC = 0 ; nC < __nSize ; nC++ ) + for( sal_uInt16 nC = 0 ; nC < nSize_ ; nC++ ) delete aIdents[ nC ].GetAttr(); } |