1 files changed, 11 insertions, 4 deletions
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 8f3f8284d850..f1b179518f4f 100755
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -148,6 +148,16 @@ sal_uInt16 SwTextFormatter::GetFrameRstHeight() const
         return sal_uInt16( nHeight );
 }
 
+bool SwTextFormatter::ClearIfIsFirstOfBorderMerge(const SwLinePortion* pPortion)
+{
+    if (pPortion == m_pFirstOfBorderMerge)
+    {
+        m_pFirstOfBorderMerge = nullptr;
+        return true;
+    }
+    return false;
+}
+
 SwLinePortion *SwTextFormatter::Underflow( SwTextFormatInfo &rInf )
 {
     // Save values and initialize rInf
@@ -276,11 +286,8 @@ SwLinePortion *SwTextFormatter::Underflow( SwTextFormatInfo &rInf )
     SwLinePortion* pNext = pPor->GetPortion();
     while (pNext)
     {
-        if (pNext == m_pFirstOfBorderMerge)
-        {
-            m_pFirstOfBorderMerge = nullptr;
+        if (ClearIfIsFirstOfBorderMerge(pNext))
             break;
-        }
         pNext = pNext->GetPortion();
     }
     pPor->Truncate();