Index: _source/plugins/pastefromword/dialogs/pastefromword.js
===================================================================
--- _source/plugins/pastefromword/dialogs/pastefromword.js (revision 3900)
+++ _source/plugins/pastefromword/dialogs/pastefromword.js Thu Jul 16 15:29:30 CST 2009
@@ -23,6 +23,9 @@
+ '',
cleanWord : function( editor, html, ignoreFont, removeStyles )
{
+ // Remove comments [SF BUG-1481861].
+ html = html.replace(/<\!--[\s\S]*?-->/g, '' ) ;
+
html = html.replace(/\s*<\/o:p>/g, '') ;
html = html.replace(/[\s\S]*?<\/o:p>/g, ' ') ;
@@ -88,9 +91,6 @@
// Remove Tags with XML namespace declarations: <\/o:p>
html = html.replace(/<\/?\w+:[^>]*>/gi, '' ) ;
- // Remove comments [SF BUG-1481861].
- html = html.replace(/<\!--[\s\S]*?-->/g, '' ) ;
-
html = html.replace( /<(U|I|STRIKE)> <\/\1>/g, ' ' ) ;
html = html.replace( /\s*<\/H\d>/gi, '' ) ;
Index: CHANGES.html
===================================================================
--- CHANGES.html (revision 3901)
+++ CHANGES.html Thu Jul 16 14:10:22 CST 2009
@@ -138,6 +138,7 @@
#3837 : Brazilian Portuguese.
+ #3959 : Pasting styled text from word result in content lost.
CKEditor 3.0 RC