Merging upstream version 4:24.2.4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 7 insertions, 11 deletions

diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 30f6d6e619..deb0d443b5 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -905,14 +905,14 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
                     for ( size_t n = 0; n < aRangeArr.Count(); ++n )
                     {
                         // no start of a new list
-                        rDoc.SetNumRule( aRangeArr.SetPam( n, aPam ), aRule, false );
+                        rDoc.SetNumRule(aRangeArr.SetPam( n, aPam ), aRule, SwDoc::SetNumRuleMode::Default);
                     }
                     rDoc.GetIDocumentUndoRedo().EndUndo( SwUndoId::END, nullptr );
                 }
                 else
                 {
                     // no start of a new list
-                    rDoc.SetNumRule( rPam, aRule, false );
+                    rDoc.SetNumRule(rPam, aRule, SwDoc::SetNumRuleMode::Default);
                 }
 
             }
@@ -923,7 +923,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
                 if ( !pRule )
                     throw RuntimeException();
                 // no start of a new list
-                rDoc.SetNumRule( rPam, *pRule, false );
+                rDoc.SetNumRule(rPam, *pRule, SwDoc::SetNumRuleMode::Default);
             }
             else
             {
@@ -933,7 +933,7 @@ void setNumberingProperty(const Any& rValue, SwPaM& rPam)
                 SwNumRule* pRule = rDoc.GetOutlineNumRule();
                 if(!pRule)
                     throw RuntimeException();
-                rDoc.SetNumRule( rPam, *pRule, false );
+                rDoc.SetNumRule(rPam, *pRule, SwDoc::SetNumRuleMode::Default);
             }
         }
     }
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 709d79ef4d..9177765c0e 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -608,7 +608,9 @@ static void lcl_ExportBookmark(
         const SwXBookmarkPortion_ImplSharedPtr& pPtr = *aIter;
         if ( nIndex > pPtr->getIndex() )
         {
-            assert(!"Some bookmarks were not consumed earlier");
+            // We may get here, if SwXTextPortionEnumeration ctor was called with nStart greater
+            // than this bookmark's index. Just drop it.
+            aIter = rBkmArr.erase(aIter);
             continue;
         }
         if ( nIndex < pPtr->getIndex() )
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 93603d6d40..3f720e452f 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2337,12 +2337,6 @@ SwXText::copyText(
         // us, even if we have only a single paragraph.
         m_pImpl->m_pDoc->getIDocumentContentOperations().CopyRange(temp, rPos, SwCopyFlags::CheckPosInFly);
     }
-    if (!pFirstNode)
-    {   // the node at rPos was split; get rid of the first empty one so
-        // that the pasted table is first
-        auto pDelCursor(m_pImpl->m_pDoc->CreateUnoCursor(SwPosition(*GetStartNode(), SwNodeOffset(1))));
-        m_pImpl->m_pDoc->getIDocumentContentOperations().DelFullPara(*pDelCursor);
-    }
 }
 
 SwXBodyText::SwXBodyText(SwDoc *const pDoc)