core.git: sw/source

[Xisco Fauli (via logerrit)]

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

New commits:
commit 689a004df332888d5eca0b3386b84c82744e2b74
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon Feb 3 14:27:52 2025 +0100
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Feb 3 16:05:27 2025 +0100

    sw: fix wrong condition
    
    Changed by mistake in
    commit 6b09bec95747d3bd9871bab3f49142a2fca2d368
    Author: Xisco Fauli <xiscofa...@libreoffice.org>
    Date:   Fri Nov 29 18:36:52 2024 +0100
    
        sw: use SAL_RET_MAYBENULL in Lower()
    
    Kudos to Michael S. for finding it
    
    Change-Id: Iaebcfee19da5b56a012f437cd5189e95cb56ace5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181045
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 56f381729bb8..e61ccacaaafb 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -6130,7 +6130,7 @@ void SwCellFrame::Format( vcl::RenderContext* 
/*pRenderContext*/, const SwBorder
          !IsCoveredCell() &&
          (pPg = FindPageFrame())!=nullptr )
     {
-        if ( !pLower->IsContentFrame() && pLower->IsSctFrame() && 
!pLower->IsTabFrame() )
+        if ( !pLower->IsContentFrame() && !pLower->IsSctFrame() && 
!pLower->IsTabFrame() )
         {
             // OSL_ENSURE(for HTML-import!
             OSL_ENSURE( false, "VAlign to cell without content" );