Kaydet (Commit) 01f712b6 authored tarafından Mike Kaganski's avatar Mike Kaganski

Avoid assertion on user data

User can have unpaired ScreenUpdating in macros; so avoid calling
ScDocument::UnlockAdjustHeight, which asserts proper lock/unlock
order and number, when it is not locked.

Change-Id: I1c316ff4a5b993cbe08a9e95f5807153ed0953c8
Reviewed-on: https://gerrit.libreoffice.org/56763
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst ac7141d7
......@@ -1398,7 +1398,10 @@ void SAL_CALL ScVbaApplication::setScreenUpdating(sal_Bool bUpdate)
if( bUpdate )
{
rDoc.UnlockAdjustHeight();
// Since setting ScreenUpdating from user code might be unpaired, avoid calling function,
// that asserts correct lock/unlock order and number, when not locked.
if(rDoc.IsAdjustHeightLocked())
rDoc.UnlockAdjustHeight();
if( !rDoc.IsAdjustHeightLocked() )
pDocShell->UpdateAllRowHeights();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment