Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 5933)
+++ /CKEditor/trunk/CHANGES.html (revision 5934)
@@ -45,4 +45,5 @@
Fixed issues:
+ - #5399 : Lists pasted from Word do not maintain their nesting.
- #6377 : FF width and height are not shown for smiley in Image properties dialog.
- #5237 : English text in dialogs' title was flipped when using RTL language (office2003 and v2 skins).
Index: /CKEditor/trunk/_source/plugins/pastefromword/filter/default.js
===================================================================
--- /CKEditor/trunk/_source/plugins/pastefromword/filter/default.js (revision 5933)
+++ /CKEditor/trunk/_source/plugins/pastefromword/filter/default.js (revision 5934)
@@ -119,5 +119,5 @@
};
- var cssLengthRelativeUnit = /^(\d[.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz){1}?/i;
+ var cssLengthRelativeUnit = /^([.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz){1}?/i;
var emptyMarginRegex = /^(?:\b0[^\s]*\s*){1,4}$/; // e.g. 0px 0pt 0px
@@ -220,5 +220,5 @@
// Be able to deal with component/short-hand form style.
var values = margin.split( ' ' );
- margin = values[ 3 ] || values[ 1 ] || values [ 0 ];
+ margin = CKEDITOR.plugins.pastefromword.utils.convertToPx( values[ 3 ] || values[ 1 ] || values [ 0 ] );
margin = parseInt( margin, 10 );