tdf#91762: Check wether the row and the cell have text...

... in order to set the row's min height

Regression from 4f2c8194f485b1527fb4f4dfe23ce804937f1f9c
After this commit, the row's min height was set based only on
the cells containing text in the row, but the problem appeared
when the row didn't have any cell with text.
Change logic to check wether there's text in the cell and in the row.

Now, height in SdImportTest::testRowHeight() is 507 instead of
508 but I can't figure it out why. However, I believe there's
no harm in change the test from 508 to 507 as, visually speaking,
the difference can't be distinguish.

Change-Id: I0b3a14c34eaeaa8e77227860ca290fb79a0302ce
Reviewed-on: https://gerrit.libreoffice.org/21692
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
(cherry picked from commit 13d4398820ded5914f635757865e258db2db2b57)
Reviewed-on: https://gerrit.libreoffice.org/22008
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

2 files changed, 12 insertions, 2 deletions

diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 6b70d0806e13..b2d1604a0bdc 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -718,7 +718,7 @@ sal_Int32 Cell::getMinimumHeight()
         pEditOutliner->SetMaxAutoPaperSize(aSize);
         nMinimumHeight = pEditOutliner->GetTextHeight()+1;
     }
-    else if ( hasText() )
+    else
     {
         Outliner& rOutliner=rTableObj.ImpGetDrawOutliner();
         rOutliner.SetPaperSize(aSize);
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 892b0d911660..1df137851e40 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -688,6 +688,7 @@ void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit )
         sal_Int32 nMinHeight = 0;
 
         bool bIsEmpty = true; // check if all cells in this row are merged
+        bool bRowHasText = false;
 
         for( nCol = 0; nCol < nColCount; ++nCol )
         {
@@ -704,7 +705,16 @@ void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit )
                 }
                 else
                 {
-                    nMinHeight = std::max( nMinHeight, xCell->getMinimumHeight() );
+                    bool bCellHasText = xCell->hasText();
+                    if ( (!bRowHasText && !bCellHasText) || ( bRowHasText && bCellHasText ) )
+                    {
+                        nMinHeight = std::max( nMinHeight, xCell->getMinimumHeight() );
+                    }
+                    else if ( !bRowHasText && bCellHasText )
+                    {
+                        bRowHasText = true;
+                        nMinHeight = xCell->getMinimumHeight();
+                    }
                 }
             }
         }