summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2014-01-21 17:46:32 +0100
committerEike Rathke <erack@redhat.com>2014-01-22 01:09:11 +0100
commit57b8e7c96bafb97f881b7db73624693392e13540 (patch)
treebba34b2bcefbf73ef7f994948c38ee4e7cec7136
parent5f89d247e3dac99c297066d404c24dea3312fa51 (diff)
const methods, removed this->..., naming Change-Id: I0db1cf445936bab04003062bc59ce0a0c2fc8b71
-rw-r--r--sc/inc/attarray.hxx4
-rw-r--r--sc/inc/column.hxx6
-rw-r--r--sc/inc/document.hxx6
-rw-r--r--sc/inc/table.hxx6
-rw-r--r--sc/source/core/data/attarray.cxx4
-rw-r--r--sc/source/core/data/column2.cxx12
-rw-r--r--sc/source/core/data/documen3.cxx10
-rw-r--r--sc/source/core/data/document.cxx4
-rw-r--r--sc/source/core/data/table4.cxx12
9 files changed, 32 insertions, 32 deletions
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index c2789b3013f7..2d52279d13c7 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -189,9 +189,9 @@ public:
void DeleteHardAttr( SCROW nStartRow, SCROW nEndRow );
/* i123909: Pre-calculate needed memory, and pre-reserve enough memory */
- bool Reserve( SCSIZE nCount );
+ bool Reserve( SCSIZE nReserve );
SCSIZE Count() const { return nCount; }
- SCSIZE Count( SCROW nRw1, SCROW nRw2 );
+ SCSIZE Count( SCROW nRow1, SCROW nRow2 ) const;
};
// Iterator for attributes
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 8b09db3ef7ff..afe9f6abe828 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -536,9 +536,9 @@ public:
void DumpFormulaGroups() const;
#endif
- SCSIZE GetPatternCount( );
- SCSIZE GetPatternCount( SCROW nRw1, SCROW nRw2 );
- bool ReservedPatternCount( SCSIZE nReserved );
+ SCSIZE GetPatternCount() const;
+ SCSIZE GetPatternCount( SCROW nRow1, SCROW nRow2 ) const;
+ bool ReservePatternCount( SCSIZE nReserve );
private:
sc::CellStoreType::iterator GetPositionToInsert( SCROW nRow );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 3fe416cae9ff..2f1ecdc160b0 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2089,9 +2089,9 @@ private: // CLOOK-Impl-methods
std::map< SCTAB, ScSortParam > mSheetSortParams;
- SCSIZE GetPatternCount( SCTAB nTab, SCCOL nCol );
- SCSIZE GetPatternCount( SCTAB nTab, SCCOL nCol, SCROW nRw1, SCROW nRw2 );
- bool ReservedPatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserved );
+ SCSIZE GetPatternCount( SCTAB nTab, SCCOL nCol ) const;
+ SCSIZE GetPatternCount( SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW nRow2 ) const;
+ bool ReservePatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserve );
};
inline void ScDocument::GetSortParam( ScSortParam& rParam, SCTAB nTab )
{
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 68a17912fe6a..19dbb00d01be 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -346,9 +346,9 @@ public:
void SetValue( SCCOL nCol, SCROW nRow, const double& rVal );
void SetError( SCCOL nCol, SCROW nRow, sal_uInt16 nError);
- SCSIZE GetPatternCount( SCCOL nCol );
- SCSIZE GetPatternCount( SCCOL nCol, SCROW nRw1, SCROW nRw2 );
- bool ReservedPatternCount( SCCOL nCol, SCSIZE nReserved );
+ SCSIZE GetPatternCount( SCCOL nCol ) const;
+ SCSIZE GetPatternCount( SCCOL nCol, SCROW nRow1, SCROW nRow2 ) const;
+ bool ReservePatternCount( SCCOL nCol, SCSIZE nReserve );
void SetRawString( SCCOL nCol, SCROW nRow, const OUString& rStr );
void SetRawString( SCCOL nCol, SCROW nRow, const svl::SharedString& rStr );
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 2bfccee1ef15..bee7eedf6a70 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -2458,7 +2458,7 @@ bool ScAttrArray::SearchStyleRange(
return false;
}
-SCSIZE ScAttrArray::Count( SCROW nStartRow, SCROW nEndRow )
+SCSIZE ScAttrArray::Count( SCROW nStartRow, SCROW nEndRow ) const
{
SCSIZE nIndex1, nIndex2;
@@ -2466,7 +2466,7 @@ SCSIZE ScAttrArray::Count( SCROW nStartRow, SCROW nEndRow )
return 0;
if( !Search( nEndRow, nIndex2 ) )
- nIndex2 = this->nCount - 1;
+ nIndex2 = nCount - 1;
return nIndex2 - nIndex1 + 1;
}
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index bea9179038a6..b891276aef32 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -3489,19 +3489,19 @@ sal_uInt32 ScColumn::GetCodeCount() const
return aFunc.getCount();
}
-SCSIZE ScColumn::GetPatternCount()
+SCSIZE ScColumn::GetPatternCount() const
{
- return this->pAttrArray ? this->pAttrArray->Count() : 0;
+ return pAttrArray ? pAttrArray->Count() : 0;
}
-SCSIZE ScColumn::GetPatternCount( SCROW nRw1, SCROW nRw2 )
+SCSIZE ScColumn::GetPatternCount( SCROW nRow1, SCROW nRow2 ) const
{
- return this->pAttrArray ? this->pAttrArray->Count( nRw1, nRw2 ) : 0;
+ return pAttrArray ? pAttrArray->Count( nRow1, nRow2 ) : 0;
}
-bool ScColumn::ReservedPatternCount( SCSIZE nReserved )
+bool ScColumn::ReservePatternCount( SCSIZE nReserve )
{
- return this->pAttrArray ? this->pAttrArray->Reserve( nReserved ) : false;
+ return pAttrArray ? pAttrArray->Reserve( nReserve ) : false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 2fda595e8f7b..dd25b7bd6a89 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -2016,7 +2016,7 @@ void ScDocument::ExtendPrintArea( OutputDevice* pDev, SCTAB nTab,
maTabs[nTab]->ExtendPrintArea( pDev, nStartCol, nStartRow, rEndCol, nEndRow );
}
-SCSIZE ScDocument::GetPatternCount( SCTAB nTab, SCCOL nCol )
+SCSIZE ScDocument::GetPatternCount( SCTAB nTab, SCCOL nCol ) const
{
if( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
return maTabs[nTab]->GetPatternCount( nCol );
@@ -2024,18 +2024,18 @@ SCSIZE ScDocument::GetPatternCount( SCTAB nTab, SCCOL nCol )
return 0;
}
-SCSIZE ScDocument::GetPatternCount( SCTAB nTab, SCCOL nCol, SCROW nRw1, SCROW nRw2 )
+SCSIZE ScDocument::GetPatternCount( SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW nRow2 ) const
{
if( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
- return maTabs[nTab]->GetPatternCount( nCol, nRw1, nRw2 );
+ return maTabs[nTab]->GetPatternCount( nCol, nRow1, nRow2 );
else
return 0;
}
-bool ScDocument::ReservedPatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserved )
+bool ScDocument::ReservePatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserve )
{
if( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
- return maTabs[nTab]->ReservedPatternCount( nCol, nReserved );
+ return maTabs[nTab]->ReservePatternCount( nCol, nReserve );
else
return false;
}
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 3ed9907a65d7..972cc44d48ac 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2714,7 +2714,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
vvPatternCount[i].resize( vTables.size() );
for (std::vector< SCTAB >::size_type j = 0; j < vTables.size(); ++j)
- vvPatternCount[i][j] = this->GetPatternCount( vTables[j], nCol1+i );
+ vvPatternCount[i][j] = GetPatternCount( vTables[j], nCol1+i );
}
}
@@ -2759,7 +2759,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar
vvPatternCount[i].resize( vTables.size() );
for (std::vector< SCTAB >::size_type j = 0; j<vTables.size(); ++j)
- this->ReservedPatternCount( vTables[j], nCol1+i, vvPatternCount[i][j] + ( this->GetPatternCount( vTables[j], nCol1+i, nR1, nR2 ) ) * ( ( nRow2 - nRow1 + 1 ) / ( nYw + 1 ) ) );
+ ReservePatternCount( vTables[j], nCol1+i, vvPatternCount[i][j] + ( GetPatternCount( vTables[j], nCol1+i, nR1, nR2 ) ) * ( ( nRow2 - nRow1 + 1 ) / ( nYw + 1 ) ) );
}
bNeedPerformanceOptimization4Pattern = false;
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 3afef713bb4f..0755cd668965 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -2076,7 +2076,7 @@ void ScTable::CompileColRowNameFormula()
for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].CompileColRowNameFormula();
}
-SCSIZE ScTable::GetPatternCount( SCCOL nCol )
+SCSIZE ScTable::GetPatternCount( SCCOL nCol ) const
{
if( ValidCol( nCol ) )
return aCol[nCol].GetPatternCount();
@@ -2084,18 +2084,18 @@ SCSIZE ScTable::GetPatternCount( SCCOL nCol )
return 0;
}
-SCSIZE ScTable::GetPatternCount( SCCOL nCol, SCROW nRw1, SCROW nRw2 )
+SCSIZE ScTable::GetPatternCount( SCCOL nCol, SCROW nRow1, SCROW nRow2 ) const
{
- if( ValidCol( nCol ) && ValidRow( nRw1 ) && ValidRow( nRw2 ) )
- return aCol[nCol].GetPatternCount( nRw1, nRw2 );
+ if( ValidCol( nCol ) && ValidRow( nRow1 ) && ValidRow( nRow2 ) )
+ return aCol[nCol].GetPatternCount( nRow1, nRow2 );
else
return 0;
}
-bool ScTable::ReservedPatternCount( SCCOL nCol, SCSIZE nReserved )
+bool ScTable::ReservePatternCount( SCCOL nCol, SCSIZE nReserve )
{
if( ValidCol( nCol ) )
- return aCol[nCol].ReservedPatternCount( nReserved );
+ return aCol[nCol].ReservePatternCount( nReserve );
else
return false;
}