From fc4de9ee6cc178d232b8d9f35618e6dcd67c3b17 Mon Sep 17 00:00:00 2001
From: "ftang%netscape.com"
 <ftang%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 4 Mar 2000 05:37:46 +0000
Subject: [PATCH] fix 29154. r=hyatt/pollmann a=rickg replace
 nsISupportString/char*/ToNewCSring with
 nsISupportWString/PRUnichar*/ToNewUnicode

git-svn-id: svn://10.0.0.236/trunk@62213 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/base/nsPresState.cpp     | 14 +++++++-------
 mozilla/layout/base/src/nsPresState.cpp | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mozilla/layout/base/nsPresState.cpp b/mozilla/layout/base/nsPresState.cpp
index 5b8bfbd5c5c..5603d353e08 100644
--- a/mozilla/layout/base/nsPresState.cpp
+++ b/mozilla/layout/base/nsPresState.cpp
@@ -59,13 +59,13 @@ NS_IMETHODIMP
 nsPresState::GetStateProperty(const nsString& aName, nsString& aResult)
 {
   // Retrieve from hashtable.
-  nsCOMPtr<nsISupportsString> str;
+  nsCOMPtr<nsISupportsWString> str;
   nsStringKey key(aName);
   if (mPropertyTable)
-    str = dont_AddRef(NS_STATIC_CAST(nsISupportsString*, mPropertyTable->Get(&key)));
+    str = dont_AddRef(NS_STATIC_CAST(nsISupportsWString*, mPropertyTable->Get(&key)));
    
   if (str) {
-    char* data;
+    PRUnichar* data;
     str->GetData(&data);
     aResult = data;
     nsAllocator::Free(data);
@@ -84,11 +84,11 @@ nsPresState::SetStateProperty(const nsString& aName, const nsString& aValue)
   // Add to hashtable
   nsStringKey key(aName);
 
-  nsCOMPtr<nsISupportsString> supportsStr;
-  nsresult rv = nsComponentManager::CreateInstance(NS_SUPPORTS_STRING_PROGID, nsnull, 
-                                                    NS_GET_IID(nsISupportsString), getter_AddRefs(supportsStr));
+  nsCOMPtr<nsISupportsWString> supportsStr;
+  nsresult rv = nsComponentManager::CreateInstance(NS_SUPPORTS_WSTRING_PROGID, nsnull, 
+                                                    NS_GET_IID(nsISupportsWString), getter_AddRefs(supportsStr));
 
-  char* val = aValue.ToNewCString();
+  PRUnichar* val = aValue.ToNewUnicode();
   supportsStr->SetData(val);
   nsAllocator::Free(val);
   mPropertyTable->Put(&key, supportsStr);
diff --git a/mozilla/layout/base/src/nsPresState.cpp b/mozilla/layout/base/src/nsPresState.cpp
index 5b8bfbd5c5c..5603d353e08 100644
--- a/mozilla/layout/base/src/nsPresState.cpp
+++ b/mozilla/layout/base/src/nsPresState.cpp
@@ -59,13 +59,13 @@ NS_IMETHODIMP
 nsPresState::GetStateProperty(const nsString& aName, nsString& aResult)
 {
   // Retrieve from hashtable.
-  nsCOMPtr<nsISupportsString> str;
+  nsCOMPtr<nsISupportsWString> str;
   nsStringKey key(aName);
   if (mPropertyTable)
-    str = dont_AddRef(NS_STATIC_CAST(nsISupportsString*, mPropertyTable->Get(&key)));
+    str = dont_AddRef(NS_STATIC_CAST(nsISupportsWString*, mPropertyTable->Get(&key)));
    
   if (str) {
-    char* data;
+    PRUnichar* data;
     str->GetData(&data);
     aResult = data;
     nsAllocator::Free(data);
@@ -84,11 +84,11 @@ nsPresState::SetStateProperty(const nsString& aName, const nsString& aValue)
   // Add to hashtable
   nsStringKey key(aName);
 
-  nsCOMPtr<nsISupportsString> supportsStr;
-  nsresult rv = nsComponentManager::CreateInstance(NS_SUPPORTS_STRING_PROGID, nsnull, 
-                                                    NS_GET_IID(nsISupportsString), getter_AddRefs(supportsStr));
+  nsCOMPtr<nsISupportsWString> supportsStr;
+  nsresult rv = nsComponentManager::CreateInstance(NS_SUPPORTS_WSTRING_PROGID, nsnull, 
+                                                    NS_GET_IID(nsISupportsWString), getter_AddRefs(supportsStr));
 
-  char* val = aValue.ToNewCString();
+  PRUnichar* val = aValue.ToNewUnicode();
   supportsStr->SetData(val);
   nsAllocator::Free(val);
   mPropertyTable->Put(&key, supportsStr);