From d23aeeae680af953c6757b0e6394e4cac191f655 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Sat, 5 Mar 2011 14:21:56 -0500 Subject: Renamed FindIndex to findByIndex to be consistent with findByName. --- sc/inc/rangenam.hxx | 2 +- sc/source/core/data/cell.cxx | 2 +- sc/source/core/data/cell2.cxx | 8 ++++---- sc/source/core/data/conditio.cxx | 2 +- sc/source/core/data/documen2.cxx | 2 +- sc/source/core/data/document.cxx | 2 +- sc/source/core/data/validat.cxx | 2 +- sc/source/core/tool/compiler.cxx | 16 ++++++++-------- sc/source/core/tool/rangenam.cxx | 6 +++--- sc/source/filter/excel/xename.cxx | 2 +- sc/source/filter/excel/xlformula.cxx | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx index 81f7171acdae..fdf51056b930 100644 --- a/sc/inc/rangenam.hxx +++ b/sc/inc/rangenam.hxx @@ -195,12 +195,12 @@ public: SC_DLLPUBLIC const ScRangeData* findByName(const rtl::OUString& rName) const; ScRangeData* findByUpperName(const rtl::OUString& rName); const ScRangeData* findByUpperName(const rtl::OUString& rName) const; + SC_DLLPUBLIC ScRangeData* findByIndex(USHORT i); void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz); void UpdateTabRef(SCTAB nTable, sal_uInt16 nFlag, SCTAB nNewTable = 0); void UpdateTranspose(const ScRange& rSource, const ScAddress& rDest); void UpdateGrow(const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY); - SC_DLLPUBLIC ScRangeData* FindIndex(USHORT i); sal_uInt16 GetSharedMaxIndex(); void SetSharedMaxIndex(sal_uInt16 nInd); diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 4c035bc2e882..8c8b3e07392a 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.cxx @@ -784,7 +784,7 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons } else if ( t->GetType() == svIndex ) { - ScRangeData* pRangeData = rDoc.GetRangeName()->FindIndex( t->GetIndex() ); + ScRangeData* pRangeData = rDoc.GetRangeName()->findByIndex( t->GetIndex() ); if( pRangeData ) { if( pRangeData->HasReferences() ) diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx index 3a7f22808efc..304632310cdb 100644 --- a/sc/source/core/data/cell2.cxx +++ b/sc/source/core/data/cell2.cxx @@ -1361,7 +1361,7 @@ void ScFormulaCell::UpdateTranspose( const ScRange& rSource, const ScAddress& rD { if( t->GetOpCode() == ocName ) { - ScRangeData* pName = pDocument->GetRangeName()->FindIndex( t->GetIndex() ); + ScRangeData* pName = pDocument->GetRangeName()->findByIndex( t->GetIndex() ); if (pName) { if (pName->IsModified()) @@ -1446,7 +1446,7 @@ void ScFormulaCell::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY { if( t->GetOpCode() == ocName ) { - ScRangeData* pName = pDocument->GetRangeName()->FindIndex( t->GetIndex() ); + ScRangeData* pName = pDocument->GetRangeName()->findByIndex( t->GetIndex() ); if (pName) { if (pName->IsModified()) @@ -1519,7 +1519,7 @@ BOOL lcl_IsRangeNameInUse(size_t nIndex, ScTokenArray* pCode, ScRangeName* pName else { // RangeData kann Null sein in bestimmten Excel-Dateien - ScRangeData* pSubName = pNames->FindIndex(p->GetIndex()); + ScRangeData* pSubName = pNames->findByIndex(p->GetIndex()); if (pSubName && lcl_IsRangeNameInUse(nIndex, pSubName->GetCode(), pNames)) return TRUE; @@ -1543,7 +1543,7 @@ void lcl_FindRangeNamesInUse(std::set& rIndexes, ScTokenArray* pCode, Sc USHORT nTokenIndex = p->GetIndex(); rIndexes.insert( nTokenIndex ); - ScRangeData* pSubName = pNames->FindIndex(p->GetIndex()); + ScRangeData* pSubName = pNames->findByIndex(p->GetIndex()); if (pSubName) lcl_FindRangeNamesInUse(rIndexes, pSubName->GetCode(), pNames); } diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index fae09edd16a5..1edef532025f 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -84,7 +84,7 @@ BOOL lcl_HasRelRef( ScDocument* pDoc, ScTokenArray* pFormula, USHORT nRecursion case svIndex: { if( t->GetOpCode() == ocName ) // DB areas always absolute - if( ScRangeData* pRangeData = pDoc->GetRangeName()->FindIndex( t->GetIndex() ) ) + if( ScRangeData* pRangeData = pDoc->GetRangeName()->findByIndex( t->GetIndex() ) ) if( (nRecursion < 42) && lcl_HasRelRef( pDoc, pRangeData->GetCode(), nRecursion + 1 ) ) return TRUE; } diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 4e19767de31f..980e47f96cc3 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -1003,7 +1003,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, { ScRangeData* pData = new ScRangeData( *itr ); pData->SetDocument(this); - if ( pRangeName->FindIndex( pData->GetIndex() ) ) + if ( pRangeName->findByIndex( pData->GetIndex() ) ) pData->SetIndex(0); // need new index, done in Insert if (!pRangeName->insert(pData)) { diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 86a248e06d5d..b168749e2c4e 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -1864,7 +1864,7 @@ void ScDocument::CopyRangeNamesFromClip(ScDocument* pClipDoc, ScClipRangeNameDat { ScRangeData* pData = new ScRangeData( *itr ); pData->SetDocument(this); - if ( pRangeName->FindIndex( pData->GetIndex() ) ) + if ( pRangeName->findByIndex( pData->GetIndex() ) ) pData->SetIndex(0); // need new index, done in Insert if ( pRangeName->insert(pData) ) { diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 893e18c72eea..75ad071ffcee 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -702,7 +702,7 @@ bool ScValidationData::GetSelectionFromFormula( TypedScStrCollection* pStrings, } else if (t->GetOpCode() == ocName) { - ScRangeData* pName = pDocument->GetRangeName()->FindIndex( t->GetIndex() ); + ScRangeData* pName = pDocument->GetRangeName()->findByIndex( t->GetIndex() ); if (pName && pName->IsReference(aRange)) { bRef = TRUE; diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 3f2e4aaab8bc..eda6b600b045 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -3887,7 +3887,7 @@ ScTokenArray* ScCompiler::CompileString( const String& rFormula, const String& r BOOL ScCompiler::HandleRange() { - ScRangeData* pRangeData = pDoc->GetRangeName()->FindIndex( pToken->GetIndex() ); + ScRangeData* pRangeData = pDoc->GetRangeName()->findByIndex( pToken->GetIndex() ); if (pRangeData) { USHORT nErr = pRangeData->GetErrCode(); @@ -4012,7 +4012,7 @@ BOOL ScCompiler::HasModifiedRange() OpCode eOpCode = t->GetOpCode(); if ( eOpCode == ocName ) { - ScRangeData* pRangeData = pDoc->GetRangeName()->FindIndex(t->GetIndex()); + ScRangeData* pRangeData = pDoc->GetRangeName()->findByIndex(t->GetIndex()); if (pRangeData && pRangeData->IsModified()) return TRUE; @@ -4135,7 +4135,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode, { if( j->GetOpCode() == ocName ) { - ScRangeData* pName = pDoc->GetRangeName()->FindIndex( j->GetIndex() ); + ScRangeData* pName = pDoc->GetRangeName()->findByIndex( j->GetIndex() ); if (pName && pName->HasType(RT_SHARED)) pRangeData = pName; } @@ -4188,7 +4188,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode, { if( t->GetOpCode() == ocName ) { - ScRangeData* pName = pDoc->GetRangeName()->FindIndex( t->GetIndex() ); + ScRangeData* pName = pDoc->GetRangeName()->findByIndex( t->GetIndex() ); if (pName && pName->HasType(RT_SHAREDMOD)) { pRangeData = pName; // maybe need a replacement of shared with own code @@ -4481,7 +4481,7 @@ ScRangeData* ScCompiler::UpdateInsertTab( SCTAB nTable, BOOL bIsName ) { if (!bIsName) { - ScRangeData* pName = pDoc->GetRangeName()->FindIndex(t->GetIndex()); + ScRangeData* pName = pDoc->GetRangeName()->findByIndex(t->GetIndex()); if (pName && pName->HasType(RT_SHAREDMOD)) pRangeData = pName; } @@ -4592,7 +4592,7 @@ ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, BOOL /* bIsMove */, BOOL { if (!bIsName) { - ScRangeData* pName = pDoc->GetRangeName()->FindIndex(t->GetIndex()); + ScRangeData* pName = pDoc->GetRangeName()->findByIndex(t->GetIndex()); if (pName && pName->HasType(RT_SHAREDMOD)) pRangeData = pName; } @@ -4802,7 +4802,7 @@ ScRangeData* ScCompiler::UpdateMoveTab( SCTAB nOldTab, SCTAB nNewTab, { if (!bIsName) { - ScRangeData* pName = pDoc->GetRangeName()->FindIndex(t->GetIndex()); + ScRangeData* pName = pDoc->GetRangeName()->findByIndex(t->GetIndex()); if (pName && pName->HasType(RT_SHAREDMOD)) pRangeData = pName; } @@ -5056,7 +5056,7 @@ void ScCompiler::CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken { case ocName: { - ScRangeData* pData = pDoc->GetRangeName()->FindIndex(_pTokenP->GetIndex()); + ScRangeData* pData = pDoc->GetRangeName()->findByIndex(_pTokenP->GetIndex()); if (pData) { if (pData->HasType(RT_SHARED)) diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index 741dd663df5f..092eafc313c5 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.cxx @@ -666,7 +666,7 @@ ScRangeName::ScRangeName(ScDocument* pDoc) : mpDoc(pDoc) {} ScRangeName::ScRangeName(const ScRangeName& r) : - maData(r.maData), mpDoc(r.mpDoc) {} + maData(r.maData), mpDoc(r.mpDoc), mnSharedMaxIndex(r.mnSharedMaxIndex) {} const ScRangeData* ScRangeName::GetRangeAtBlock(const ScRange& rRange) const { @@ -756,7 +756,7 @@ void ScRangeName::UpdateGrow(const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY) itr->UpdateGrow(rArea, nGrowX, nGrowY); } -ScRangeData* ScRangeName::FindIndex(USHORT i) +ScRangeData* ScRangeName::findByIndex(USHORT i) { DataType::iterator itr = maData.begin(), itrEnd = maData.end(); for (; itr != itrEnd; ++itr) @@ -845,7 +845,7 @@ void ScRangeName::clear() bool ScRangeName::operator== (const ScRangeName& r) const { - return maData == r.maData; + return maData == r.maData && mpDoc == r.mpDoc && mnSharedMaxIndex == r.mnSharedMaxIndex; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 6103b42ff34e..ae95b6a0725a 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -382,7 +382,7 @@ sal_uInt16 XclExpNameManagerImpl::InsertName( USHORT nScNameIdx ) { sal_uInt16 nNameIdx = FindNameIdx( maNameMap, nScNameIdx ); if( nNameIdx == 0 ) - if( const ScRangeData* pRangeData = GetNamedRanges().FindIndex( nScNameIdx ) ) + if( const ScRangeData* pRangeData = GetNamedRanges().findByIndex( nScNameIdx ) ) nNameIdx = CreateName( *pRangeData ); return nNameIdx; } diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index b5710123ebd8..c06d4ed07179 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -699,7 +699,7 @@ const ScTokenArray* XclTokenArrayHelper::GetSharedFormula( const XclRoot& rRoot, if( rScTokArr.GetLen() == 1 ) if( const FormulaToken* pScToken = rScTokArr.GetArray()[ 0 ] ) if( pScToken->GetOpCode() == ocName ) - if( ScRangeData* pData = rRoot.GetNamedRanges().FindIndex( pScToken->GetIndex() ) ) + if( ScRangeData* pData = rRoot.GetNamedRanges().findByIndex( pScToken->GetIndex() ) ) if( pData->HasType( RT_SHARED ) ) return pData->GetCode(); return 0; -- cgit