From 4b8124de18e92af2d19fb6cac8ffce2a7eb3978d Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Thu, 5 Apr 2001 02:11:57 +0000 Subject: [PATCH] Fix HPUX bustage git-svn-id: svn://10.0.0.236/trunk@91400 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/nsEditorShell.cpp | 11 +++++------ mozilla/editor/composer/src/nsEditorShell.cpp | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/mozilla/editor/base/nsEditorShell.cpp b/mozilla/editor/base/nsEditorShell.cpp index ec302a60a97..b1b21fa5d95 100644 --- a/mozilla/editor/base/nsEditorShell.cpp +++ b/mozilla/editor/base/nsEditorShell.cpp @@ -5389,12 +5389,11 @@ nsEditorShell::HandleMouseClickOnElement(nsIDOMElement *aElement, PRInt32 aClick { // In "All Tags" mode, use AdvancedProperties, // in others use appriate object property dialog - nsAReadableString &commandName = (mDisplayMode != eDisplayModeAllTags) ? - NS_LITERAL_STRING("cmd_objectProperties") : - NS_LITERAL_STRING("cmd_advancedProperties"); - - rv = DoControllerCommand(commandName); - + if (mDisplayMode == eDisplayModeAllTags) + rv = DoControllerCommand(NS_LITERAL_STRING("cmd_advancedProperties")); + else + rv = DoControllerCommand(NS_LITERAL_STRING("cmd_objectProperties")); + if (NS_SUCCEEDED(rv)) *_retval = PR_TRUE; } diff --git a/mozilla/editor/composer/src/nsEditorShell.cpp b/mozilla/editor/composer/src/nsEditorShell.cpp index ec302a60a97..b1b21fa5d95 100644 --- a/mozilla/editor/composer/src/nsEditorShell.cpp +++ b/mozilla/editor/composer/src/nsEditorShell.cpp @@ -5389,12 +5389,11 @@ nsEditorShell::HandleMouseClickOnElement(nsIDOMElement *aElement, PRInt32 aClick { // In "All Tags" mode, use AdvancedProperties, // in others use appriate object property dialog - nsAReadableString &commandName = (mDisplayMode != eDisplayModeAllTags) ? - NS_LITERAL_STRING("cmd_objectProperties") : - NS_LITERAL_STRING("cmd_advancedProperties"); - - rv = DoControllerCommand(commandName); - + if (mDisplayMode == eDisplayModeAllTags) + rv = DoControllerCommand(NS_LITERAL_STRING("cmd_advancedProperties")); + else + rv = DoControllerCommand(NS_LITERAL_STRING("cmd_objectProperties")); + if (NS_SUCCEEDED(rv)) *_retval = PR_TRUE; }