[Libreoffice-commits] core.git: sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/text/itrform2.cxx |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit aac624d1e3cd6fc023e25fedbfe48ed330a308ec
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Mar 6 08:22:40 2023 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Mar 6 09:53:27 2023 +0000

    sw floattable: clean up not needed scope in SwTextFormatter::FormatLine()
    
    Leftover from commit 25a16e7543965565a4227506003adc916deea500 (sw
    floattable: fix cid#1520804, 2023-02-09).
    
    Change-Id: Iecf4d8708c6acc3a49a0a987370911f32e6ac3e8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148295
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins

diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index e9e9e0f685a2..3e5d03ff7521 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1933,13 +1933,11 @@ TextFrameIndex 
SwTextFormatter::FormatLine(TextFrameIndex const nStartPos)
             m_pCurr->Height( GetFrameRstHeight() + 1, false );
             m_pCurr->SetRealHeight( GetFrameRstHeight() + 1 );
 
+            // 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.
+            if (m_pFrame->HasNonLastSplitFlyDrawObj())
             {
-                // 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.
-                if (m_pFrame->HasNonLastSplitFlyDrawObj())
-                {
-                    m_pCurr->SetRealHeight(GetFrameRstHeight());
-                }
+                m_pCurr->SetRealHeight(GetFrameRstHeight());
             }
 
             m_pCurr->Width(0);