#include cleanup to lessen unused static variables (bug 117927)

editor/composer/src/nsEditorShell.cpp

@@ -37,8 +37,6 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include <stdio.h>
-
 #include "nsEditorShell.h"
 #include "nsIPlaintextEditor.h"
 #include "nsIBaseWindow.h"
@@ -115,13 +113,16 @@
 #include "nsInterfaceState.h"
 
 #include "nsEditorShellMouseListener.h"
+#include "nsIStringBundle.h"
+
+#include "nsHTMLTags.h"
+#include "nsEditorParserObserver.h"
+#include "nsIDOMEventReceiver.h"
 
 ///////////////////////////////////////
 
 // Drag & Drop, Clipboard
 #include "nsWidgetsCID.h"
-#include "nsIClipboard.h"
-#include "nsITransferable.h"
 
 #include "nsISupportsArray.h"
 
@@ -1225,23 +1226,21 @@ nsEditorShell::GetTextProperty(const PRUnichar *prop, const PRUnichar *attr, con
 NS_IMETHODIMP
 nsEditorShell::IncreaseFontSize()
 {
-  nsresult  err = NS_NOINTERFACE;
   nsCOMPtr<nsIHTMLEditor>  htmlEditor = do_QueryInterface(mEditor);
-
   if (htmlEditor)
-    err = htmlEditor->IncreaseFontSize();
-  return err;
+    return htmlEditor->IncreaseFontSize();
+
+  return NS_NOINTERFACE;
 }
 
 NS_IMETHODIMP
 nsEditorShell::DecreaseFontSize()
 {
-  nsresult  err = NS_NOINTERFACE;
   nsCOMPtr<nsIHTMLEditor>  htmlEditor = do_QueryInterface(mEditor);
-
   if (htmlEditor)
-    err = htmlEditor->DecreaseFontSize();
-  return err;
+    return htmlEditor->DecreaseFontSize();
+
+  return NS_NOINTERFACE;
 }
 
 

editor/composer/src/nsEditorShell.h

@@ -47,29 +47,21 @@
 #include "nsISupports.h"
 
 #include "nsIEditorShell.h"
-#include "nsIEditorController.h"
 #include "nsIWebProgressListener.h"
-#include "nsISelectionListener.h"
-#include "nsIDOMEventReceiver.h"
-#include "nsIPrompt.h"
-#include "nsIDOMDocument.h"
 #include "nsIDOMEventListener.h"
 #include "nsIURIContentListener.h"
 #include "nsVoidArray.h"
-#include "nsTextServicesCID.h"
 #include "nsIEditorSpellCheck.h"
 #include "nsISpellChecker.h"
-#include "nsInterfaceState.h"
 #include "nsIHTMLEditor.h"
 #include "nsIStringBundle.h"
 #include "nsICSSStyleSheet.h"
 #include "nsISupportsArray.h"
 
-// Parser Observation
-#include "nsEditorParserObserver.h"
-
+class nsIDOMDocument;
 class nsIDocShell;
 class nsIScriptContext;
+class nsIDOMWindow;
 class nsIDOMWindowInternal;
 class nsIDOMElement;
 class nsIDOMNode;
@@ -81,6 +73,15 @@ class nsISupportsArray;
 class nsIStringBundleService;
 class nsIStringBundle;
 class nsIStyleSheet;
+class nsIEditorController;
+class nsIDOMEventReceiver;
+class nsIDOMEventListener;
+class nsISpellChecker;
+class nsInterfaceState;
+class nsIHTMLEditor;
+class nsICSSStyleSheet;
+class nsEditorParserObserver;
+class nsStringArray;
 
 #define NS_EDITORSHELL_CID                            \
 { /* {} */                                            \