Merge branch 't/17001' into major

plugins/pastefromword/filter/default.js

@@ -385,6 +385,13 @@
 				'style': function() {
 					// We don't want to let any styles in. Firefox tends to add some.
 					return false;
+				},
+
+				'object': function( element ) {
+					// The specs about object `data` attribute:
+					// 		Address of the resource as a valid URL. At least one of data and type must be defined.
+					// If there is not `data`, skip the object element. (#17001)
+					return !!( element.attributes && element.attributes.data );
 				}
 			},
 			attributes: {

tests/plugins/pastefromword/generated/_fixtures/Object/expected.html

@@ -0,0 +1,85 @@
+<p style="margin-left:0in; margin-right:0in">
+	<span style="font-size:12pt">
+		<span style="font-family:times new roman,serif">
+			<span style="font-family:arial,sans-serif">text with arial font</span>
+		</span>
+	</span>
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<br />
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<span style="font-size:12pt">
+		<span style="font-family:times new roman,serif">
+			<span style="font-family:comic sans ms">text with comic sans ms font</span>
+		</span>
+	</span>
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<br />
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<span style="font-size:12pt">
+		<span style="font-family:times new roman,serif">
+			<span style="font-family:courier new">text with courier new font</span>
+		</span>
+	</span>
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<br />
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<span style="font-size:12pt">
+		<span style="font-family:times new roman,serif">
+			<span style="font-family:georgia,serif">text with georgia font</span>
+		</span>
+	</span>
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<br />
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<span style="font-size:12pt">
+		<span style="font-family:times new roman,serif">
+			<span style="font-family:lucida sans unicode,sans-serif">text with lucida sans unicode font</span>
+		</span>
+	</span>
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<br />
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<span style="font-size:12pt">
+		<span style="font-family:times new roman,serif">
+			<span style="font-family:tahoma,sans-serif">text with tahoma font</span>
+		</span>
+	</span>
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<br />
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<span style="font-size:12pt">
+		<span style="font-family:times new roman,serif">text with times new roman font</span>
+	</span>
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<br />
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<span style="font-size:12pt">
+		<span style="font-family:times new roman,serif">
+			<span style="font-family:trebuchet ms,sans-serif">text with trebuchet ms font.</span>
+		</span>
+	</span>
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<br />
+</p>
+<p style="margin-left:0in; margin-right:0in">
+	<span style="font-size:12pt">
+		<span style="font-family:times new roman,serif">
+			<span style="font-family:verdana,sans-serif">text with verdana font</span>
+		</span>
+	</span>
+</p>