core.git: sw/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit 378ebc64958e3172033b1dd417361a5673cf82bf
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Feb 3 16:06:15 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sun Feb 4 08:51:24 2024 +0100

    SwLayoutFrame::IsAnLower returns false if passed nullptr
    
    so this is equivalent to what was already here
    
    and make this block and the previous block more uniform
    
    {
        const SwFrame *pUp = pAssumed;
        while ( pUp )
        {
            if (!pUp->IsInDtor())
            {
                if (pUp == this)
                    return true;
                if (pUp->IsFlyFrame())
                    pUp = static_cast<const
    SwFlyFrame*>(pUp)->GetAnchorFrame();
                else
                    pUp = pUp->GetUpper();
            }
            else
                break;
        }
        return false;
    }
    
    Change-Id: I763722f7b33a3d8148d46c9d30386c6c3f8663ad
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162959
    Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index ec56a5285675..98c58068d3ef 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -1747,7 +1747,7 @@ static void lcl_FindStartEndCol( const SwLayoutFrame 
*&rpStart,
         while ( pTmpLeaf && aRectFnSet.GetLeft(pTmpLeaf->getFrameArea()) > nEX 
)
             pTmpLeaf = pTmpLeaf->GetPrevLayoutLeaf();
         const SwTabFrame *pTmpTab = rpEnd->FindTabFrame();
-        if ( !pTmpLeaf || !pTmpTab->IsAnLower( pTmpLeaf ) )
+        if ( !pTmpTab->IsAnLower( pTmpLeaf ) )
         {
             pTmpTab = static_cast<const SwTabFrame*>(pTmpTab->FindPrev());
             OSL_ENSURE( pTmpTab->IsTabFrame(), "Predecessor of Follow not 
Master.");