desktop/source/lib/init.cxx | 54 ++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 29 deletions(-)
New commits: commit 800c0aebe7dffb88eb5c1d96fd47eb99032fdfe9 Author: Jan Holesovsky <[email protected]> AuthorDate: Thu Oct 15 18:05:35 2020 +0200 Commit: Andras Timar <[email protected]> CommitDate: Fri Oct 16 16:24:27 2020 +0200 lok: Simplify the check for command in sendDialogEvent. Change-Id: I1d2c967b68113d2528b80e91c32170f749ed9335 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104434 Tested-by: Andras Timar <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index b9fd1f9195e7..c8971182893f 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3656,11 +3656,11 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin bIsWeldedDialog = pWidget != nullptr; bool bContinueWithLOKWindow = false; + OUString sAction = aMap["cmd"]; if (bIsWeldedDialog) { OUString sControlType = aMap["type"]; - OUString sAction = aMap["cmd"]; if (sControlType == "tabcontrol") { @@ -3746,36 +3746,32 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin if (pUIWindow) { bool bIsClickAction = false; - 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; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
