Ticket #4945: 4945.patch

_source/plugins/pastefromword/filter/default.js

@@ -325 +325 @@
                                                 child = children[ i ];
                                                 var attributes = child.attributes;
 
+                                                // #4945: Paste: Outline Numbered list do not copy correctly v2
+                                                if ( attributes )
+                                                {
+                                                        attributes.style = CKEDITOR.plugins.pastefromword.filters.stylesFilter(
+                                                                [
+                                                                        // Resolve indent level from 'tab-stops' value.
+                                                                        [ ( /^tab-stops$/ ), null, function( margin )
+                                                                        {
+                                                                                // Be able to deal with component/short-hand form style.
+                                                                                var values = margin.split( ' ' );
+                                                                                margin = values[ 3 ] || values[ 1 ] || values [ 0 ];
+                                                                                margin = parseInt( margin, 10 );
+
+                                                                                // Figure out the indent unit by looking at the first increament.
+                                                                                if ( !listBaseIndent && previousListItemMargin && margin > previousListItemMargin )
+                                                                                        listBaseIndent = margin - previousListItemMargin;
+
+                                                                                attributes[ 'cke:margin' ] = previousListItemMargin = margin;
+                                                                        } ]
+                                                        ] )( attributes.style, element ) || '' ;
+                                                }
+
                                                 if ( child.name in CKEDITOR.dtd.$listItem )
                                                 {
                                                         var listItemChildren = child.children,
@@ -344 +366 @@
 
                                                         child.name = 'cke:li';
                                                         attributes[ 'cke:indent' ] = indentLevel;
-                                                        previousListItemMargin = 0;
                                                         attributes[ 'cke:listtype' ] = element.name;
                                                         listStyleType && child.addStyle( 'list-style-type', listStyleType, true );
                                                 }