[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - desktop/source sc/source

[Pranam Lashkari (via logerrit)]

 desktop/source/lib/init.cxx   |    5 ++---
 sc/source/ui/app/inputwin.cxx |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 50fe88d7ab2c5cc008571cc3d6ed3d6e2a68dd28
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Wed Apr 29 00:20:12 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 27 08:52:21 2020 +0200

    tdf#131230: Sidebar: Can't set Automatic color
    
    This also solved the issue in sidebar with some controls
    when selecting an item it selects the item below
    
    Change-Id: I607b8bc44402b57b5c4833f918fb41b23ddf48c2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93099
    Tested-by: Marco Cecchetti <marco.cecchetti at collabora.com>
    Reviewed-by: Marco Cecchetti <marco.cecchetti at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94855
    Tested-by: Andras Timar <andras.timar at collabora.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index d8f973dc3d83..8d3b0ddf7e26 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3951,9 +3951,8 @@ static void doc_postWindowMouseEvent(LibreOfficeKitDocument* /*pThis*/, unsigned
         return;
     }
 
-    Size aOffset(pWindow->GetOutOffXPixel(), pWindow->GetOutOffYPixel());
-    Point aPos(nX, nY);
-    aPos.Move(aOffset);
+    const Point aPos(nX, nY);
+
     MouseEvent aEvent(aPos, nCount, MouseEventModifiers::SIMPLECLICK, nButtons, nModifier);
 
     if (Dialog* pDialog = dynamic_cast<Dialog*>(pWindow.get()))
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index c1d1e6b50445..a13797776f0c 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -515,7 +515,7 @@ void ScInputWindow::NotifyLOKClient()
         {
             std::vector<vcl::LOKPayloadItem> aItems;
             aItems.emplace_back("type", "calc-input-win");
-            aItems.emplace_back(std::make_pair("position", Point(0, 0).toString()));
+            aItems.emplace_back(std::make_pair("position", Point(GetOutOffXPixel(), GetOutOffYPixel()).toString()));
             aItems.emplace_back(std::make_pair("size", aSize.toString()));
             pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
         }