mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 11:55:49 +00:00
Fix for SF1in bug 299356: Indentation increases line spacing for same indent
level Modified CEditBuffer::IndentContainer (case 0) to combine adjacent blockquote containers. Reviewed by mjudge.
This commit is contained in:
parent
3932bb7884
commit
08ce51a552
@ -3672,14 +3672,37 @@ void CEditBuffer::IndentContainer( CEditContainerElement *pContainer, CEditListE
|
||||
pTag->type = P_BLOCKQUOTE;
|
||||
break;
|
||||
}
|
||||
CEditElement *pEle = new CEditListElement( 0, pTag, GetRAMCharSetID() );
|
||||
PA_FreeTag( pTag );
|
||||
|
||||
pEle->InsertAfter( pContainer );
|
||||
pContainer->Unlink();
|
||||
pContainer->InsertAsFirstChild( pEle );
|
||||
// Return the new list created
|
||||
pList = (CEditListElement*)pEle;
|
||||
if (pTag->type == P_BLOCKQUOTE && pPrev
|
||||
&& pPrev->GetType() == pTag->type)
|
||||
{
|
||||
CEditElement *pChild = pPrev->GetLastChild();
|
||||
if( pChild )
|
||||
{
|
||||
pContainer->Unlink();
|
||||
pContainer->InsertAfter( pChild );
|
||||
}
|
||||
else
|
||||
{
|
||||
pContainer->Unlink();
|
||||
pContainer->InsertAsFirstChild( pPrev );
|
||||
}
|
||||
if( pNext && pNext->IsList() )
|
||||
{
|
||||
pPrev->Merge( pNext );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
CEditElement *pEle = new CEditListElement( 0, pTag, GetRAMCharSetID() );
|
||||
pEle->InsertAfter( pContainer );
|
||||
pContainer->Unlink();
|
||||
pContainer->InsertAsFirstChild( pEle );
|
||||
// Return the new list created
|
||||
pList = (CEditListElement*)pEle;
|
||||
}
|
||||
|
||||
PA_FreeTag( pTag );
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user