Merging upstream version 4:24.2.4.

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

2 files changed, 22 insertions, 10 deletions

diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 74b123dc46..264860b854 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -98,6 +98,8 @@ enum class DocumentSettingId
     ALLOW_TEXT_AFTER_FLOATING_TABLE_BREAK,
     // tdf#119908 new paragraph justification
     JUSTIFY_LINES_WITH_SHRINKING,
+    APPLY_TEXT_ATTR_TO_EMPTY_LINE_AT_END_OF_PARAGRAPH,
+    DO_NOT_MIRROR_RTL_DRAW_OBJS,
     // COMPATIBILITY FLAGS END
     BROWSE_MODE,
     HTML_MODE,
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 99cb33c758..946c96fd29 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1052,23 +1052,30 @@ public:
 
     bool GotoOutline(SwPosition& rPos, const OUString& rName, SwRootFrame const* = nullptr) const;
 
-    /** Accept changes of outline styles for OutlineRule.
-     @param bResetIndentAttrs Optional parameter - default value false:
-      If <bResetIndentAttrs> equals true, the indent attributes "before text"
-      and "first line indent" are additionally reset at the provided PaM, if
-      the list style makes use of the new list level attributes.
-     @param bCreateNewList indicates if a new list is created by applying the given list style.
+    enum class SetNumRuleMode {
+        Default = 0,
+        /// indicates if a new list is created by applying the given list style.
+        CreateNewList = 1,
+        DontSetItem = 2,
+        /** If enabled, the indent attributes "before text" and
+          "first line indent" are additionally reset at the provided PaM,
+          if the list style makes use of the new list level attributes. */
+        ResetIndentAttrs = 4,
+        DontSetIfAlreadyApplied = 8
+    };
+
+    /** Set or change numbering rule on text nodes, as direct formatting.
      @param sContinuedListId If bCreateNewList is false, may contain the
       list Id of a list which has to be continued by applying the given list style
 
      @return the set ListId if bSetItem is true */
     OUString SetNumRule( const SwPaM&,
                      const SwNumRule&,
-                     bool bCreateNewList,
+                     SetNumRuleMode mode,
                      SwRootFrame const* pLayout = nullptr,
                      const OUString& sContinuedListId = OUString(),
-                     bool bSetItem = true,
-                     const bool bResetIndentAttrs = false );
+                     SvxTextLeftMarginItem const* pTextLeftMarginToPropagate = nullptr,
+                     SvxFirstLineIndentItem const* pFirstLineIndentToPropagate = nullptr);
     void SetCounted(const SwPaM&, bool bCounted, SwRootFrame const* pLayout);
 
     void MakeUniqueNumRules(const SwPaM & rPaM);
@@ -1145,7 +1152,9 @@ public:
                                     int nNonEmptyAllowed,
                                     OUString& sListId,
                                     SwRootFrame const* pLayout,
-                                    const bool bInvestigateStartNode = false );
+                                    const bool bInvestigateStartNode = false,
+                                    SvxTextLeftMarginItem const** o_ppTextLeftMargin = nullptr,
+                                    SvxFirstLineIndentItem const** o_ppFirstLineIndent = nullptr);
 
     // Paragraphs without numbering but with indents.
     bool NoNum( const SwPaM& );
@@ -1704,6 +1713,7 @@ private:
 
 namespace o3tl {
     template<> struct typed_flags<SwDoc::RowColMode> : is_typed_flags<SwDoc::RowColMode, 3> {};
+    template<> struct typed_flags<SwDoc::SetNumRuleMode> : is_typed_flags<SwDoc::SetNumRuleMode, 0x0f> {};
 }
 
 // This method is called in Dtor of SwDoc and deletes cache of ContourObjects.