sc/source/ui/app/inputhdl.cxx | 26 +++++++++++++++++++++++---
vcl/jsdialog/enabled.cxx | 1 +
2 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit 9672841f6d4afb11debe268ee45a686643c54a4e
Author: Rashesh <rashesh.pa...@collabora.com>
AuthorDate: Tue Aug 20 13:10:15 2024 +0530
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Sep 9 15:16:11 2024 +0200
lokit: calc: send named ranges as well on calcfunctionlist callback
Change-Id: Ib8082d81da0eec54ba201b5958b86770a508ec91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172099
Reviewed-by: Gökay ŞATIR <gokaysa...@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
(cherry picked from commit d805785b2cf7c570fc0bb480100bc50d8fbc5077)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172745
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 95a971a4dd49..233a8656f07c 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1472,7 +1472,20 @@ void ScInputHandler::ShowFuncList( const ::std::vector<
OUString > & rFuncStrVec
+ "\", "
"\"description\": \""
+ escapeJSON(ppFDesc->getDescription())
- + "\"}, ");
+ + "\", \"namedRange\": false }, ");
+ }
+ else
+ {
+ aPayload.append("{"
+ "\"index\": "
+ +
OString::number(static_cast<sal_Int64>(nCurIndex))
+ + ", "
+ "\"signature\": \""
+ + escapeJSON(aFuncNameStr)
+ + "\", "
+ "\"description\": \""
+ + escapeJSON(OUString())
+ + "\", \"namedRange\": true }, ");
}
}
++nCurIndex;
@@ -1480,8 +1493,15 @@ void ScInputHandler::ShowFuncList( const ::std::vector<
OUString > & rFuncStrVec
nCurIndex = 0;
}
sal_Int32 nLen = aPayload.getLength();
- aPayload[nLen - 2] = ' ';
- aPayload[nLen - 1] = ']';
+ if (nLen <= 2)
+ {
+ aPayload[nLen - 1] = ']';
+ }
+ else
+ {
+ aPayload[nLen - 2] = ' ';
+ aPayload[nLen - 1] = ']';
+ }
OString s = aPayload.makeStringAndClear();
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_CALC_FUNCTION_LIST, s);
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 479e25fee7a9..07e2919fc4e9 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -153,6 +153,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool
bMobile)
|| rUIFile == u"modules/scalc/ui/validationhelptabpage.ui"
|| rUIFile == u"modules/scalc/ui/warnautocorrect.ui"
|| rUIFile == u"modules/scalc/ui/ztestdialog.ui"
+ || rUIFile == u"modules/scalc/ui/definedatabaserangedialog.ui"
// schart
|| rUIFile == u"modules/schart/ui/attributedialog.ui"
|| rUIFile == u"modules/schart/ui/charttypedialog.ui"
