Kaydet (Commit) 41281d37 authored tarafından Markus Mohrhard's avatar Markus Mohrhard

make a few more users of ScAttrArray outside of the class const

Change-Id: I76aca6b1ddb8a326eecf70a68bed2a754e462c49
üst e8226a93
...@@ -141,7 +141,7 @@ public: ...@@ -141,7 +141,7 @@ public:
private: private:
static SCROW GetRowByColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCCOL nCol, SCSIZE nColRow); static SCROW GetRowByColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCCOL nCol, SCSIZE nColRow);
static ScBaseCell* GetCellByColEntryIndex(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 bool IsQueryValid(ScDocument& rDoc, const ScQueryParam& rParam, SCTAB nTab, SCROW nRow, ScBaseCell* pCell);
static SCSIZE SearchColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCROW nRow, SCCOL nCol); static SCSIZE SearchColEntryIndex(ScDocument& rDoc, SCTAB nTab, SCROW nRow, SCCOL nCol);
......
...@@ -98,7 +98,7 @@ bool ScDocumentIterator::GetThisCol() ...@@ -98,7 +98,7 @@ bool ScDocumentIterator::GetThisCol()
return false; return false;
} }
ScColumn* pCol = &pTab->aCol[nCol]; ScColumn* pCol = &pTab->aCol[nCol];
ScAttrArray* pAtt = pCol->pAttrArray; const ScAttrArray* pAtt = pCol->pAttrArray;
bool bFound = false; bool bFound = false;
do do
...@@ -477,7 +477,7 @@ ScBaseCell* ScDBQueryDataIterator::GetCellByColEntryIndex(ScDocument& rDoc, SCTA ...@@ -477,7 +477,7 @@ ScBaseCell* ScDBQueryDataIterator::GetCellByColEntryIndex(ScDocument& rDoc, SCTA
return pCol->maItems[nColRow].pCell; 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()) if (nTab >= rDoc.GetTableCount())
OSL_FAIL("try to access index out of bounds, FIX IT"); OSL_FAIL("try to access index out of bounds, FIX IT");
...@@ -1938,7 +1938,7 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB ...@@ -1938,7 +1938,7 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB
for (i=nStartCol; i<=nEndCol; i++) for (i=nStartCol; i<=nEndCol; i++)
{ {
SCCOL nPos = i - nStartCol; 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" ); OSL_ENSURE( pArray, "pArray == 0" );
SCSIZE nIndex; SCSIZE nIndex;
...@@ -1967,7 +1967,7 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB ...@@ -1967,7 +1967,7 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB
ScHorizontalAttrIterator::~ScHorizontalAttrIterator() ScHorizontalAttrIterator::~ScHorizontalAttrIterator()
{ {
delete[] (ScPatternAttr**)ppPatterns; delete[] ppPatterns;
delete[] pNextEnd; delete[] pNextEnd;
delete[] pIndices; delete[] pIndices;
} }
...@@ -2012,7 +2012,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo ...@@ -2012,7 +2012,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo
SCCOL nPos = i-nStartCol; SCCOL nPos = i-nStartCol;
if ( pNextEnd[nPos] < nRow ) 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]; SCSIZE nIndex = ++pIndices[nPos];
if ( nIndex < pArray->nCount ) if ( nIndex < pArray->nCount )
......
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