bug 146164: removing style can remove too much. r=glazman, sr=kin

editor/libeditor/html/nsHTMLEditorStyle.cpp

@@ -545,13 +545,10 @@ nsresult nsHTMLEditor::SplitStyleAboveRange(nsIDOMRange *inRange,
   PRBool sameNode = (startNode==endNode);
   
   // split any matching style nodes above the start of range
-  res = SplitStyleAbovePoint(address_of(startNode), &startOffset, aProperty, aAttribute);
-  if (NS_FAILED(res)) return res;
-
-  if (sameNode && (startNode != origStartNode))
   {
-    // our startNode got split.  This changes the offset of the end of our range.
-    endOffset -= origStartOffset;
+    nsAutoTrackDOMPoint tracker(mRangeUpdater, address_of(endNode), &endOffset);
+    res = SplitStyleAbovePoint(address_of(startNode), &startOffset, aProperty, aAttribute);
+    if (NS_FAILED(res)) return res;
   }
 
   // second verse, same as the first...