Kaydet (Commit) dfa7652d authored tarafından Noel Power's avatar Noel Power

fix for fdo#62111 - don't count non-default empty rows as rows to repeat

Change-Id: I075310ef63ab4eb666da2092d4be1c6f8d989b75
üst 28b0168b
...@@ -2052,12 +2052,15 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt ...@@ -2052,12 +2052,15 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt
} }
if ( pPrev ) if ( pPrev )
{ {
sal_uInt32 nRpt = rRow->GetXclRow() - pPrev->GetXclRow();
pPrev->SetXclRowRpt( nRpt );
if ( nRpt > 1 )
aRepeated.push_back( pPrev );
if ( pPrev->IsDefaultable()) if ( pPrev->IsDefaultable())
{ {
// if the previous row we processed is not
// defaultable then afaict the rows inbetween are
// not used ( and not repeatable )
sal_uInt32 nRpt = rRow->GetXclRow() - pPrev->GetXclRow();
if ( nRpt > 1 )
aRepeated.push_back( pPrev );
pPrev->SetXclRowRpt( nRpt );
XclExpDefaultRowData aDefData( *pPrev ); XclExpDefaultRowData aDefData( *pPrev );
size_t& rnDefCount = aDefRowMap[ aDefData ]; size_t& rnDefCount = aDefRowMap[ aDefData ];
rnDefCount += ( pPrev->GetXclRowRpt() - 1 ); rnDefCount += ( pPrev->GetXclRowRpt() - 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