diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2021-02-10 08:49:28 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-02-17 09:15:27 +0100 |
| commit | 52a666e3ee429c1041ab74b1c005cf484b7e0d6f (patch) | |
| tree | e59b46646a8ad0adf304c87b7a0e3a3ec948873f | |
| parent | 11c5329669e7a908b43a3fe51a673e8d78740f8c (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>
(cherry picked from commit b6d53ce5359d4f41b9fece475339cdf63c5817e9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110930
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -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 3e7ff37c00ac..5ee25af7be86 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -794,7 +794,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) // Case 2: * Row has "Heigth" property // * Calculated minimum heigth is bigger than Height propery 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; |