[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sc/source
Marco Cecchetti (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jun 12 12:34:26 UTC 2020
sc/source/ui/app/inputhdl.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit c4e26fb75f904fc56bd7bcaf200b3227b9065afa
Author: Marco Cecchetti <marco.cecchetti at collabora.com>
AuthorDate: Sun Jun 7 21:39:59 2020 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Jun 12 14:33:56 2020 +0200
lok: formula bar: disable tunneled tooltips
Tooltips overlaps the entered text.
Change-Id: If003217fe1270a4a3ebc0ba9eee71cb8f6765760
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95792
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 4ccdfa70b639..5569039be769 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1310,10 +1310,9 @@ namespace {
void ScInputHandler::ShowFuncList( const ::std::vector< OUString > & rFuncStrVec )
{
const SfxViewShell* pViewShell = SfxViewShell::Current();
- if (comphelper::LibreOfficeKit::isActive() &&
- pViewShell && pViewShell->isLOKMobilePhone())
+ if (comphelper::LibreOfficeKit::isActive())
{
- if (rFuncStrVec.size())
+ if (rFuncStrVec.size() && pViewShell && pViewShell->isLOKMobilePhone())
{
auto aPos = pFormulaData->begin();
sal_uInt32 nCurIndex = std::distance(aPos, miAutoPosFormula);
@@ -1367,6 +1366,7 @@ void ScInputHandler::ShowFuncList( const ::std::vector< OUString > & rFuncStrVec
OString s = aPayload.makeStringAndClear();
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CALC_FUNCTION_LIST, s.getStr());
}
+ // not tunnel tooltips in the lok case
return;
}
More information about the Libreoffice-commits
mailing list