From 57752914d10557383e8dd59a2c8f9ab5901ddc57 Mon Sep 17 00:00:00 2001 From: Gülşah Köse Date: Fri, 6 Nov 2020 21:18:24 +0300 Subject: tdf#137949 Fix table row heigths. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consider "Height" property of the the table while calculating the minimum row height. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105422 Tested-by: Jenkins Tested-by: Xisco Fauli Reviewed-by: Xisco Fauli Reviewed-by: Gülşah Köse (cherry picked from commit b7b05dd36403af50b20fe06cbf8a10d8defb28a9) Change-Id: I4dbb0f7f87517423fd3075515b4b9817d6a9a71a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105466 Tested-by: Jenkins CollaboraOffice Reviewed-by: Gülşah Köse --- svx/source/table/tablelayouter.cxx | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) (limited to 'svx') diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 11ac8da225d8..3e7ff37c00ac 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -730,6 +730,7 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) { const sal_Int32 nColCount = getColumnCount(); const sal_Int32 nRowCount = getRowCount(); + if( nRowCount == 0 ) return; @@ -746,10 +747,14 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) sal_Int32 nCol, nRow; for( nRow = 0; nRow < nRowCount; ++nRow ) { + Reference< XPropertySet > xRowSet( xRows->getByIndex(nRow), UNO_QUERY_THROW ); + sal_Int32 nRowPropHeight = 0; + xRowSet->getPropertyValue( gsSize ) >>= nRowPropHeight; sal_Int32 nMinHeight = 0; bool bIsEmpty = true; // check if all cells in this row are merged bool bRowHasText = false; + bool bRowHasCellInEditMode = false; for( nCol = 0; nCol < nColCount; ++nCol ) { @@ -767,7 +772,12 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) else { bool bCellHasText = xCell->hasText(); - if (bRowHasText == bCellHasText) + bool bCellInEditMode = xCell->IsTextEditActive(); + + if (!bRowHasCellInEditMode && bCellInEditMode) + bRowHasCellInEditMode = true; + + if ((bRowHasText == bCellHasText) || (bRowHasText && bCellInEditMode)) { nMinHeight = std::max( nMinHeight, xCell->getMinimumHeight() ); } @@ -776,6 +786,19 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) bRowHasText = true; nMinHeight = xCell->getMinimumHeight(); } + + // tdf#137949 We should consider "Heigth" property while calculating minimum height. + // This control decides when we use "Heigth" property value instead of calculated minimum height + // Case 1: * Row has "Heigth" property + // * Calculated minimum heigth is smaller than Height propery value. + // 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 ) || + (nMinHeight > nRowPropHeight && nRowPropHeight > 0 && (!bRowHasText && !bRowHasCellInEditMode))) + { + nMinHeight = nRowPropHeight; + } } } } @@ -789,7 +812,6 @@ void TableLayouter::LayoutTableHeight( tools::Rectangle& rArea, bool bFit ) else { sal_Int32 nRowHeight = 0; - Reference< XPropertySet > xRowSet( xRows->getByIndex(nRow), UNO_QUERY_THROW ); bool bOptimal = false; xRowSet->getPropertyValue( sOptimalSize ) >>= bOptimal; -- cgit