summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorHenry Castro <hcastro@collabora.com>2019-11-30 09:36:27 -0400
committerJan Holesovsky <kendy@collabora.com>2019-12-10 13:14:55 +0100
commit95801714f4159cbbe5fc4249dc6af037fd716f7e (patch)
tree04582738357c73289019a1493aaeaa451c9c51c0 /vcl
parent4a437520d6295327d42a586e908c4c6e7b24561e (diff)
lok: fix welded dialogs
In the tiled rendering case the dialogs, run asynchronous due to multiple user access. In order to send the messages to the client side, the dialog has to hook a LOKNotifier in the constructor of the SfxViewShell. However, the new weld wrapper classes use the Frame Window, (i.e. Window::GetFarmeWeld()), as a parent of the dialogs. On the other hand, in order to avoid getting the interface implementation inside implementation classes, it has been created a new method Window::GetFrameWindow(), otherwise I have to do a bureaucratic conversion between Interfaces to Implementations ( i.e. UnoWrapperBase::GetUnoWrapper() ) Change-Id: I32c34d82a89211a025250e65a05ce47d30efa0b8 Reviewed-on: https://gerrit.libreoffice.org/84117 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/window2.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 74e84ba381fa..3e05a54f0b20 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -869,6 +869,12 @@ weld::Window* Window::GetFrameWeld() const
return pFrame ? pFrame->GetFrameWeld() : nullptr;
}
+vcl::Window* Window::GetFrameWindow() const
+{
+ SalFrame* pFrame = ImplGetFrame();
+ return pFrame ? pFrame->GetWindow() : nullptr;
+}
+
vcl::Window* Window::ImplGetParent() const
{
return mpWindowImpl ? mpWindowImpl->mpParent.get() : nullptr;