[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - svx/source

[Gülşah Köse (via logerrit)]

 svx/source/table/tablelayouter.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1fe55d946f8f2adf4a2588dcc7d089b79611eddd
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Wed Feb 10 08:49:28 2021 +0300
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Feb 16 12:01:29 2021 +0100

    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 at collabora.com>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110974

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;