Ticket #4944: 4944.patch

_source/plugins/pastefromword/filter/default.js

@@ -228 +228 @@
                                                                                 !listBaseIndent && ( listBaseIndent = value );
 
                                                                                 // Indent level start with one.
-                                                                                attrs[ 'cke:indent' ] = Math.floor( value / listBaseIndent ) + 1;
+                                                                                attrs[ 'cke:indent' ] = Math.floor( value / listBaseIndent );
+
                                                                         } ]
                                                         ] )( attrs.style, element ) || '' ;
                                         }
@@ -400 +401 @@
 
                                                         if ( !list )
                                                         {
-                                                                parentList = list = new CKEDITOR.htmlParser.element( listType );
+                                                                list = new CKEDITOR.htmlParser.element( listType );
                                                                 list.add( listItem );
                                                                 children[ i ] = list;
                                                         }
@@ -408 +409 @@
                                                         {
                                                                 if ( listItemIndent > indent )
                                                                 {
-                                                                        parentList = list;
                                                                         list = new CKEDITOR.htmlParser.element( listType );
                                                                         list.add( listItem );
                                                                         lastListItem.add( list );
                                                                 }
                                                                 else if ( listItemIndent < indent )
                                                                 {
-                                                                        list = parentList;
-                                                                        parentList = list.parent ? list.parent.parent : list;
+                                                                        // There might be a negative gap between two list levels. (#4944)
+                                                                        var diff = indent - listItemIndent;
+                                                                        while( diff-- )
+                                                                                list = list.parent.parent;
+
                                                                         list.add( listItem );
                                                                 }
                                                                 else