Ticket #4906: 4906.patch

_source/plugins/pastefromword/filter/default.js

@@ -257 +257 @@
 
                                 return function( cssLength )
                                 {
-                                        if( cssLength.indexOf( '%' ) == -1 )
+                                        if( cssLengthRelativeUnit.test( cssLength ) )
                                         {
                                                 calculator.setStyle( 'width', cssLength );
                                                 return calculator.$.clientWidth + 'px';
@@ -626 +626 @@
                                                         && attrs.style )
                                                 {
                                                         attrs.style = stylesFilter(
-                                                                                [ [ ( /^width|height$/ ), null, convertToPx ] ] )( attrs.style ) || '';
+                                                                                [ [ ( /^(:?width|height)$/ ), null, convertToPx ] ] )( attrs.style ) || '';
                                                 }
 
                                                 // Processing headings.