From fe0f1e89f29743f55dcbb765ef57beb4a59cd824 Mon Sep 17 00:00:00 2001
From: "scc%netscape.com"
 <scc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 22 Apr 2000 10:31:38 +0000
Subject: [PATCH] making string conversions explicit

git-svn-id: svn://10.0.0.236/trunk@66852 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/html/content/src/nsHTMLSelectElement.cpp | 4 ++--
 mozilla/htmlparser/src/nsHTMLTokens.cpp                  | 2 +-
 mozilla/layout/forms/nsComboboxControlFrame.cpp          | 2 +-
 mozilla/layout/html/content/src/nsHTMLSelectElement.cpp  | 4 ++--
 mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp | 2 +-
 mozilla/parser/htmlparser/src/nsHTMLTokens.cpp           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
index cc8fdf5366e..e149d31d020 100644
--- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
@@ -725,7 +725,7 @@ nsHTMLSelectElement::GetValue(nsString& aValue)
             if (eHTMLUnit_String == value.GetUnit()) {
               value.GetStringValue(aValue);
             } else {
-              aValue = "";
+              aValue.SetLength(0);
             }
             return NS_OK;
           }
@@ -736,7 +736,7 @@ nsHTMLSelectElement::GetValue(nsString& aValue)
             if (eHTMLUnit_String == value.GetUnit()) {
               value.GetStringValue(aValue);
             } else {
-              aValue = "";
+              aValue.SetLength(0);
             }
             return NS_OK;
           } 
diff --git a/mozilla/htmlparser/src/nsHTMLTokens.cpp b/mozilla/htmlparser/src/nsHTMLTokens.cpp
index a0ede590ff1..909a4b7c7d1 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokens.cpp
@@ -1274,7 +1274,7 @@ nsresult ConsumeQuotedString(PRUnichar aChar,nsString& aString,nsScanner& aScann
   if(ch!=aChar) {
     if(!aScanner.IsIncremental() && result==kEOF) {
       aScanner.Mark(theOffset);
-      aString=aChar;
+      aString.Assign(aChar);
       result=kBadStringLiteral; 
     }
     else {
diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp
index 71769904222..6060ab460b4 100644
--- a/mozilla/layout/forms/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp
@@ -1863,7 +1863,7 @@ nsComboboxControlFrame::SelectionChanged()
     }
     if (shouldSetValue) {
       if (mTextStr.Length() == 0) {
-        nsAutoString space(" ");
+        nsAutoString space; space.AssignWithConversion(" ");
         rv = mDisplayContent->SetText(space.GetUnicode(), space.Length(), PR_TRUE);
       } else {
         rv = mDisplayContent->SetText(mTextStr.GetUnicode(), mTextStr.Length(), PR_TRUE);
diff --git a/mozilla/layout/html/content/src/nsHTMLSelectElement.cpp b/mozilla/layout/html/content/src/nsHTMLSelectElement.cpp
index cc8fdf5366e..e149d31d020 100644
--- a/mozilla/layout/html/content/src/nsHTMLSelectElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLSelectElement.cpp
@@ -725,7 +725,7 @@ nsHTMLSelectElement::GetValue(nsString& aValue)
             if (eHTMLUnit_String == value.GetUnit()) {
               value.GetStringValue(aValue);
             } else {
-              aValue = "";
+              aValue.SetLength(0);
             }
             return NS_OK;
           }
@@ -736,7 +736,7 @@ nsHTMLSelectElement::GetValue(nsString& aValue)
             if (eHTMLUnit_String == value.GetUnit()) {
               value.GetStringValue(aValue);
             } else {
-              aValue = "";
+              aValue.SetLength(0);
             }
             return NS_OK;
           } 
diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
index 71769904222..6060ab460b4 100644
--- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp
@@ -1863,7 +1863,7 @@ nsComboboxControlFrame::SelectionChanged()
     }
     if (shouldSetValue) {
       if (mTextStr.Length() == 0) {
-        nsAutoString space(" ");
+        nsAutoString space; space.AssignWithConversion(" ");
         rv = mDisplayContent->SetText(space.GetUnicode(), space.Length(), PR_TRUE);
       } else {
         rv = mDisplayContent->SetText(mTextStr.GetUnicode(), mTextStr.Length(), PR_TRUE);
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
index a0ede590ff1..909a4b7c7d1 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -1274,7 +1274,7 @@ nsresult ConsumeQuotedString(PRUnichar aChar,nsString& aString,nsScanner& aScann
   if(ch!=aChar) {
     if(!aScanner.IsIncremental() && result==kEOF) {
       aScanner.Mark(theOffset);
-      aString=aChar;
+      aString.Assign(aChar);
       result=kBadStringLiteral; 
     }
     else {