Kaydet (Commit) 4a226f94 authored tarafından Jan Holesovsky's avatar Jan Holesovsky Kaydeden (comit) Aron Budea

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

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/71863Reviewed-by: 's avatarAron Budea <aron.budea@collabora.com>
Tested-by: 's avatarAron Budea <aron.budea@collabora.com>
üst 8e9c36df
...@@ -3692,11 +3692,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, ...@@ -3692,11 +3692,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
if ( pInputWin ) if ( pInputWin )
pInputWin->SetTextString(aString); pInputWin->SetTextString(aString);
else if (comphelper::LibreOfficeKit::isActive())
{ if (comphelper::LibreOfficeKit::isActive() && pActiveViewSh)
if (pActiveViewSh) pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, aString.toUtf8().getStr());
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_FORMULA, aString.toUtf8().getStr());
}
} }
if ( pInputWin || comphelper::LibreOfficeKit::isActive()) // Named range input if ( pInputWin || comphelper::LibreOfficeKit::isActive()) // Named range input
...@@ -3734,10 +3732,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, ...@@ -3734,10 +3732,9 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
pInputWin->SetAccessibilityEventsSuppressed(bIsSuppressed); pInputWin->SetAccessibilityEventsSuppressed(bIsSuppressed);
pInputWin->SetSumAssignMode(); pInputWin->SetSumAssignMode();
} }
else if (pActiveViewSh)
{ if (comphelper::LibreOfficeKit::isActive() && pActiveViewSh)
pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_ADDRESS, aPosStr.toUtf8().getStr()); pActiveViewSh->libreOfficeKitViewCallback(LOK_CALLBACK_CELL_ADDRESS, aPosStr.toUtf8().getStr());
}
} }
if (bStopEditing) if (bStopEditing)
......
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