vanilla ckeditor-3.4.2

[ckeditor.git] / _source / plugins / pastefromword / filter / default.js

diff --git a/_source/plugins/pastefromword/filter/default.js b/_source/plugins/pastefromword/filter/default.js
index 61ceaf8..e29d1c5 100644 (file)
--- a/_source/plugins/pastefromword/filter/default.js
+++ b/_source/plugins/pastefromword/filter/default.js
@@ -118,7 +118,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                return result;\r
        };\r
 \r
-       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;\r
+       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;\r
        var emptyMarginRegex = /^(?:\b0[^\s]*\s*){1,4}$/;               // e.g. 0px 0pt 0px\r
 \r
        var listBaseIndent = 0,\r
@@ -219,7 +219,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
                                                                        {\r
                                                                                // Be able to deal with component/short-hand form style.\r
                                                                                var values = margin.split( ' ' );\r
-                                                                               margin = values[ 3 ] || values[ 1 ] || values [ 0 ];\r
+                                                                               margin = CKEDITOR.plugins.pastefromword.utils.convertToPx( values[ 3 ] || values[ 1 ] || values [ 0 ] );\r
                                                                                margin = parseInt( margin, 10 );\r
 \r
                                                                                // Figure out the indent unit by looking at the first increament.\r