Ticket #7492: 7492.patch

_source/plugins/styles/plugin.js

@@ -1115 +1115 @@
         function removeFromElement( style, element )
         {
                 var def = style._.definition,
-                        attributes = CKEDITOR.tools.extend( {}, def.attributes, getOverrides( style )[ element.getName() ] ),
+                        attributes = def.attributes,
                         styles = def.styles,
+                        overrides = getOverrides( style )[ element.getName() ],
                         // If the style is only about the element itself, we have to remove the element.
                         removeEmpty = CKEDITOR.tools.isEmpty( attributes ) && CKEDITOR.tools.isEmpty( styles );
 
@@ -1142 +1143 @@
                         element.removeStyle( styleName );
                 }
 
+                removeOverrides( element, overrides ) ;
+
                 if ( removeEmpty )
                 {
                         !CKEDITOR.dtd.$block[ element.getName() ] || style._.enterMode == CKEDITOR.ENTER_BR && !element.hasAttributes() ?