From b6d53ce5359d4f41b9fece475339cdf63c5817e9 Mon Sep 17 00:00:00 2001 From: Gülşah Köse Date: Wed, 10 Feb 2021 08:49:28 +0300 Subject: tdf#139511 Correct calculation of minimum row height during resize. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id47b5877d56850c80395897a83daae8e24f5c099 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110662 Tested-by: Jenkins Reviewed-by: Gülşah Köse --- svx/source/table/tablelayouter.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svx') diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 80d0a52f4db2..2d8de0c1f8e2 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -789,7 +789,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) // Case 2: * Row has "Height" property // * Calculated minimum height is bigger than Height property value and // * Row has not any text of any cell in edit mode in the row (means completely empty) - if ((nMinHeight < nRowPropHeight && nRowPropHeight > 0 ) || + if ((nMinHeight < nRowPropHeight && nRowPropHeight > 0 && (bRowHasText || bRowHasCellInEditMode)) || (nMinHeight > nRowPropHeight && nRowPropHeight > 0 && (!bRowHasText && !bRowHasCellInEditMode))) { nMinHeight = nRowPropHeight; -- cgit