commit 43c7830b03d141ae11d8617c0fdabefa32dd243c
author Kohei Yoshida <kohei.yoshida@suse.com> Mon Dec 12 23:13:18 2011 -0500
committer Noel Power <noel.power@novell.com> Tue Dec 13 13:06:03 2011 +0000
tree e5effd7a26d16caa920a2c50a11808e47a78ebbd
parent bcdea3b379637a98e5bbc304078149ca6c2b6e03

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).

sc/source/ui/app/inputhdl.cxx

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 98cfac2..7620df7e 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -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 );