Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 29154. r=hyatt/pollmann a=rickg replace nsISupportString/char*/ToNewCSring

Browse Source 
with nsISupportWString/PRUnichar*/ToNewUnicode


git-svn-id: svn://10.0.0.236/trunk@62213 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ftang%netscape.com 2000-03-04 05:37:46 +00:00
parent d290a44564
commit fc4de9ee6c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/layout/base/nsPresState.cpp
View File

@ -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);

14
mozilla/layout/base/src/nsPresState.cpp
View File

@ -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);