[PATCH] [REVIEW:3-5] fdo#51243 freeze regression in 3.5.5 wrt to 3.5.4 infinite loope

[Lionel Elie Mamane]

fdo#51243 caused by error in fix to fdo#48932, which introduced
infinite loop, and thus from the user's POV a freeze of the whole LibO
process.

Not visible in the patch, here's the code affected:

void SwFrameControlsManager::SetReadonlyControls( bool bReadonly )
{
    map< FrameControlType, SwFrameControlPtrMap >::iterator pIt =
    m_aControls.begin();

    while ( pIt != m_aControls.end() )
    {
        SwFrameControlPtrMap::iterator aCtrlIt = pIt->second.begin();
        while ( aCtrlIt != pIt->second.end() )
        {
            aCtrlIt->second->SetReadonly( bReadonly );
            ++aCtrlIt;
        }
    }
}

There's "obviously" a "++pIt;" missing there!

Attached patch fixes that. Please apply to libreoffice-3-5 and
libreoffice-3-5-5.


Thanks.

-- 
Lionel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-fdo-51243-infinite-loop-in-SwFrameControlsManager-Se.patch
Type: text/x-diff
Size: 839 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20120620/5dba95b1/attachment.patch>