diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-05 12:40:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-05 15:29:16 +0200 |
| commit | 6c5aa32a3ca51f9feecf2ed59944080e766b9ac2 (patch) | |
| tree | 87e8081be5696b7f08013e3b3d07d448ca46b517 /toolkit | |
| parent | d9d6f805fdda16a1a51d50deaba8c3a08b606234 (diff) | |
enable mapping direct from awt::XWindow and weld::Window
Change-Id: I33b1309a4b81bfd84449213099c4f3f781413e00
Reviewed-on: https://gerrit.libreoffice.org/52456
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/inc/helper/unowrapper.hxx | 1 | ||||
| -rw-r--r-- | toolkit/source/helper/unowrapper.cxx | 5 |
2 files changed, 6 insertions, 0 deletions
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<vcl::Window> GetWindow(const css::uno::Reference<css::awt::XWindow>& 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<vcl::Window> UnoWrapper::GetWindow(const css::uno::Reference<css::awt::XWindow>& rWindow) +{ + return VCLUnoHelper::GetWindow(rWindow); +} + void UnoWrapper::SetWindowInterface( vcl::Window* pWindow, css::uno::Reference< css::awt::XWindowPeer> xIFace ) { VCLXWindow* pVCLXWindow = VCLXWindow::GetImplementation( xIFace ); |