From be9d17647c0aa1d431bcecb33cecf7314329fb5e Mon Sep 17 00:00:00 2001 From: "angelon%netscape.com" Date: Sun, 17 Nov 2002 10:31:30 +0000 Subject: [PATCH] Fixing original merge git-svn-id: svn://10.0.0.236/branches/ANGELON_MOZ12_BRANCH@134002 18797224-902f-48f8-a5cc-f745e15eee43 --- .../composer/src/nsComposerCommandsUpdater.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/mozilla/editor/composer/src/nsComposerCommandsUpdater.cpp b/mozilla/editor/composer/src/nsComposerCommandsUpdater.cpp index cdf02866ee1..47021275b14 100644 --- a/mozilla/editor/composer/src/nsComposerCommandsUpdater.cpp +++ b/mozilla/editor/composer/src/nsComposerCommandsUpdater.cpp @@ -262,11 +262,9 @@ nsComposerCommandsUpdater::CallUpdateCommands(const nsAString& aCommandGroup) nsCOMPtr scriptGlobalObject; theDoc->GetScriptGlobalObject(getter_AddRefs(scriptGlobalObject)); - if (scriptGlobalObject) { - nsCOMPtr docShell; - scriptGlobalObject->GetDocShell(getter_AddRefs(docShell)); - mDocShell = docShell.get(); - } + nsCOMPtr docShell; + scriptGlobalObject->GetDocShell(getter_AddRefs(docShell)); + mDocShell = docShell.get(); } if (!mDocShell) return NS_ERROR_FAILURE; @@ -275,10 +273,6 @@ nsComposerCommandsUpdater::CallUpdateCommands(const nsAString& aCommandGroup) nsCOMPtr commandUpdater = do_QueryInterface(commandManager); if (!commandUpdater) return NS_ERROR_FAILURE; - commandUpdater->CommandStatusChanged("cmd_bold"); - commandUpdater->CommandStatusChanged("cmd_italic"); - commandUpdater->CommandStatusChanged("cmd_underline"); - // this hardcoded list of commands in temporary. This code should // use nsICommandGroup. if (aCommandGroup.Equals(NS_LITERAL_STRING("undo"))) @@ -307,7 +301,7 @@ nsComposerCommandsUpdater::CallUpdateCommands(const nsAString& aCommandGroup) commandUpdater->CommandStatusChanged("cmd_code"); commandUpdater->CommandStatusChanged("cmd_samp"); commandUpdater->CommandStatusChanged("cmd_var"); - + commandUpdater->CommandStatusChanged("cmd_increaseFont"); commandUpdater->CommandStatusChanged("cmd_decreaseFont"); @@ -321,7 +315,7 @@ nsComposerCommandsUpdater::CallUpdateCommands(const nsAString& aCommandGroup) { // save commands (none in C++) } - + return NS_OK; }