From 9dafc29f8a40f3c3019ff15da563813e0218a930 Mon Sep 17 00:00:00 2001 From: "scc%mozilla.org" Date: Wed, 23 May 2001 04:19:39 +0000 Subject: [PATCH] fixing bustage git-svn-id: svn://10.0.0.236/trunk@95792 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/directory/xpcom/base/src/nsLDAPChannel.cpp | 2 +- mozilla/gfx/src/windows/nsDeviceContextWin.cpp | 2 +- mozilla/gfx/src/windows/nsFontMetricsWin.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/directory/xpcom/base/src/nsLDAPChannel.cpp b/mozilla/directory/xpcom/base/src/nsLDAPChannel.cpp index b8e019ea518..30a2f877f6d 100644 --- a/mozilla/directory/xpcom/base/src/nsLDAPChannel.cpp +++ b/mozilla/directory/xpcom/base/src/nsLDAPChannel.cpp @@ -875,7 +875,7 @@ nsLDAPChannel::OnLDAPSearchEntry(nsILDAPMessage *aMessage) NS_ENSURE_SUCCESS(rv, rv); entry.SetCapacity(256); - entry = NS_LITERAL_STRING("dn: ") + nsLiteralString(dn) + entry = NS_LITERAL_STRING("dn: ") + nsDependentString(dn) + NS_LITERAL_STRING("\n"); char **attrs; diff --git a/mozilla/gfx/src/windows/nsDeviceContextWin.cpp b/mozilla/gfx/src/windows/nsDeviceContextWin.cpp index b486eec6cb8..e0aef2a0bdb 100644 --- a/mozilla/gfx/src/windows/nsDeviceContextWin.cpp +++ b/mozilla/gfx/src/windows/nsDeviceContextWin.cpp @@ -834,7 +834,7 @@ NS_IMETHODIMP nsDeviceContextWin :: BeginDocument(PRUnichar * aTitle) char *title = nsnull; if( nsnull != aTitle) { - title = ToNewCString(nsLiteralString(aTitle)); + title = ToNewCString(nsDependentString(aTitle)); } docinfo.cbSize = sizeof(docinfo); diff --git a/mozilla/gfx/src/windows/nsFontMetricsWin.cpp b/mozilla/gfx/src/windows/nsFontMetricsWin.cpp index 314deba3f5e..4d9cb282be0 100644 --- a/mozilla/gfx/src/windows/nsFontMetricsWin.cpp +++ b/mozilla/gfx/src/windows/nsFontMetricsWin.cpp @@ -228,7 +228,7 @@ NS_IMPL_ISUPPORTS1(nsFontCleanupObserver, nsIObserver); NS_IMETHODIMP nsFontCleanupObserver::Observe(nsISupports *aSubject, const PRUnichar *aTopic, const PRUnichar *someData) { - nsLiteralString aTopicString(aTopic); + nsDependentString aTopicString(aTopic); if (aTopicString.Equals(NS_LITERAL_STRING(NS_XPCOM_SHUTDOWN_OBSERVER_ID))) { FreeGlobals(); }