diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-01 21:31:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-02 14:34:23 +0200 |
| commit | 1d9b0dfb5c5519c9c54c10ea535aeea83db723f5 (patch) | |
| tree | 249d60e0e76d893901ea617219a80b6b27f223f9 /sfx2 | |
| parent | 670403dff483e6789f974c78ab7a324fa39647c9 (diff) | |
set parent for open file dialog
Change-Id: Ic823085567afde211b3991ebb60199dd336f562d
Reviewed-on: https://gerrit.libreoffice.org/41819
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 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 17564eed84ab..aed27292c7c3 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -639,10 +639,10 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) pBlackListItem->GetStringList( aBlackList ); - ErrCode nErr = sfx2::FileOpenDialog_Impl( + ErrCode nErr = sfx2::FileOpenDialog_Impl(GetTopWindow(), nDialogType, eDialogFlags, OUString(), aURLList, - aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList ); + aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList); if ( nErr == ERRCODE_ABORT ) { 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<OUString>& 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 ) |