From dfa7652da571066e7c69042d4893a5f483f56b0e Mon Sep 17 00:00:00 2001 From: Noel Power Date: Tue, 12 Mar 2013 13:49:19 +0000 Subject: fix for fdo#62111 - don't count non-default empty rows as rows to repeat Change-Id: I075310ef63ab4eb666da2092d4be1c6f8d989b75 --- sc/source/filter/excel/xetable.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'sc') diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index c44b32c1dcfa..4f5d2e4069e4 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2052,12 +2052,15 @@ void XclExpRowBuffer::Finalize( XclExpDefaultRowData& rDefRowData, const ScfUInt } if ( pPrev ) { - sal_uInt32 nRpt = rRow->GetXclRow() - pPrev->GetXclRow(); - pPrev->SetXclRowRpt( nRpt ); - if ( nRpt > 1 ) - aRepeated.push_back( pPrev ); 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 ); size_t& rnDefCount = aDefRowMap[ aDefData ]; rnDefCount += ( pPrev->GetXclRowRpt() - 1 ); -- cgit