diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-30 05:05:31 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-30 19:32:04 +0100 |
| commit | 41281d375300512011113c69ddda5995463a3c88 (patch) | |
| tree | d3adf19011071516dd02b88861714fa222298a11 /sc | |
| parent | e8226a93aca391e9abe63edebc87aec05d3bf5bf (diff) | |
make a few more users of ScAttrArray outside of the class const
Change-Id: I76aca6b1ddb8a326eecf70a68bed2a754e462c49
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/dociter.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/data/dociter.cxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx index 7244921e541f..36831113e591 100644 --- a/sc/inc/dociter.hxx +++ b/sc/inc/dociter.hxx @@ -141,7 +141,7 @@ public: private: static SCROW GetRowByColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCCOL nCol, SCSIZE nColRow); static ScBaseCell* GetCellByColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCCOL nCol, SCSIZE nColRow); - static ScAttrArray* GetAttrArrayByCol(ScDocument& rDoc, SCTAB nTab, SCCOL nCol); + static const ScAttrArray* GetAttrArrayByCol(ScDocument& rDoc, SCTAB nTab, SCCOL nCol); static bool IsQueryValid(ScDocument& rDoc, const ScQueryParam& rParam, SCTAB nTab, SCROW nRow, ScBaseCell* pCell); static SCSIZE SearchColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCROW nRow, SCCOL nCol); diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index e34368026acd..cfcc52ac0059 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -98,7 +98,7 @@ bool ScDocumentIterator::GetThisCol() return false; } ScColumn* pCol = &pTab->aCol[nCol]; - ScAttrArray* pAtt = pCol->pAttrArray; + const ScAttrArray* pAtt = pCol->pAttrArray; bool bFound = false; do @@ -477,7 +477,7 @@ ScBaseCell* ScDBQueryDataIterator::GetCellByColEntryIndex(ScDocument& rDoc, SCTA return pCol->maItems[nColRow].pCell; } -ScAttrArray* ScDBQueryDataIterator::GetAttrArrayByCol(ScDocument& rDoc, SCTAB nTab, SCCOL nCol) +const ScAttrArray* ScDBQueryDataIterator::GetAttrArrayByCol(ScDocument& rDoc, SCTAB nTab, SCCOL nCol) { if (nTab >= rDoc.GetTableCount()) OSL_FAIL("try to access index out of bounds, FIX IT"); @@ -1938,7 +1938,7 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB for (i=nStartCol; i<=nEndCol; i++) { SCCOL nPos = i - nStartCol; - ScAttrArray* pArray = pDoc->maTabs[nTab]->aCol[i].pAttrArray; + const ScAttrArray* pArray = pDoc->maTabs[nTab]->aCol[i].pAttrArray; OSL_ENSURE( pArray, "pArray == 0" ); SCSIZE nIndex; @@ -1967,7 +1967,7 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB ScHorizontalAttrIterator::~ScHorizontalAttrIterator() { - delete[] (ScPatternAttr**)ppPatterns; + delete[] ppPatterns; delete[] pNextEnd; delete[] pIndices; } @@ -2012,7 +2012,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo SCCOL nPos = i-nStartCol; if ( pNextEnd[nPos] < nRow ) { - ScAttrArray* pArray = pDoc->maTabs[nTab]->aCol[i].pAttrArray; + const ScAttrArray* pArray = pDoc->maTabs[nTab]->aCol[i].pAttrArray; SCSIZE nIndex = ++pIndices[nPos]; if ( nIndex < pArray->nCount ) |