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

Bug 248694 make nsIParser::GetCommand use an nsCString instead of nsString

Browse Source 
r+sr=bz


git-svn-id: svn://10.0.0.236/trunk@159409 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cbiesinger%web.de 2004-07-17 21:45:37 +00:00
parent ca36f3b89b
commit 2970f134c3
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/content/xml/document/src/nsXMLContentSink.cpp
View File

@ -200,7 +200,7 @@ nsXMLContentSink::WillBuildModel(void)
// Check for correct load-command for maybe prettyprinting
if (mPrettyPrintXML) {
nsAutoString command;
nsCAutoString command;
mParser->GetCommand(command);
if (!command.EqualsLiteral("view")) {
mPrettyPrintXML = PR_FALSE;
@ -495,7 +495,7 @@ nsXMLContentSink::CreateElement(const PRUnichar** aAtts, PRUint32 aAttsCount,
aNodeInfo->Equals(nsHTMLAtoms::input, kNameSpaceID_XHTML) ||
aNodeInfo->Equals(nsHTMLAtoms::object, kNameSpaceID_XHTML) ||
aNodeInfo->Equals(nsHTMLAtoms::applet, kNameSpaceID_XHTML)) {
nsAutoString cmd;
nsCAutoString cmd;
if (mParser) {
mParser->GetCommand(cmd);
}
@ -637,8 +637,9 @@ nsXMLContentSink::ProcessStyleLink(nsIContent* aElement,
nsresult rv = NS_OK;
mPrettyPrintXML = PR_FALSE;
nsAutoString cmd;
if (mParser) mParser->GetCommand(cmd);
nsCAutoString cmd;
if (mParser)
mParser->GetCommand(cmd);
if (cmd.EqualsASCII(kLoadAsData))
return NS_OK; // Do not load stylesheets when loading as data

2
mozilla/parser/htmlparser/public/nsIParser.h
View File

@ -174,7 +174,7 @@ class nsIParser : public nsISupports {
* @param aCommand -- ptrs to string that contains command
* @return nada
*/
NS_IMETHOD_(void) GetCommand(nsString& aCommand)=0;
NS_IMETHOD_(void) GetCommand(nsCString& aCommand)=0;
NS_IMETHOD_(void) SetCommand(const char* aCommand)=0;
NS_IMETHOD_(void) SetCommand(eParserCommands aParserCommand)=0;

12
mozilla/parser/htmlparser/src/nsParser.cpp
View File

@ -431,7 +431,7 @@ NS_IMETHODIMP_(void) nsParser::SetParserFilter(nsIParserFilter * aFilter)
}
NS_IMETHODIMP_(void) nsParser::GetCommand(nsString& aCommand)
NS_IMETHODIMP_(void) nsParser::GetCommand(nsCString& aCommand)
{
aCommand = mCommandStr;
}
@ -446,13 +446,13 @@ NS_IMETHODIMP_(void) nsParser::GetCommand(nsString& aCommand)
*/
NS_IMETHODIMP_(void) nsParser::SetCommand(const char* aCommand)
{
nsCAutoString theCommand(aCommand);
if(theCommand.Equals(kViewSourceCommand))
mCommandStr.Assign(aCommand);
if(mCommandStr.Equals(kViewSourceCommand))
mCommand=eViewSource;
else if(theCommand.Equals(kViewFragmentCommand))
else if(mCommandStr.Equals(kViewFragmentCommand))
mCommand=eViewFragment;
else mCommand=eViewNormal;
mCommandStr.AssignWithConversion(aCommand);
else
mCommand=eViewNormal;
}
/**

4
mozilla/parser/htmlparser/src/nsParser.h
View File

@ -146,7 +146,7 @@ class nsParser : public nsIParser,
* @param aCommand -- ptrs to string that contains command
* @return nada
*/
NS_IMETHOD_(void) GetCommand(nsString& aCommand);
NS_IMETHOD_(void) GetCommand(nsCString& aCommand);
NS_IMETHOD_(void) SetCommand(const char* aCommand);
NS_IMETHOD_(void) SetCommand(eParserCommands aParserCommand);
@ -453,7 +453,7 @@ protected:
nsString mUnusedInput;
nsCString mCharset;
nsString mCommandStr;
nsCString mCommandStr;