[XForms] Additional patch for bug 280423, r=merle+aaronr, NPOTB

git-svn-id: svn://10.0.0.236/trunk@242911 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Olli.Pettay%helsinki.fi 2008-01-11 19:56:56 +00:00
parent 78a9e4a5ab
commit f387a1e859
8 changed files with 13 additions and 12 deletions

View File

@ -87,7 +87,7 @@ nsXFormsContextInfo::GetType(PRInt32 *aType)
} }
nsresult nsresult
nsXFormsContextInfo::SetStringValue(const char *aName, nsAString &aString) nsXFormsContextInfo::SetStringValue(const char *aName, const nsAString &aString)
{ {
// Store the string value of the context property as a node. // Store the string value of the context property as a node.
SetNodeValueInternal(aName, aString); SetNodeValueInternal(aName, aString);
@ -201,7 +201,8 @@ nsXFormsContextInfo::GetNodesetValue(nsIDOMXPathResult **aResult)
} }
nsresult nsresult
nsXFormsContextInfo::SetNodeValueInternal(const char *aName, nsAString &aValue) nsXFormsContextInfo::SetNodeValueInternal(const char *aName,
const nsAString &aValue)
{ {
if (!mElement) if (!mElement)
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;

View File

@ -74,7 +74,7 @@ public:
* @param aName - name of the string property. * @param aName - name of the string property.
* @param aString - string value. * @param aString - string value.
*/ */
nsresult SetStringValue(const char *aName, nsAString &aString); nsresult SetStringValue(const char *aName, const nsAString &aString);
/** Set a number value for a context info property. /** Set a number value for a context info property.
* Number values are encapsulated in a text node because * Number values are encapsulated in a text node because
@ -108,7 +108,7 @@ private:
* @param aName - name of the node property. * @param aName - name of the node property.
* @param aValue - value of the text node. * @param aValue - value of the text node.
*/ */
nsresult SetNodeValueInternal(const char *aName, nsAString &aValue); nsresult SetNodeValueInternal(const char *aName, const nsAString &aValue);
// The element to which the context info refers. // The element to which the context info refers.
nsIDOMElement *mElement; nsIDOMElement *mElement;

View File

@ -99,7 +99,7 @@ private:
* @param aName Name of the context property. * @param aName Name of the context property.
* @param aValue Value of the context property. * @param aValue Value of the context property.
*/ */
nsresult SetContextInfo(const char *aName, nsAString &aValue); nsresult SetContextInfo(const char *aName, const nsAString &aValue);
nsCString mSrcAttrText; nsCString mSrcAttrText;
nsCOMPtr<nsIChannel> mChannel; nsCOMPtr<nsIChannel> mChannel;
@ -453,7 +453,7 @@ nsXFormsLabelElement::OnStopRequest(nsIRequest *aRequest,
} }
nsresult nsresult
nsXFormsLabelElement::SetContextInfo(const char *aName, nsAString &aValue) nsXFormsLabelElement::SetContextInfo(const char *aName, const nsAString &aValue)
{ {
nsCOMPtr<nsXFormsContextInfo> contextInfo = new nsXFormsContextInfo(mElement); nsCOMPtr<nsXFormsContextInfo> contextInfo = new nsXFormsContextInfo(mElement);
NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY); NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);

View File

@ -202,7 +202,7 @@ private:
* @param aName Name of the context property. * @param aName Name of the context property.
* @param aValue Value of the context property. * @param aValue Value of the context property.
*/ */
nsresult SetContextInfo(const char *aName, nsAString &aValue); nsresult SetContextInfo(const char *aName, const nsAString &aValue);
MessageType mType; MessageType mType;
@ -1289,7 +1289,7 @@ PRBool nsXFormsMessageElement::IsEphemeral()
} }
nsresult nsresult
nsXFormsMessageElement::SetContextInfo(const char *aName, nsAString &aValue) nsXFormsMessageElement::SetContextInfo(const char *aName, const nsAString &aValue)
{ {
nsCOMPtr<nsXFormsContextInfo> contextInfo = new nsXFormsContextInfo(mElement); nsCOMPtr<nsXFormsContextInfo> contextInfo = new nsXFormsContextInfo(mElement);
NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY); NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);

View File

@ -3524,7 +3524,7 @@ nsXFormsModelElement::IsDuplicateSchema(nsIDOMElement *aSchemaElement)
} }
nsresult nsresult
nsXFormsModelElement::SetContextInfo(const char *aName, nsAString &aValue) nsXFormsModelElement::SetContextInfo(const char *aName, const nsAString &aValue)
{ {
nsCOMPtr<nsXFormsContextInfo> contextInfo = new nsXFormsContextInfo(mElement); nsCOMPtr<nsXFormsContextInfo> contextInfo = new nsXFormsContextInfo(mElement);
NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY); NS_ENSURE_TRUE(contextInfo, NS_ERROR_OUT_OF_MEMORY);

View File

@ -467,7 +467,7 @@ private:
* @param aName Name of the context property. * @param aName Name of the context property.
* @param aValue Value of the context property. * @param aValue Value of the context property.
*/ */
nsresult SetContextInfo(const char *aName, nsAString &aValue); nsresult SetContextInfo(const char *aName, const nsAString &aValue);
nsCOMPtr<nsISchemaLoader> mSchemas; nsCOMPtr<nsISchemaLoader> mSchemas;
nsStringArray mPendingInlineSchemas; nsStringArray mPendingInlineSchemas;

View File

@ -2684,7 +2684,7 @@ nsXFormsSubmissionElement::SetContextInfo()
nsresult nsresult
nsXFormsSubmissionElement::SetHttpContextInfo(PRUint32 aResponse, nsXFormsSubmissionElement::SetHttpContextInfo(PRUint32 aResponse,
nsAString &aResponseText) const nsAString &aResponseText)
{ {
nsresult rv; nsresult rv;

View File

@ -225,7 +225,7 @@ private:
* @param aResponse Protocol response code * @param aResponse Protocol response code
* @param aResponseText Protocol response reason phrase * @param aResponseText Protocol response reason phrase
*/ */
nsresult SetHttpContextInfo(PRUint32 aResponse, nsAString &aResponseText); nsresult SetHttpContextInfo(PRUint32 aResponse, const nsAString &aResponseText);
nsresult ParseErrorResponse(nsIChannel *aChannel); nsresult ParseErrorResponse(nsIChannel *aChannel);
}; };