fixes bug 54895: certain editor operations (like align) crashed when applied to mulit-cell table cell selections; r=kin; sr=sfraser; a=jar
git-svn-id: svn://10.0.0.236/trunk@80872 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
71b8b16da9
commit
246c0aaeeb
@ -3419,7 +3419,7 @@ nsHTMLEditRules::GetNodesForOperation(nsISupportsArray *inArrayOfRanges,
|
||||
// first register ranges for special editor gravity
|
||||
for (i = 0; i < (PRInt32)rangeCount; i++)
|
||||
{
|
||||
isupports = (dont_AddRef)(inArrayOfRanges->ElementAt(i));
|
||||
isupports = (dont_AddRef)(inArrayOfRanges->ElementAt(0));
|
||||
opRange = do_QueryInterface(isupports);
|
||||
nsRangeStore *item = new nsRangeStore();
|
||||
if (!item) return NS_ERROR_NULL_POINTER;
|
||||
@ -3440,6 +3440,7 @@ nsHTMLEditRules::GetNodesForOperation(nsISupportsArray *inArrayOfRanges,
|
||||
{
|
||||
nsRangeStore *item = (nsRangeStore*)rangeItemArray.ElementAt(0);
|
||||
if (!item) return NS_ERROR_NULL_POINTER;
|
||||
rangeItemArray.RemoveElementAt(0);
|
||||
mEditor->mRangeUpdater.DropRangeItem(item);
|
||||
res = item->GetRange(&opRange);
|
||||
if (NS_FAILED(res)) return res;
|
||||
|
||||
@ -3419,7 +3419,7 @@ nsHTMLEditRules::GetNodesForOperation(nsISupportsArray *inArrayOfRanges,
|
||||
// first register ranges for special editor gravity
|
||||
for (i = 0; i < (PRInt32)rangeCount; i++)
|
||||
{
|
||||
isupports = (dont_AddRef)(inArrayOfRanges->ElementAt(i));
|
||||
isupports = (dont_AddRef)(inArrayOfRanges->ElementAt(0));
|
||||
opRange = do_QueryInterface(isupports);
|
||||
nsRangeStore *item = new nsRangeStore();
|
||||
if (!item) return NS_ERROR_NULL_POINTER;
|
||||
@ -3440,6 +3440,7 @@ nsHTMLEditRules::GetNodesForOperation(nsISupportsArray *inArrayOfRanges,
|
||||
{
|
||||
nsRangeStore *item = (nsRangeStore*)rangeItemArray.ElementAt(0);
|
||||
if (!item) return NS_ERROR_NULL_POINTER;
|
||||
rangeItemArray.RemoveElementAt(0);
|
||||
mEditor->mRangeUpdater.DropRangeItem(item);
|
||||
res = item->GetRange(&opRange);
|
||||
if (NS_FAILED(res)) return res;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user