diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-07 10:54:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-08 11:27:18 +0200 |
| commit | 1af5f6e8d1bdec9bd2f14d0f5f8fad9c0fdead2b (patch) | |
| tree | 84773114c08ca86424af4f8a17ec69d295908e01 /sw/source/ui/dbui | |
| parent | bb2258f7e4bcf078810cf1e40fdec2f17576c3b2 (diff) | |
set parent for file dialog helper
Change-Id: I3994ee48dcb5b2732cb27cb9ccb54926abf0828a
Reviewed-on: https://gerrit.libreoffice.org/42048
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 'sw/source/ui/dbui')
| -rw-r--r-- | sw/source/ui/dbui/addresslistdialog.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dbui/createaddresslistdialog.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmdocselectpage.cxx | 3 | ||||
| -rw-r--r-- | sw/source/ui/dbui/mmresultdialogs.cxx | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 96c77cd9edd7..254bf5a1cd68 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -345,7 +345,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl, Button*, void) { SwView* pView = m_pAddressPage->GetWizard()->GetSwView(); - const OUString sNewSource = SwDBManager::LoadAndRegisterDataSource(pView ? pView->GetDocShell() : nullptr); + const OUString sNewSource = SwDBManager::LoadAndRegisterDataSource(this, pView ? pView->GetDocShell() : nullptr); if(!sNewSource.isEmpty()) { SvTreeListEntry* pNewSource = m_pListLB->InsertEntry(sNewSource); diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index 1303d8da3207..ea59468ae7b6 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -623,7 +623,8 @@ IMPL_LINK_NOARG(SwCreateAddressListDialog, OkHdl_Impl, Button*, void) { if(m_sURL.isEmpty()) { - sfx2::FileDialogHelper aDlgHelper( TemplateDescription::FILESAVE_SIMPLE ); + sfx2::FileDialogHelper aDlgHelper(TemplateDescription::FILESAVE_SIMPLE, + FileDialogFlags::NONE, this); uno::Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker(); const OUString sPath( SvtPathOptions().SubstituteVariable("$(userurl)/database") ); diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 4a9184446dbb..e8df54a1838c 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -135,7 +135,8 @@ IMPL_LINK(SwMailMergeDocSelectPage, FileSelectHdl, Button*, pButton, void) if(!bTemplate) { - sfx2::FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE ); + sfx2::FileDialogHelper aDlgHelper(TemplateDescription::FILEOPEN_SIMPLE, + FileDialogFlags::NONE, this); Reference < XFilePicker3 > xFP = aDlgHelper.GetFilePicker(); xFP->setDisplayDirectory( SvtPathOptions().GetWorkPath() ); diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 1c3f17b4b52a..a53affbf99d2 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -581,7 +581,7 @@ IMPL_LINK(SwMMResultSaveDialog, SaveOutputHdl_Impl, Button*, pButton, void) if(m_pSaveAsOneRB->IsChecked()) { OUString sFilter; - const OUString sPath = SwMailMergeHelper::CallSaveAsDialog(sFilter); + const OUString sPath = SwMailMergeHelper::CallSaveAsDialog(this, sFilter); if (sPath.isEmpty()) { // just return back to the dialog @@ -631,7 +631,7 @@ IMPL_LINK(SwMMResultSaveDialog, SaveOutputHdl_Impl, Button*, pButton, void) nEnd = documentCount; } OUString sFilter; - OUString sPath = SwMailMergeHelper::CallSaveAsDialog(sFilter); + OUString sPath = SwMailMergeHelper::CallSaveAsDialog(this, sFilter); if (sPath.isEmpty()) { // just return back to the dialog |