From 6c5aa32a3ca51f9feecf2ed59944080e766b9ac2 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 5 Apr 2018 12:40:52 +0100 Subject: enable mapping direct from awt::XWindow and weld::Window MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I33b1309a4b81bfd84449213099c4f3f781413e00 Reviewed-on: https://gerrit.libreoffice.org/52456 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- toolkit/inc/helper/unowrapper.hxx | 1 + toolkit/source/helper/unowrapper.cxx | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'toolkit') diff --git a/toolkit/inc/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx index f58494a70a08..31844f12cd35 100644 --- a/toolkit/inc/helper/unowrapper.hxx +++ b/toolkit/inc/helper/unowrapper.hxx @@ -54,6 +54,7 @@ public: // Window virtual css::uno::Reference< css::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow ) override; virtual void SetWindowInterface( vcl::Window* pWindow, css::uno::Reference< css::awt::XWindowPeer> xIFace ) override; + virtual VclPtr GetWindow(const css::uno::Reference& rxWindow) override; void WindowDestroyed( vcl::Window* pWindow ) override; diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index 151536d44baa..c389d04ed8fa 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -161,6 +161,11 @@ css::uno::Reference< css::awt::XWindowPeer> UnoWrapper::GetWindowInterface( vcl: return xPeer; } +VclPtr UnoWrapper::GetWindow(const css::uno::Reference& rWindow) +{ + return VCLUnoHelper::GetWindow(rWindow); +} + void UnoWrapper::SetWindowInterface( vcl::Window* pWindow, css::uno::Reference< css::awt::XWindowPeer> xIFace ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( xIFace ); -- cgit