Kaydet (Commit) 532dccdc authored tarafından Michael Meeks's avatar Michael Meeks

vclref: protect vs. double disposes.

Change-Id: I86fe17ad9afba7ee1e87aaa732bebee1746c140f
üst 7553deec
......@@ -334,9 +334,14 @@ void Ruler::dispose()
if ( mnUpdateEvtId )
Application::RemoveUserEvent( mnUpdateEvtId );
delete mpSaveData;
mpSaveData = NULL;
delete mpDragData;
mpDragData = NULL;
if( pAccContext )
{
pAccContext->release();
pAccContext = NULL;
}
Window::dispose();
}
......
......@@ -353,11 +353,16 @@ void SvxRuler::dispose()
pBindings->EnterRegistrations();
for(sal_uInt16 i = 0; i < CTRL_ITEM_COUNT && pCtrlItem[i]; ++i)
delete pCtrlItem[i];
delete[] pCtrlItem;
if (pCtrlItem)
{
for(sal_uInt16 i = 0; i < CTRL_ITEM_COUNT && pCtrlItem[i]; ++i)
delete pCtrlItem[i];
delete[] pCtrlItem;
pCtrlItem = NULL;
}
pBindings->LeaveRegistrations();
Ruler::dispose();
}
......
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