Resolves: #i124371# When changing the numbering or bullet styling...

of a set of paragraph which have more than one different List Style applied
create a new List Style and put the paragraphs into a new list.

(cherry picked from commit 0087ca89e3905009ed947c651f3dc70f3d61ea93)

Conflicts:
sw/inc/doc.hxx
sw/inc/docsh.hxx
sw/inc/editsh.hxx
sw/source/core/doc/docnum.cxx
sw/source/core/docnode/ndcopy.cxx
sw/source/core/edit/autofmt.cxx
sw/source/core/edit/ednumber.cxx
sw/source/core/uibase/app/docst.cxx
sw/source/core/uibase/docvw/edtwin.cxx
sw/source/core/uibase/inc/textsh.hxx
sw/source/core/uibase/shells/listsh.cxx
sw/source/core/uibase/shells/textsh1.cxx
sw/source/core/uibase/shells/txtnum.cxx
sw/source/core/uibase/uiview/formatclipboard.cxx
sw/source/core/uibase/uiview/view2.cxx
sw/source/core/uibase/wrtsh/wrtsh1.cxx
sw/source/core/undo/unnum.cxx
sw/source/core/unocore/unocrsrhelper.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/ui/misc/num.cxx

Change-Id: Iadb5b386cada296d90d96aa75574024baac7ae3e

1 files changed, 15 insertions, 16 deletions

diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index f2d11c4eb23d..c03d5bf2444a 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -456,20 +456,20 @@ public:
 
     sal_Bool IsProtectedOutlinePara() const;
 
-    /// @return numbering rulse pf current enumeration list (else FALSE).
-    const SwNumRule* GetCurNumRule() const;
-
-    /** If there is not already a numbering, set one, else change.
-     Works with old and new rules. Update only differences.
-     Add optional parameter @param <bResetIndentAttrs> (default value sal_False).
-     If @param <bResetIndentAttrs> equals true, the indent attributes "before text"
-     and "first line indent" are additionally reset at the current selection,
-     if the list style makes use of the new list level attributes.
-     introduce parameters @param <bCreateNewList> and @param <sContinuedListId>
-     @param <bCreateNewList> indicates, if a new list is created by applying the
-     given list style.
-     If @param <bCreateNewList> equals sal_False, @param <sContinuedListId> may contain the
-     list Id of a list, which has to be continued by applying the given list style. */
+    const SwNumRule* GetNumRuleAtCurrCrsrPos() const;
+
+    /** Returns the numbering rule found at the paragraphs of the current selection,
+       if all paragraphs of the current selection have the same or none numbering rule applied. */
+    const SwNumRule* GetNumRuleAtCurrentSelection() const;
+
+    /** Optional parameter <bResetIndentAttrs> (default value sal_False).
+        If <bResetIndentAttrs> equals true, the indent attributes "before text"
+        and "first line indent" are additionally reset at the current selection,
+        if the list style makes use of the new list level attributes.
+       Parameters <bCreateNewList> and <sContinuedListId>
+        <bCreateNewList> indicates, if a new list is created by applying the given list style.
+        If <bCreateNewList> equals false, <sContinuedListId> may contain the
+        list Id of a list, which has to be continued by applying the given list style */
     void SetCurNumRule( const SwNumRule&,
                         const bool bCreateNewList /*= false*/,
                         const OUString& sContinuedListId = OUString(),
@@ -496,8 +496,7 @@ public:
     void ChangeIndentOfAllListLevels( short nDiff );
     // Adjust method name
     void SetIndent(short nIndent, const SwPosition & rPos);
-    bool IsFirstOfNumRule() const;
-    bool IsFirstOfNumRule(const SwPaM & rPaM) const;
+    bool IsFirstOfNumRuleAtCrsrPos() const;
 
     sal_Bool IsNoNum( sal_Bool bChkStart = sal_True ) const;