strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lok sc: Fix the formula input bar and address bar notifications.

Browse source 
Apparently we did not have the pInputWin living in the background; but
now we have.  There is no reason to treat it in an 'else' branch, these
checks should be separate either way.

Change-Id: Ibb8d92fb1e2803942460d2063847917d082fcb2e
Reviewed-on: https://gerrit.libreoffice.org/71863
Reviewed-by: Aron Budea <aron.budea@collabora.com>
Tested-by: Aron Budea <aron.budea@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/76292
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Jan Holesovsky 2018-11-15 11:51:42 +01:00 committed by Noel Grandin
parent bf7adf4c24
commit 1d77ea8f3e
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sc/source/ui/app/inputhdl.cxx
View file

@ -3688,11 +3688,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
if ( pInputWin )
pInputWin->SetTextString(aString);
else if (comphelper::LibreOfficeKit::isActive())
{
if (pActiveViewSh)
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, aString.toUtf8().getStr());
}
if (comphelper::LibreOfficeKit::isActive() && pActiveViewSh)
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, aString.toUtf8().getStr());
}
if ( pInputWin || comphelper::LibreOfficeKit::isActive()) // Named range input
@ -3730,10 +3728,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
pInputWin->SetAccessibilityEventsSuppressed(bIsSuppressed);
pInputWin->SetSumAssignMode();
}
else if (pActiveViewSh)
{
if (comphelper::LibreOfficeKit::isActive() && pActiveViewSh)
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_ADDRESS, aPosStr.toUtf8().getStr());
}
}
if (bStopEditing)