calc66: #i117315# round-down single row height values in GetScaledRowHeight

1 files changed, 16 insertions, 2 deletions

diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 1137eff4401b..4f18036a9b51 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -2731,8 +2731,22 @@ sal_uLong ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fS
             {
                 if (nLastRow > nEndRow)
                     nLastRow = nEndRow;
-                sal_uInt32 nThisHeight = mpRowHeights->getSumValue(nRow, nLastRow);
-                nHeight += static_cast<sal_uLong>(nThisHeight * fScale);
+
+                // #i117315# can't use getSumValue, because individual values must be rounded
+                while (nRow <= nLastRow)
+                {
+                    ScFlatUInt16RowSegments::RangeData aData;
+                    if (!mpRowHeights->getRangeData(nRow, aData))
+                        return nHeight;   // shouldn't happen
+
+                    SCROW nSegmentEnd = std::min( nLastRow, aData.mnRow2 );
+
+                    // round-down a single height value, multiply resulting (pixel) values
+                    sal_uLong nOneHeight = static_cast<sal_uLong>( aData.mnValue * fScale );
+                    nHeight += nOneHeight * ( nSegmentEnd + 1 - nRow );
+
+                    nRow = nSegmentEnd + 1;
+                }
             }
             nRow = nLastRow + 1;
         }