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>

2 files changed, 6 insertions, 0 deletions

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 98c123e217b5..6d39a6b67efe 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -53,6 +53,7 @@ namespace weld
     class Container;
     class MessageDialog;
     class Widget;
+    class Window;
 }
 class AllSettings;
 class DataChangedEvent;
@@ -85,6 +86,7 @@ namespace ui {
 namespace awt {
     class XToolkit;
     class XDisplayConnection;
+    class XWindow;
 }
 } } }
 
@@ -1397,6 +1399,8 @@ public:
 
     static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType,
                                                     VclButtonsType eButtonType, const OUString& rPrimaryMessage);
+
+    static weld::Window* GetFrameWeld(const css::uno::Reference<css::awt::XWindow>& rWindow);
 private:
     DECL_STATIC_LINK( Application, PostEventHandler, void*, void );
 };
diff --git a/include/vcl/unowrap.hxx b/include/vcl/unowrap.hxx
index 090fb8c4242f..bc4cc3ca848e 100644
--- a/include/vcl/unowrap.hxx
+++ b/include/vcl/unowrap.hxx
@@ -40,6 +40,7 @@ namespace star {
 namespace awt {
     class XGraphics;
     class XToolkit;
+    class XWindow;
     class XWindowPeer;
 }
 namespace lang {
@@ -69,6 +70,7 @@ public:
     // Window
     virtual css::uno::Reference< css::awt::XWindowPeer> GetWindowInterface( vcl::Window* pWindow ) = 0;
     virtual void                SetWindowInterface( vcl::Window* pWindow, css::uno::Reference< css::awt::XWindowPeer > xIFace ) = 0;
+    virtual VclPtr<vcl::Window> GetWindow(const css::uno::Reference<css::awt::XWindow>& rxWindow) = 0;
 
     virtual void                WindowDestroyed( vcl::Window* pWindow ) = 0;