diff options
author | Pranam Lashkari <lpranam@collabora.com> | 2020-04-29 00:20:12 +0530 |
---|---|---|
committer | Marco Cecchetti <marco.cecchetti@collabora.com> | 2020-05-05 14:44:44 +0200 |
commit | 50724c796dbb52b73aa47a85d720d2e3200a0dec (patch) | |
tree | 4c0ee0ce6844a5da578ec317f618ce3f37ef6ef7 | |
parent | 4a6175529c05b119471712889f5d50d7e8b5d91c (diff) |
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@collabora.com>
Reviewed-by: Marco Cecchetti <marco.cecchetti@collabora.com>
(cherry picked from commit 756bbe3f94fe1736406b7fd16ce62a67e7e62769)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93380
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
-rw-r--r-- | desktop/source/lib/init.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/app/inputwin.cxx | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 26dda0f96908..ccd32a035ff5 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3829,9 +3829,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); vcl::EnableDialogInput(pWindow); diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index c9b69f63ad5e..4c186610e0ad 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -524,7 +524,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); } |