From 582e770b5c41c5e3173994197f0cb9075309512c Mon Sep 17 00:00:00 2001
From: "rickg%netscape.com"
 <rickg%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 8 Mar 2000 06:16:29 +0000
Subject: [PATCH] fixed pdt+ bug 29749; r=pollman; a=jar

git-svn-id: svn://10.0.0.236/trunk@62387 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/string/obsolete/nsString.cpp        | 2 ++
 mozilla/string/obsolete/nsString2.cpp       | 2 ++
 mozilla/xpcom/ds/nsString.cpp               | 2 ++
 mozilla/xpcom/ds/nsString2.cpp              | 2 ++
 mozilla/xpcom/string/obsolete/nsString.cpp  | 2 ++
 mozilla/xpcom/string/obsolete/nsString2.cpp | 2 ++
 6 files changed, 12 insertions(+)

diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp
index f9cfd88b616..58f9d66b8a7 100644
--- a/mozilla/string/obsolete/nsString.cpp
+++ b/mozilla/string/obsolete/nsString.cpp
@@ -710,6 +710,8 @@ PRInt32 nsCString::ToInteger(PRInt32* anErrorCode,PRUint32 aRadix) const {
       } //switch
     }
 
+    theRadix = (kAutoDetect==aRadix) ? theRadix : aRadix;
+
       //if you don't have any valid chars, return 0, but set the error;
     if(cp<=endcp) {
 
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index 6c493207eab..cd49a01279d 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -863,6 +863,8 @@ PRInt32 nsString::ToInteger(PRInt32* anErrorCode,PRUint32 aRadix) const {
       } //switch
     }
 
+    theRadix = (kAutoDetect==aRadix) ? theRadix : aRadix;
+
       //if you don't have any valid chars, return 0, but set the error;
     if(cp<=endcp) {
 
diff --git a/mozilla/xpcom/ds/nsString.cpp b/mozilla/xpcom/ds/nsString.cpp
index f9cfd88b616..58f9d66b8a7 100644
--- a/mozilla/xpcom/ds/nsString.cpp
+++ b/mozilla/xpcom/ds/nsString.cpp
@@ -710,6 +710,8 @@ PRInt32 nsCString::ToInteger(PRInt32* anErrorCode,PRUint32 aRadix) const {
       } //switch
     }
 
+    theRadix = (kAutoDetect==aRadix) ? theRadix : aRadix;
+
       //if you don't have any valid chars, return 0, but set the error;
     if(cp<=endcp) {
 
diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp
index 6c493207eab..cd49a01279d 100644
--- a/mozilla/xpcom/ds/nsString2.cpp
+++ b/mozilla/xpcom/ds/nsString2.cpp
@@ -863,6 +863,8 @@ PRInt32 nsString::ToInteger(PRInt32* anErrorCode,PRUint32 aRadix) const {
       } //switch
     }
 
+    theRadix = (kAutoDetect==aRadix) ? theRadix : aRadix;
+
       //if you don't have any valid chars, return 0, but set the error;
     if(cp<=endcp) {
 
diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp
index f9cfd88b616..58f9d66b8a7 100644
--- a/mozilla/xpcom/string/obsolete/nsString.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString.cpp
@@ -710,6 +710,8 @@ PRInt32 nsCString::ToInteger(PRInt32* anErrorCode,PRUint32 aRadix) const {
       } //switch
     }
 
+    theRadix = (kAutoDetect==aRadix) ? theRadix : aRadix;
+
       //if you don't have any valid chars, return 0, but set the error;
     if(cp<=endcp) {
 
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index 6c493207eab..cd49a01279d 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -863,6 +863,8 @@ PRInt32 nsString::ToInteger(PRInt32* anErrorCode,PRUint32 aRadix) const {
       } //switch
     }
 
+    theRadix = (kAutoDetect==aRadix) ? theRadix : aRadix;
+
       //if you don't have any valid chars, return 0, but set the error;
     if(cp<=endcp) {