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

[Szymon Kłos (via logerrit)]

 vcl/jsdialog/executor.cxx |   42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

New commits:
commit 802571046793dd1090c94b598a085ac4b69c90df
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Wed Jun 1 14:52:33 2022 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Jun 2 09:37:16 2022 +0200

    jsdialog: correctly parse click position for drawingarea
    
    Change-Id: I8f0739cea8d2a3472926682f205bc5f5227bdc4c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135241
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Mert Tumer <mert.tu...@collabora.com>

diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx
index 130c48453815..4e8324eb9379 100644
--- a/vcl/jsdialog/executor.cxx
+++ b/vcl/jsdialog/executor.cxx
@@ -174,29 +174,33 @@ bool ExecuteAction(const std::string& nWindowId, const 
OString& rWidget, StringM
             {
                 if (sAction == "click")
                 {
-                    int separatorPos = rData["data"].indexOf(';');
-                    if (separatorPos > 0)
+                    int nSeparatorPos = rData["data"].indexOf(';');
+                    if (nSeparatorPos > 0)
                     {
                         // x;y
-                        std::string_view clickPosX = OUStringToOString(
-                            rData["data"].subView(0, separatorPos), 
RTL_TEXTENCODING_ASCII_US);
-                        std::string_view clickPosY = OUStringToOString(
-                            rData["data"].subView(separatorPos + 1), 
RTL_TEXTENCODING_ASCII_US);
-                        if (!clickPosX.empty() && !clickPosY.empty())
-                        {
-                            double posX = std::atof(clickPosX.data());
-                            double posY = std::atof(clickPosY.data());
-                            OutputDevice& rRefDevice = pArea->get_ref_device();
-                            // We send OutPutSize for the drawing area bitmap
-                            // get_size_request is not necessarily updated
-                            // therefore it may be incorrect.
-                            Size size = rRefDevice.GetOutputSize();
-                            posX = posX * size.Width();
-                            posY = posY * size.Height();
-                            LOKTrigger::trigger_click(*pArea, Point(posX, 
posY));
+                        std::u16string_view nClickPosX = 
rData["data"].subView(0, nSeparatorPos);
+                        std::u16string_view nClickPosY = 
rData["data"].subView(nSeparatorPos + 1);
+
+                        if (nClickPosX.empty() || nClickPosY.empty())
                             return true;
-                        }
+
+                        double posX = std::atof(
+                            OUStringToOString(nClickPosX.data(), 
RTL_TEXTENCODING_ASCII_US)
+                                .getStr());
+                        double posY = std::atof(
+                            OUStringToOString(nClickPosY.data(), 
RTL_TEXTENCODING_ASCII_US)
+                                .getStr());
+                        OutputDevice& rRefDevice = pArea->get_ref_device();
+                        // We send OutPutSize for the drawing area bitmap
+                        // get_size_request is not necessarily updated
+                        // therefore it may be incorrect.
+                        Size size = rRefDevice.GetOutputSize();
+                        posX = posX * size.Width();
+                        posY = posY * size.Height();
+                        LOKTrigger::trigger_click(*pArea, Point(posX, posY));
+                        return true;
                     }
+
                     LOKTrigger::trigger_click(*pArea, Point(10, 10));
                     return true;
                 }