[Libreoffice-commits] core.git: svx/source

[Caolán McNamara (via logerrit)]

 svx/source/form/fmvwimp.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 7c2ddc3ffd2d0f761076363d116288b40370233c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Sep 1 17:00:33 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Sep 1 20:20:12 2019 +0200

    add explicit parent to forms wizards
    
    Change-Id: I2737a43e9c8129163699c922e556c92af566fa55
    Reviewed-on: https://gerrit.libreoffice.org/78370
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 4f1aad555560..69eed6d706a9 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -43,6 +43,7 @@
 #include <svx/svdogrp.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/xmlexchg.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
@@ -1058,7 +1059,9 @@ IMPL_LINK_NOARG( FmXFormView, OnStartControlWizard, void*, void )
     {
         // build the argument list
         ::comphelper::NamedValueCollection aWizardArgs;
-        aWizardArgs.put( "ObjectModel", m_xLastCreatedControlModel );
+        aWizardArgs.put("ObjectModel", m_xLastCreatedControlModel);
+        const vcl::Window* pCurrentWindow = m_pView ? dynamic_cast<const vcl::Window*>(m_pView->GetActualOutDev()) : nullptr;
+        aWizardArgs.put("ParentWindow", VCLUnoHelper::GetInterface(const_cast<vcl::Window*>(pCurrentWindow)));
 
         // create the wizard object
         Reference< XExecutableDialog > xWizard;