Don't crash when typing Japanese via SCIM.

There should only be one active edit view while the user is typing
into a cell, or else it crashes when an external input method is
being used to input values (such as Japanese).
This commit is contained in:
Kohei Yoshida 2011-12-12 23:13:18 -05:00 committed by Noel Power
parent bcdea3b379
commit 43c7830b03

View file

@ -1719,7 +1719,7 @@ void ScInputHandler::UpdateActiveView()
else
pTableView = NULL;
if (pInputWin)
if (pInputWin && pInputWin->IsInputActive())
pTopView = pInputWin->GetEditView();
else
pTopView = NULL;
@ -2047,7 +2047,7 @@ void ScInputHandler::SyncViews( EditView* pSourceView )
lcl_SetTopSelection( pTableView, aSel );
}
// Only sync selection from topView if we are actually editiing there
else if ( ( eMode == SC_INPUT_TOP ) && pTopView && pTableView)
else if (pTopView && pTableView)
{
aSel = pTopView->GetSelection();
lcl_SetTopSelection( pTableView, aSel );