sw/source/core/text/itrform2.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 25a16e7543965565a4227506003adc916deea500
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Feb 9 08:22:16 2023 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Feb 9 08:18:32 2023 +0000

    sw floattable: fix cid#1520804
    
    GetFrameRstHeight() already assumes the m_pFrame is non-nullptr, so no
    need to check for this.
    
    The logic in the block will be necessary elsewhere as well, I'll extract
    that to a function in a follow-up change, so let's just do a minimal fix
    here.
    
    Change-Id: I6cb2a44e629c273f473278d61607705a2b9a7a4d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146679
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>

diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index e65468d62d4c..03ce7666c911 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1933,7 +1933,6 @@ TextFrameIndex SwTextFormatter::FormatLine(TextFrameIndex 
const nStartPos)
             m_pCurr->Height( GetFrameRstHeight() + 1, false );
             m_pCurr->SetRealHeight( GetFrameRstHeight() + 1 );
 
-            if (m_pFrame)
             {
                 // Don't oversize the line in case of split flys, so we don't 
try to move the anchor
                 // of a precede fly forward, next to its follow.

Reply via email to