ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#123971 don't clobber entire RowHeight range on updates

Browse Source 
Use start index from current loop variable, not full range; otherwise
we're always clobbering values from (possibly higher) upper rows.

Change-Id: I3add7c2358710f4ae3927e7b0a1c1ff544965a03
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88785
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
This commit is contained in:
Thorsten Behrens
2020-02-17 00:41:07 +01:00
parent bcc942fc34
commit f55140c737
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc/qa/unit/data/ods/autoheight2rows.ods
BIN
View File
Binary file not shown.
sc/qa/unit/subsequent_filters-test.cxx
+7 -2
View File
@@ -4323,11 +4323,16 @@ void ScFiltersTest::testAutoheight2Rows()
SCTAB nTab = 0;
int nHeight1 = rDoc.GetRowHeight(0, nTab, false);
int nHeight3 = rDoc.GetRowHeight(2, nTab, false);
int nHeight2 = rDoc.GetRowHeight(1, nTab, false);
int nHeight4 = rDoc.GetRowHeight(3, nTab, false);
int nHeight5 = rDoc.GetRowHeight(4, nTab, false);
// We will do relative comparison, because calculated autoheight
// can be different on different platforms
CPPUNIT_ASSERT_MESSAGE("Row #3 should be thinner than #1", nHeight3 < nHeight1);
CPPUNIT_ASSERT_MESSAGE("Row #1 and row #4 must have same height after load & auto-adjust",
abs( nHeight1 - nHeight4 ) < 10 );
CPPUNIT_ASSERT_MESSAGE("Row #2 and row #5 must have same height after load & auto-adjust",
abs( nHeight2 - nHeight5 ) < 10 );
xDocSh->DoClose();
}
sc/source/core/data/segmenttree.cxx
+3 -1
View File
@@ -110,7 +110,9 @@ void ScFlatSegmentsImpl<ValueType_, ExtValueType_>::setValueIf(SCCOLROW nPos1, S
getRangeData(nCurrentStartRow, aRangeData);
if (rPredicate(aRangeData.mnValue))
{
setValue(nPos1, std::min<SCCOLROW>(nPos2, aRangeData.mnPos2), nValue);
// set value from current iteration point on, til end of range.
// Note that aRangeData may well contain much lower values for nPos1
setValue(nCurrentStartRow, std::min<SCCOLROW>(nPos2, aRangeData.mnPos2), nValue);
}
// even if nPos2 is bigger than nPos2 this should terminate the loop