ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

lok: Simplify the check for command in sendDialogEvent.

Browse Source 
Change-Id: I1d2c967b68113d2528b80e91c32170f749ed9335
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104434
Tested-by: Andras Timar <andras.timar@collabora.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105738
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
This commit is contained in:
Jan Holesovsky
2020-11-13 14:34:50 +01:00
parent 5858f62882
commit dd2532203b
1 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/source/lib/init.cxx
+25 -32
View File
@@ -3740,43 +3740,36 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned long
WindowUIObject aUIObject(pWindow);
std::unique_ptr<UIObject> pUIWindow(aUIObject.get_visible_child(aMap["id"]));
if (pUIWindow) {
bool bIsClickAction = false;
OUString sAction((aMap.find("cmd") != aMap.end())? aMap["cmd"]: "");
if (aMap.find("cmd") != aMap.end()) {
if (aMap["cmd"] == "selected")
{
aMap["POS"] = aMap["data"];
aMap["TEXT"] = aMap["data"];
if (sAction == "selected")
{
aMap["POS"] = aMap["data"];
aMap["TEXT"] = aMap["data"];
pUIWindow->execute(sSelectAction, aMap);
}
else if (aMap["cmd"] == "plus")
{
pUIWindow->execute(sUpAction, aMap);
}
else if (aMap["cmd"] == "minus")
{
pUIWindow->execute(sDownAction, aMap);
}
else if (aMap["cmd"] == "set")
{
aMap["TEXT"] = aMap["data"];
pUIWindow->execute(sSelectAction, aMap);
}
else if (sAction == "plus")
{
pUIWindow->execute(sUpAction, aMap);
}
else if (sAction == "minus")
{
pUIWindow->execute(sDownAction, aMap);
}
else if (sAction == "set")
{
aMap["TEXT"] = aMap["data"];
pUIWindow->execute(sClearAction, aMap);
pUIWindow->execute(sTypeAction, aMap);
}
else if (aMap["cmd"] == "value")
{
aMap["VALUE"] = aMap["data"];
pUIWindow->execute(sValue, aMap);
}
else
bIsClickAction = true;
pUIWindow->execute(sClearAction, aMap);
pUIWindow->execute(sTypeAction, aMap);
}
else if (sAction == "value")
{
aMap["VALUE"] = aMap["data"];
pUIWindow->execute(sValue, aMap);
}
else
bIsClickAction = true;
if (bIsClickAction)
pUIWindow->execute(sClickAction, aMap);
}
}