[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/jsdialog

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Wed May 26 06:41:06 UTC 2021


 vcl/jsdialog/executor.cxx |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 63af9c8b5a6159faef0fdb6721647667fc532802
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed May 26 08:38:03 2021 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed May 26 08:40:20 2021 +0200

    jsdialog: execute value action on spinfield
    
    Change-Id: Iee0a5c90ebbd9ca96a60e70678f2b20c32d1bb28
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116137
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 32a257580a90..adebbcb21b9d 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -150,8 +150,10 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, StringMap& rDat
                     if (separatorPos > 0)
                     {
                         // x;y
-                        OString clickPosX = OUStringToOString(rData["data"].copy(0, separatorPos),  RTL_TEXTENCODING_ASCII_US);
-                        OString  clickPosY = OUStringToOString(rData["data"].copy(separatorPos + 1),  RTL_TEXTENCODING_ASCII_US);
+                        OString clickPosX = OUStringToOString(rData["data"].copy(0, separatorPos),
+                                                              RTL_TEXTENCODING_ASCII_US);
+                        OString clickPosY = OUStringToOString(rData["data"].copy(separatorPos + 1),
+                                                              RTL_TEXTENCODING_ASCII_US);
                         if (!clickPosX.isEmpty() && !clickPosY.isEmpty())
                         {
                             double posX = std::atof(clickPosX.getStr());
@@ -173,7 +175,7 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, StringMap& rDat
             auto pSpinField = dynamic_cast<weld::SpinButton*>(pWidget);
             if (pSpinField)
             {
-                if (sAction == "change")
+                if (sAction == "change" || sAction == "value")
                 {
                     OString sValue = OUStringToOString(rData["data"], RTL_TEXTENCODING_ASCII_US);
                     int nValue = std::atoi(sValue.getStr());


More information about the Libreoffice-commits mailing list