summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorGülşah Köse <gulsah.kose@collabora.com>2021-02-10 08:49:28 +0300
committerXisco Fauli <xiscofauli@libreoffice.org>2021-02-16 12:01:29 +0100
commit1fe55d946f8f2adf4a2588dcc7d089b79611eddd (patch)
tree8a1fe9b1c8dfedb29c30344959e479d1c8c170a9 /svx
parent33e69fb9ef450169e7d85ae3215fd9a4fc8082c2 (diff)
tdf#139511 Correct calculation of minimum row height during resize.
Change-Id: Id47b5877d56850c80395897a83daae8e24f5c099 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110662 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110974
Diffstat (limited to 'svx')
-rw-r--r--svx/source/table/tablelayouter.cxx2
1 files changed, 1 insertions, 1 deletions
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;