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

Convert correct usage of |nsCOMPtr<T>::operator&| to use |address_of| since the operator& will soon become private. b=59414 r=disttsc@bart.nl sr=brendan@mozilla.org

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@83782 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%fas.harvard.edu 2000-12-17 16:02:58 +00:00
parent 776fac5941
commit e32189e3a4
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/content/xul/document/src/nsXULContentSink.cpp
View File

@ -1379,7 +1379,7 @@ XULContentSinkImpl::ParseTag(const nsAReadableString& aText, nsINodeInfo*& aNode
}
nsCOMPtr<nsINameSpace> ns;
rv = GetTopNameSpace(&ns);
rv = GetTopNameSpace(address_of(ns));
if (NS_FAILED(rv)) return rv;
PRInt32 namespaceID;
@ -1415,7 +1415,7 @@ XULContentSinkImpl::NormalizeAttributeString(const nsAReadableString& aText,
prefix = dont_AddRef( NS_NewAtom(prefixStr) );
nsCOMPtr<nsINameSpace> ns;
rv = GetTopNameSpace(&ns);
rv = GetTopNameSpace(address_of(ns));
if (NS_FAILED(rv)) return rv;
rv = ns->FindNameSpaceID(prefix, nameSpaceID);
@ -1442,7 +1442,7 @@ XULContentSinkImpl::CreateElement(nsINodeInfo *aNodeInfo,
element->mDocument = mPrototype;
nsCOMPtr<nsINameSpace> ns;
rv = GetTopNameSpace(&ns);
rv = GetTopNameSpace(address_of(ns));
if (NS_SUCCEEDED(rv)) {
element->mNameSpace = ns;
}

5
mozilla/editor/base/nsHTMLEditor.cpp
View File

@ -2634,13 +2634,14 @@ nsresult nsHTMLEditor::InsertHTMLWithCharsetAndContext(const nsString& aInputStr
nsCOMPtr<nsIDOMNode> fragmentAsNode;
PRInt32 rangeStartHint, rangeEndHint;
res = CreateDOMFragmentFromPaste(nsrange, inputString, aContextStr, aInfoStr,
&fragmentAsNode, &rangeStartHint, &rangeEndHint);
address_of(fragmentAsNode),
&rangeStartHint, &rangeEndHint);
NS_ENSURE_SUCCESS(res, res);
// make a list of what nodes in docFrag we need to move
nsCOMPtr<nsISupportsArray> nodeList;
res = CreateListOfNodesToPaste(fragmentAsNode, &nodeList, rangeStartHint, rangeEndHint);
res = CreateListOfNodesToPaste(fragmentAsNode, address_of(nodeList), rangeStartHint, rangeEndHint);
NS_ENSURE_SUCCESS(res, res);
// are there any table elements in the list?

5
mozilla/editor/libeditor/html/nsHTMLEditor.cpp
View File

@ -2634,13 +2634,14 @@ nsresult nsHTMLEditor::InsertHTMLWithCharsetAndContext(const nsString& aInputStr
nsCOMPtr<nsIDOMNode> fragmentAsNode;
PRInt32 rangeStartHint, rangeEndHint;
res = CreateDOMFragmentFromPaste(nsrange, inputString, aContextStr, aInfoStr,
&fragmentAsNode, &rangeStartHint, &rangeEndHint);
address_of(fragmentAsNode),
&rangeStartHint, &rangeEndHint);
NS_ENSURE_SUCCESS(res, res);
// make a list of what nodes in docFrag we need to move
nsCOMPtr<nsISupportsArray> nodeList;
res = CreateListOfNodesToPaste(fragmentAsNode, &nodeList, rangeStartHint, rangeEndHint);
res = CreateListOfNodesToPaste(fragmentAsNode, address_of(nodeList), rangeStartHint, rangeEndHint);
NS_ENSURE_SUCCESS(res, res);
// are there any table elements in the list?

6
mozilla/rdf/content/src/nsXULContentSink.cpp
View File

@ -1379,7 +1379,7 @@ XULContentSinkImpl::ParseTag(const nsAReadableString& aText, nsINodeInfo*& aNode
}
nsCOMPtr<nsINameSpace> ns;
rv = GetTopNameSpace(&ns);
rv = GetTopNameSpace(address_of(ns));
if (NS_FAILED(rv)) return rv;
PRInt32 namespaceID;
@ -1415,7 +1415,7 @@ XULContentSinkImpl::NormalizeAttributeString(const nsAReadableString& aText,
prefix = dont_AddRef( NS_NewAtom(prefixStr) );
nsCOMPtr<nsINameSpace> ns;
rv = GetTopNameSpace(&ns);
rv = GetTopNameSpace(address_of(ns));
if (NS_FAILED(rv)) return rv;
rv = ns->FindNameSpaceID(prefix, nameSpaceID);
@ -1442,7 +1442,7 @@ XULContentSinkImpl::CreateElement(nsINodeInfo *aNodeInfo,
element->mDocument = mPrototype;
nsCOMPtr<nsINameSpace> ns;
rv = GetTopNameSpace(&ns);
rv = GetTopNameSpace(address_of(ns));
if (NS_SUCCEEDED(rv)) {
element->mNameSpace = ns;
}