summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2013-03-12 13:49:19 +0000
committerFridrich Strba <fridrich@documentfoundation.org>2013-03-12 14:42:08 +0000
commit6d2a17be89e98c6a7d8c172832c9491ce6c50506 (patch)
tree0fd91bb8f69a0233ada29cb6a56edd291f035796
parent3f23ec9b6483506721fe4d140a28705b31a54461 (diff)
fix for fdo#62111 - don't count non-default empty rows as rows to repeat
Change-Id: I075310ef63ab4eb666da2092d4be1c6f8d989b75 Reviewed-on: https://gerrit.libreoffice.org/2681 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
-rw-r--r--sc/source/filter/excel/xetable.cxx11
1 files changed, 7 insertions, 4 deletions
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 );