diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2021-02-10 08:49:28 +0300 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2021-02-23 17:06:23 +0100 |
| commit | edc5ea345446fc0ca484a9c854d65dc5c1a39793 (patch) | |
| tree | 88518bb674a11cf7489abaa1f9b023f274cff08f | |
| parent | a6a48971abe61747dc84840890c4bbcbd4c717bf (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
(cherry picked from commit 1fe55d946f8f2adf4a2588dcc7d089b79611eddd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110925
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | svx/source/table/tablelayouter.cxx | 2 |
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; |