Kaydet (Commit) 94c8978a authored tarafından Yong Lin Ma's avatar Yong Lin Ma

119994: Range picker dialog is changed to modal mode wrongly

Patch by: Peng YunQuan
Review by: mayongl
Reported by: Yan Ji
üst 4034798d
......@@ -877,8 +877,21 @@ void Dialog::SetModalInputMode( sal_Bool bModal )
mpPrevExecuteDlg->EnableInput( sal_True, sal_True, sal_True, this );
// ensure continued modality of prev dialog
// do not change modality counter
mpPrevExecuteDlg->SetModalInputMode( sal_False );
mpPrevExecuteDlg->SetModalInputMode( sal_True );
// #i119994# need find the last modal dialog before reactive it
Dialog * pPrevModalDlg = mpPrevExecuteDlg;
while( pPrevModalDlg && !pPrevModalDlg->IsModalInputMode() )
pPrevModalDlg = pPrevModalDlg->mpPrevExecuteDlg;
if( pPrevModalDlg &&
( pPrevModalDlg == mpPrevExecuteDlg
|| !pPrevModalDlg->IsWindowOrChild( this, sal_True ) ) )
{
mpPrevExecuteDlg->SetModalInputMode( sal_False );
mpPrevExecuteDlg->SetModalInputMode( sal_True );
}
}
}
}
......
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