mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crash because iterator position wasn't changed in stl conversion

Browse Source 
regression from e0284f4bba

Here's the original code using the pre stl iterators.

if( !pPara && nDepth > 0 &&  rSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_ON &&
    pOutliner->GetDepth( (sal_uInt16) pOutliner->GetAbsPos( (Paragraph*) pList->First() ) ) > 0 )
	pPara = pOutliner->GetParagraph( 0 );  // Put NumBulletItem in outline level 1

Hidden in there is a pList->First() which only gets called if the prior
conditions are true.  pList->First() resets the index of the internal pList
iterator position of pList to 0 i.e. the next call to pList->Prev will now return 0.

The equivalent in the post-stl-conversion code is to jump the reverse_iterator
iter to the last position in the reverse view.

Create a level 10 entry in master view, select level 10, and use the bullets
and numbering dropdown from the side panel to see this crash

Change-Id: I52c22ea52020feb0fb75924f63ebe225be462071
This commit is contained in:
Caolán McNamara
2014-05-21 16:15:16 +01:00
parent 7aed3a0089
commit bbfa7a65cf
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sd/source/ui/view/drawview.cxx
View File

@@ -236,9 +236,18 @@ bool DrawView::SetAttributes(const SfxItemSet& rSet,
++iter;
pPara = iter != aSelList.rend() ? *iter : NULL;
if( !pPara && nDepth > 0 && rSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_ON &&
pOutliner->GetDepth( pOutliner->GetAbsPos(*(aSelList.begin())) ) > 0 )
pPara = pOutliner->GetParagraph( 0 ); // Put NumBulletItem in outline level 1
bool bJumpToLevel1 = false;
if( !pPara && nDepth > 0 && rSet.GetItemState( EE_PARA_NUMBULLET ) == SFX_ITEM_ON )
bJumpToLevel1 = true;
if (bJumpToLevel1)
{
iter = aSelList.rend();
--iter;
if (pOutliner->GetDepth(pOutliner->GetAbsPos(*iter)) > 0)
pPara = pOutliner->GetParagraph( 0 ); // Put NumBulletItem in outline level 1
}
}
mpDocSh->SetWaitCursor( false );