From 2f423a5feba085bad40ce53f512480507603c28c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szymon=20K=C5=82os?= Date: Thu, 9 Jun 2022 17:41:15 +0200 Subject: jsdialog: toggle toolbox buttons correctly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic02f9ceab29257ebc4cb6261aae10c4f1a7ef176 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135562 Tested-by: Andras Timar Reviewed-by: Andras Timar (cherry picked from commit b6b7b3a5a46790baf2266aaeb10976753dfe0fce) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135539 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos --- vcl/jsdialog/executor.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx index 2da2ab5b9608..8e570ccbe2e4 100644 --- a/vcl/jsdialog/executor.cxx +++ b/vcl/jsdialog/executor.cxx @@ -325,8 +325,9 @@ bool ExecuteAction(const std::string& nWindowId, const OString& rWidget, StringM } else if (sAction == "togglemenu") { - pToolbar->set_menu_item_active( - OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US), true); + OString sId = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US); + bool bIsActive = pToolbar->get_menu_item_active(sId); + pToolbar->set_menu_item_active(sId, !bIsActive); return true; } } -- cgit v1.2.1