From 1d9b0dfb5c5519c9c54c10ea535aeea83db723f5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 1 Sep 2017 21:31:22 +0100 Subject: set parent for open file dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ic823085567afde211b3991ebb60199dd336f562d Reviewed-on: https://gerrit.libreoffice.org/41819 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sfx2/source/dialog/filedlghelper.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sfx2/source/dialog/filedlghelper.cxx') diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 18ebb6e1495b..a4e05ce41483 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -2602,7 +2602,8 @@ void SAL_CALL FileDialogHelper::DialogClosed( const DialogClosedEvent& _rEvent ) m_aDialogClosedLink.Call( this ); } -ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, +ErrCode FileOpenDialog_Impl( const vcl::Window* pParent, + sal_Int16 nDialogType, FileDialogFlags nFlags, const OUString& rFact, std::vector& rpURLList, @@ -2619,9 +2620,9 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType, // read-only to discourage editing (which would invalidate existing // signatures). if (nFlags & FileDialogFlags::SignPDF) - pDialog.reset(new FileDialogHelper(nDialogType, nFlags, SfxResId(STR_SFX_FILTERNAME_PDF), "pdf", rStandardDir, rBlackList)); + pDialog.reset(new FileDialogHelper(nDialogType, nFlags, SfxResId(STR_SFX_FILTERNAME_PDF), "pdf", rStandardDir, rBlackList, pParent)); else - pDialog.reset(new FileDialogHelper(nDialogType, nFlags, rFact, nDialog, SfxFilterFlags::NONE, SfxFilterFlags::NONE, rStandardDir, rBlackList)); + pDialog.reset(new FileDialogHelper(nDialogType, nFlags, rFact, nDialog, SfxFilterFlags::NONE, SfxFilterFlags::NONE, rStandardDir, rBlackList, pParent)); OUString aPath; if ( pPath ) -- cgit