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

Bug 335953 Make code outside intl use NS_CHARSETALIAS_CONTRACTID instead of NS_CHARSETALIAS_CID

Browse Source 
r=bz sr=bz


git-svn-id: svn://10.0.0.236/trunk@196118 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org
2006-05-06 22:09:20 +00:00
parent ee3eb59f05
commit 1a5bcd5020
8 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/parser/htmlparser/src/nsScanner.cpp
View File

@@ -50,8 +50,6 @@
#include "nsCRT.h"
#include "nsParser.h"
static NS_DEFINE_CID(kCharsetAliasCID, NS_CHARSETALIAS_CID);
nsReadEndCondition::nsReadEndCondition(const PRUnichar* aTerminateChars) :
mChars(aTerminateChars), mFilter(PRUnichar(~0)) // All bits set
{
@@ -196,7 +194,7 @@ nsresult nsScanner::SetDocumentCharset(const nsACString& aCharset , PRInt32 aSou
if( aSource < mCharsetSource) // priority is lower the the current one , just
return res;
nsCOMPtr<nsICharsetAlias> calias(do_GetService(kCharsetAliasCID, &res));
nsCOMPtr<nsICharsetAlias> calias(do_GetService(NS_CHARSETALIAS_CONTRACTID, &res));
NS_ASSERTION( nsnull != calias, "cannot find charset alias");
if( NS_SUCCEEDED(res) && (nsnull != calias))
{