Bug 675553 - Switch from PRBool to bool on a CLOSED TREE , r=bsmedberg,khuey,bz,cjones
This commit is contained in:
@@ -47,9 +47,9 @@
|
||||
|
||||
const PRUnichar nbsp = 160;
|
||||
|
||||
static PRBool IsBlockNode(nsIDOMNode* node)
|
||||
static bool IsBlockNode(nsIDOMNode* node)
|
||||
{
|
||||
PRBool isBlock (PR_FALSE);
|
||||
bool isBlock (false);
|
||||
nsHTMLEditor::NodeIsBlockStatic(node, &isBlock);
|
||||
return isBlock;
|
||||
}
|
||||
@@ -411,7 +411,7 @@ nsWSRunObject::InsertText(const nsAString& aStringToInsert,
|
||||
// before we are called. Eventually, all that logic will be pushed down into
|
||||
// here and made more efficient.
|
||||
PRUint32 j;
|
||||
PRBool prevWS = PR_FALSE;
|
||||
bool prevWS = false;
|
||||
for (j=0; j<=lastCharIndex; j++)
|
||||
{
|
||||
if (nsCRT::IsAsciiSpace(theString[j]))
|
||||
@@ -1600,7 +1600,7 @@ nsWSRunObject::DeleteChars(nsIDOMNode *aStartNode, PRInt32 aStartOffset,
|
||||
res = range->SetEnd(aEndNode, aEndOffset);
|
||||
NS_ENSURE_SUCCESS(res, res);
|
||||
}
|
||||
PRBool nodeBefore, nodeAfter;
|
||||
bool nodeBefore, nodeAfter;
|
||||
nsCOMPtr<nsIContent> content (do_QueryInterface(node));
|
||||
res = mHTMLEditor->sRangeHelper->CompareNodeToRange(content, range, &nodeBefore, &nodeAfter);
|
||||
NS_ENSURE_SUCCESS(res, res);
|
||||
@@ -1851,7 +1851,7 @@ nsWSRunObject::GetAsciiWSBounds(PRInt16 aDir, nsIDOMNode *aNode, PRInt32 aOffset
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsWSRunObject::FindRun(nsIDOMNode *aNode, PRInt32 aOffset, WSFragment **outRun, PRBool after)
|
||||
nsWSRunObject::FindRun(nsIDOMNode *aNode, PRInt32 aOffset, WSFragment **outRun, bool after)
|
||||
{
|
||||
// given a dompoint, find the ws run that is before or after it, as caller needs
|
||||
NS_ENSURE_TRUE(aNode && outRun, NS_ERROR_NULL_POINTER);
|
||||
@@ -2031,9 +2031,9 @@ nsWSRunObject::CheckTrailingNBSPOfRun(WSFragment *aRun)
|
||||
// examine what is before and after the trailing nbsp, if any.
|
||||
NS_ENSURE_TRUE(aRun, NS_ERROR_NULL_POINTER);
|
||||
WSPoint thePoint;
|
||||
PRBool leftCheck = PR_FALSE;
|
||||
PRBool spaceNBSP = PR_FALSE;
|
||||
PRBool rightCheck = PR_FALSE;
|
||||
bool leftCheck = false;
|
||||
bool spaceNBSP = false;
|
||||
bool rightCheck = false;
|
||||
|
||||
// confirm run is normalWS
|
||||
if (aRun->mType != eNormalWS) return NS_ERROR_FAILURE;
|
||||
@@ -2146,7 +2146,7 @@ nsWSRunObject::CheckTrailingNBSP(WSFragment *aRun, nsIDOMNode *aNode, PRInt32 aO
|
||||
// end up after the inserted object.
|
||||
NS_ENSURE_TRUE(aRun && aNode, NS_ERROR_NULL_POINTER);
|
||||
WSPoint thePoint;
|
||||
PRBool canConvert = PR_FALSE;
|
||||
bool canConvert = false;
|
||||
nsresult res = GetCharBefore(aNode, aOffset, &thePoint);
|
||||
if (NS_SUCCEEDED(res) && thePoint.mTextNode && thePoint.mChar == nbsp)
|
||||
{
|
||||
@@ -2185,7 +2185,7 @@ nsWSRunObject::CheckLeadingNBSP(WSFragment *aRun, nsIDOMNode *aNode, PRInt32 aOf
|
||||
// text, so we don't have to worry about what is before it. What is before it now will
|
||||
// end up before the inserted text.
|
||||
WSPoint thePoint;
|
||||
PRBool canConvert = PR_FALSE;
|
||||
bool canConvert = false;
|
||||
nsresult res = GetCharAfter(aNode, aOffset, &thePoint);
|
||||
if (NS_SUCCEEDED(res) && thePoint.mChar == nbsp)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user