summaryrefslogtreecommitdiffstats
path: root/desktop
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2020-10-16 14:34:43 +0200
committerAndras Timar <andras.timar@collabora.com>2020-10-16 16:26:55 +0200
commitebd3d84ad58b31d325dbe17c35759d12ed7a4242 (patch)
tree14ae0a0da34e09628f1534a73d1173dd047b7bf3 /desktop
parentuitest: Rename the "SET" to "TYPE" for Edit boxes + implement the real "SET". (diff)
downloadcore-ebd3d84ad58b31d325dbe17c35759d12ed7a4242.tar.gz
core-ebd3d84ad58b31d325dbe17c35759d12ed7a4242.zip
lok: Make the chart (sub)title work even from the mobile-wizard.
Change-Id: Ic6346a403639e283ade47429f581f91e7a468f63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104436 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/lib/init.cxx12
1 files changed, 9 insertions, 3 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c8971182893f..89cf49dbf6f7 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3641,6 +3641,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin
{
static const OUString sClickAction("CLICK");
static const OUString sSelectAction("SELECT");
+ static const OUString sSetAction("SET");
static const OUString sClearAction("CLEAR");
static const OUString sTypeAction("TYPE");
static const OUString sUpAction("UP");
@@ -3656,12 +3657,11 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin
bIsWeldedDialog = pWidget != nullptr;
bool bContinueWithLOKWindow = false;
+ OUString sControlType = aMap["type"];
OUString sAction = aMap["cmd"];
if (bIsWeldedDialog)
{
- OUString sControlType = aMap["type"];
-
if (sControlType == "tabcontrol")
{
auto pNotebook = dynamic_cast<weld::Notebook*>(pWidget);
@@ -3765,9 +3765,15 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin
{
aMap["TEXT"] = aMap["data"];
- pUIWindow->execute(sClearAction, aMap);
+ pUIWindow->execute(sClearAction, aMap); // FIXME - change the "CLEAR"&"TYPE" to "SET" and test thoroughly; the "TYPE" really types a character by character
pUIWindow->execute(sTypeAction, aMap);
}
+ else if (sControlType == "edit" && sAction == "change") // FIXME - shouldn't "edit" issue "set" instead of "change"?
+ {
+ aMap["TEXT"] = aMap["data"];
+
+ pUIWindow->execute(sSetAction, aMap);
+ }
else if (sAction == "value")
{
aMap["VALUE"] = aMap["data"];