core.git: Branch 'feature/cib_contract49d' - sw/source

[Oliver Specht (via logerrit)]

 sw/source/core/text/porlay.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit edc22ef4bee089104a2419386d3c609083370363
Author:     Oliver Specht <oliver.spe...@cib.de>
AuthorDate: Wed Oct 30 10:16:49 2024 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Wed Oct 30 11:47:48 2024 +0100

    tdf#162268 Fix merge error
    
    Fixes accidental comment in commit c62f17d84f1bbd67b9154c08c5559ee6b8042f23
    
    Change-Id: I19cccce0950f53ee499f1cca519969e7aed94692
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175818
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
    Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de>

diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index 17439fe3af6f..41bd5c098dba 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -687,7 +687,7 @@ void SwLineLayout::CalcLine( SwTextFormatter &rLine, 
SwTextFormatInfo &rInf )
         else
         {
             bHasOnlyBlankPortions = false;
-            //bHasNonBlankPortions = true;
+            bHasNonBlankPortions = true;
         }
     }