Kaydet (Commit) d3469ce8 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Do the same for the no-parameter variant of fillTable().

Change-Id: I698e70e7713697e2951c3e6ead4b4d2198d8a6cf
üst 1b9a8efb
...@@ -209,14 +209,19 @@ void ScDPCacheTable::fillTable( ...@@ -209,14 +209,19 @@ void ScDPCacheTable::fillTable(
void ScDPCacheTable::fillTable() void ScDPCacheTable::fillTable()
{ {
const SCROW nRowCount = getRowSize(); SCROW nRowCount = getRowSize();
const SCCOL nColCount = (SCCOL) getColSize(); SCCOL nColCount = getColSize();
if ( nRowCount <= 0 || nColCount <= 0) if (nRowCount <= 0 || nColCount <= 0)
return; return;
maRowFlags.clear(); maRowFlags.clear();
maRowFlags.reserve(nRowCount); maRowFlags.reserve(nRowCount);
for (SCROW nRow = 0; nRow < nRowCount; ++nRow)
{
maRowFlags.push_back(RowFlag());
maRowFlags.back().mbShowByFilter = true;
}
// Initialize field entries container. // Initialize field entries container.
maFieldEntries.clear(); maFieldEntries.clear();
...@@ -227,28 +232,21 @@ void ScDPCacheTable::fillTable() ...@@ -227,28 +232,21 @@ void ScDPCacheTable::fillTable()
{ {
maFieldEntries.push_back( vector<SCROW>() ); maFieldEntries.push_back( vector<SCROW>() );
SCROW nMemCount = getCache()->GetDimMemberCount( nCol ); SCROW nMemCount = getCache()->GetDimMemberCount( nCol );
if ( nMemCount ) if (!nMemCount)
{ continue;
std::vector< SCROW > pAdded( nMemCount, -1 );
for (SCROW nRow = 0; nRow < nRowCount; ++nRow ) std::vector<SCROW> aAdded(nMemCount, -1);
{
SCROW nIndex = getCache()->GetItemDataId( nCol, nRow, false );
SCROW nOrder = getOrder( nCol, nIndex );
if ( nCol == 0 ) for (SCROW nRow = 0; nRow < nRowCount; ++nRow)
{ {
maRowFlags.push_back(RowFlag()); SCROW nIndex = getCache()->GetItemDataId(nCol, nRow, false);
maRowFlags.back().mbShowByFilter = true; SCROW nOrder = getOrder(nCol, nIndex);
} aAdded[nOrder] = nIndex;
pAdded[nOrder] = nIndex;
} }
for ( SCROW nRow = 0; nRow < nMemCount; nRow++ ) for (SCROW nRow = 0; nRow < nMemCount; ++nRow)
{ {
if ( pAdded[nRow] != -1 ) if (aAdded[nRow] != -1)
maFieldEntries.back().push_back( pAdded[nRow] ); maFieldEntries.back().push_back(aAdded[nRow]);
}
} }
} }
} }
......
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