Index: _whatsnew.html
===================================================================
--- _whatsnew.html (revision 2145)
+++ _whatsnew.html (working copy)
@@ -64,6 +64,8 @@
[#2322] Fixed the issue
where the fit window command loses the current selection and scroll position in the
editing area.
+ [#2272] Improved the
+ garbage filter in Paste from Word dialog.
See previous versions history
Index: editor/dialog/fck_paste.html
===================================================================
--- editor/dialog/fck_paste.html (revision 2145)
+++ editor/dialog/fck_paste.html (working copy)
@@ -187,7 +187,7 @@
var html = oNode.innerHTML ;
html = html.replace(/\s*<\/o:p>/g, '') ;
- html = html.replace(/.*?<\/o:p>/g, ' ') ;
+ html = html.replace(/[\s\S]*?<\/o:p>/g, ' ') ;
// Remove mso-xxx styles.
html = html.replace( /\s*mso-[^:]+:[^;"]+;?/gi, '' ) ;
@@ -224,6 +224,10 @@
if ( bRemoveStyles )
html = html.replace( /<(\w[^>]*) style="([^\"]*)"([^>]*)/gi, "<$1$3" ) ;
+ // Remove style, meta and link tags
+ html = html.replace( /