Kaydet (Commit) 1c2c47ca authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Avoid reserved identifier

Change-Id: I3b1505e788af009a0ff4bb2502883de5bfb45617
üst 682ffda0
...@@ -85,14 +85,14 @@ public: ...@@ -85,14 +85,14 @@ public:
}; };
#define __nSize 2048 #define nSize_ 2048
class FormCache class FormCache
{ {
private: private:
FormIdent aIdents[ __nSize ]; //gepufferte Formate FormIdent aIdents[ nSize_ ]; //gepufferte Formate
sal_Bool bValid[ __nSize ]; sal_Bool bValid[ nSize_ ];
FormIdent aCompareIdent; // zum Vergleichen FormIdent aCompareIdent; // zum Vergleichen
sal_uInt8 nDefaultFormat; // Defaultformat der Datei sal_uInt8 nDefaultFormat; // Defaultformat der Datei
SvNumberFormatter* pFormTable; // Value-Format-Table-Anker SvNumberFormatter* pFormTable; // Value-Format-Table-Anker
...@@ -118,7 +118,7 @@ inline const SfxUInt32Item* FormCache::GetAttr( sal_uInt8 nFormat, sal_uInt8 nSt ...@@ -118,7 +118,7 @@ inline const SfxUInt32Item* FormCache::GetAttr( sal_uInt8 nFormat, sal_uInt8 nSt
aCompareIdent.SetStamp( nFormat, nSt ); aCompareIdent.SetStamp( nFormat, nSt );
nIndex = aCompareIdent.GetStamp(); 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 ] ) if( bValid[ nIndex ] )
pRet = aIdents[ nIndex ].GetAttr(); pRet = aIdents[ nIndex ].GetAttr();
else else
......
...@@ -152,14 +152,14 @@ FormCache::FormCache( ScDocument* pDoc1, sal_uInt8 nNewDefaultFormat ) ...@@ -152,14 +152,14 @@ FormCache::FormCache( ScDocument* pDoc1, sal_uInt8 nNewDefaultFormat )
{ // Default format is 'Default' { // Default format is 'Default'
nDefaultFormat = nNewDefaultFormat; nDefaultFormat = nNewDefaultFormat;
pFormTable = pDoc1->GetFormatTable(); pFormTable = pDoc1->GetFormatTable();
for( sal_uInt16 nC = 0 ; nC < __nSize ; nC++ ) for( sal_uInt16 nC = 0 ; nC < nSize_ ; nC++ )
bValid[ nC ] = false; bValid[ nC ] = false;
eLanguage = ScGlobal::eLnge; eLanguage = ScGlobal::eLnge;
} }
FormCache::~FormCache() FormCache::~FormCache()
{ {
for( sal_uInt16 nC = 0 ; nC < __nSize ; nC++ ) for( sal_uInt16 nC = 0 ; nC < nSize_ ; nC++ )
delete aIdents[ nC ].GetAttr(); delete aIdents[ nC ].GetAttr();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment