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

We shouldn't skip empty columns, or else column index becomes out of sync.

üst 9776cc15
...@@ -161,6 +161,7 @@ void ScDPCacheTable::fillTable( ...@@ -161,6 +161,7 @@ void ScDPCacheTable::fillTable(
// Data rows // Data rows
for (SCCOL nCol = 0; nCol < nColCount; ++nCol) for (SCCOL nCol = 0; nCol < nColCount; ++nCol)
{ {
maFieldEntries.push_back( vector<SCROW>() );
SCROW nMemCount = getCache()->GetDimMemberCount( nCol ); SCROW nMemCount = getCache()->GetDimMemberCount( nCol );
if ( nMemCount ) if ( nMemCount )
{ {
...@@ -188,7 +189,6 @@ void ScDPCacheTable::fillTable( ...@@ -188,7 +189,6 @@ void ScDPCacheTable::fillTable(
aAdded[nOrder] = nIndex; aAdded[nOrder] = nIndex;
} }
maFieldEntries.push_back( vector<SCROW>() );
for ( SCROW nRow = 0; nRow < nMemCount; nRow++ ) for ( SCROW nRow = 0; nRow < nMemCount; nRow++ )
{ {
if ( aAdded[nRow] != -1 ) if ( aAdded[nRow] != -1 )
...@@ -216,6 +216,7 @@ void ScDPCacheTable::fillTable() ...@@ -216,6 +216,7 @@ void ScDPCacheTable::fillTable()
// Data rows // Data rows
for (SCCOL nCol = 0; nCol < nColCount; ++nCol) for (SCCOL nCol = 0; nCol < nColCount; ++nCol)
{ {
maFieldEntries.push_back( vector<SCROW>() );
SCROW nMemCount = getCache()->GetDimMemberCount( nCol ); SCROW nMemCount = getCache()->GetDimMemberCount( nCol );
if ( nMemCount ) if ( nMemCount )
{ {
...@@ -234,7 +235,6 @@ void ScDPCacheTable::fillTable() ...@@ -234,7 +235,6 @@ void ScDPCacheTable::fillTable()
pAdded[nOrder] = nIndex; pAdded[nOrder] = nIndex;
} }
maFieldEntries.push_back( vector<SCROW>() );
for ( SCROW nRow = 0; nRow < nMemCount; nRow++ ) for ( SCROW nRow = 0; nRow < nMemCount; nRow++ )
{ {
if ( pAdded[nRow] != -1 ) if ( pAdded[nRow] != -1 )
......
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