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

Bug 116499 - convert nsIOutlinerView::GetCellText to return an nsAString, so we can avoid copying strings. r=blake, sr=jag.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@197437 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%netscape.com
2006-05-17 02:33:39 +00:00
parent 0d809c0222
commit bd76f2032a
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mozilla/layout/inspector/src/inDOMView.cpp
View File

@@ -371,7 +371,7 @@ inDOMView::GetColumnProperties(const PRUnichar *colID, nsIDOMElement *colElt, ns
}
NS_IMETHODIMP
inDOMView::GetCellText(PRInt32 row, const PRUnichar *colID, PRUnichar **_retval)
inDOMView::GetCellText(PRInt32 row, const PRUnichar *colID, nsAString& _retval)
{
inDOMViewNode* node = nsnull;
RowToNode(row, &node);
@@ -379,36 +379,30 @@ inDOMView::GetCellText(PRInt32 row, const PRUnichar *colID, PRUnichar **_retval)
nsIDOMNode* domNode = node->node;
nsAutoString value;
nsAutoString col(colID);
if (col.Equals(NS_LITERAL_STRING("colNodeName"))) {
domNode->GetNodeName(value);
*_retval = ToNewUnicode(value);
} else if (col.Equals(NS_LITERAL_STRING("colLocalName"))) {
domNode->GetLocalName(value);
*_retval = ToNewUnicode(value);
} else if (col.Equals(NS_LITERAL_STRING("colPrefix"))) {
domNode->GetPrefix(value);
*_retval = ToNewUnicode(value);
} else if (col.Equals(NS_LITERAL_STRING("colNamespaceURI"))) {
domNode->GetNamespaceURI(value);
*_retval = ToNewUnicode(value);
} else if (col.Equals(NS_LITERAL_STRING("colNodeType"))) {
if (col.Equals(NS_LITERAL_STRING("colNodeName")))
domNode->GetNodeName(_retval);
else if (col.Equals(NS_LITERAL_STRING("colLocalName")))
domNode->GetLocalName(_retval);
else if (col.Equals(NS_LITERAL_STRING("colPrefix")))
domNode->GetPrefix(_retval);
else if (col.Equals(NS_LITERAL_STRING("colNamespaceURI")))
domNode->GetNamespaceURI(_retval);
else if (col.Equals(NS_LITERAL_STRING("colNodeType"))) {
PRUint16 nodeType;
domNode->GetNodeType(&nodeType);
value.AppendInt(PRInt32(nodeType));
*_retval = ToNewUnicode(value);
} else if (col.Equals(NS_LITERAL_STRING("colNodeValue"))) {
domNode->GetNodeValue(value);
*_retval = ToNewUnicode(value);
} else {
nsAutoString temp;
temp.AppendInt(PRInt32(nodeType));
_retval = temp;
} else if (col.Equals(NS_LITERAL_STRING("colNodeValue")))
domNode->GetNodeValue(_retval);
else {
if (Substring(col, 0, 4).Equals(NS_LITERAL_STRING("col@"))) {
nsCOMPtr<nsIDOMElement> el = do_QueryInterface(node->node);
if (el) {
nsAutoString attr;
col.Right(attr, col.Length()-4); // have to use this because Substring is crashing on me!
el->GetAttribute(attr, value);
*_retval = ToNewUnicode(value);
el->GetAttribute(attr, _retval);
}
}
}