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 /cui | |
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 'cui')
-rw-r--r-- | cui/source/customize/acccfg.cxx | 2 | ||||
-rw-r--r-- | cui/source/customize/cfg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/cuigaldlg.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/insdlg.cxx | 3 | ||||
-rw-r--r-- | cui/source/options/doclinkdialog.cxx | 4 | ||||
-rw-r--r-- | cui/source/options/optinet2.cxx | 2 | ||||
-rw-r--r-- | cui/source/options/optjava.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 5 | ||||
-rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tpline.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tplnedef.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/tplneend.cxx | 5 |
13 files changed, 19 insertions, 22 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 04d055a5537b..0186c798fff6 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1397,7 +1397,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( StartFileDialogType nType, const short nDialogType = bSave ? ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION : ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE; delete m_pFileDlg; - m_pFileDlg = new sfx2::FileDialogHelper( nDialogType ); + m_pFileDlg = new sfx2::FileDialogHelper(nDialogType, FileDialogFlags::NONE, this); m_pFileDlg->SetTitle( rTitle ); m_pFileDlg->AddFilter( aFilterAllStr, FILEDIALOG_FILTER_ALL ); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 195517218184..94cbe5f2f724 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -3196,7 +3196,7 @@ IMPL_LINK_NOARG( SvxIconSelectorDialog, ImportHdl, Button *, void) { sfx2::FileDialogHelper aImportDialog( css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW, - FileDialogFlags::Graphic | FileDialogFlags::MultiSelection ); + FileDialogFlags::Graphic | FileDialogFlags::MultiSelection, this); // disable the link checkbox in the dialog uno::Reference< css::ui::dialogs::XFilePickerControlAccess > diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 599ec984b70f..063e311f2b66 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -1086,7 +1086,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl, Button*, void) if( !m_pLbxFound->GetSelectEntryCount() || !bEntriesFound ) { - SvxOpenGraphicDialog aDlg("Gallery"); + SvxOpenGraphicDialog aDlg("Gallery", this); aDlg.EnableLink(false); aDlg.AsLink(false); diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 0bb974c0799e..a1a14b327c6a 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -621,7 +621,8 @@ IMPL_LINK_NOARG( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void) { // create the file dialog sfx2::FileDialogHelper aFileDlg( - ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::NONE, OUString() ); + ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::NONE, OUString(), + SfxFilterFlags::NONE, SfxFilterFlags::NONE, this); // set the title aFileDlg.SetTitle(CuiResId(RID_SVXSTR_SELECT_FILE_IFRAME)); diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx index c7ab9a2983e9..f57cd6210ebd 100644 --- a/cui/source/options/doclinkdialog.cxx +++ b/cui/source/options/doclinkdialog.cxx @@ -159,11 +159,10 @@ namespace svx EndDialog(RET_OK); } - IMPL_LINK_NOARG(ODocumentLinkDialog, OnBrowseFile, Button*, void) { ::sfx2::FileDialogHelper aFileDlg( - ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION); + ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, FileDialogFlags::NONE, this); std::shared_ptr<const SfxFilter> pFilter = SfxFilter::GetFilterByName("StarOffice XML (Base)"); if ( pFilter ) { @@ -203,7 +202,6 @@ namespace svx validate(); } - IMPL_LINK_NOARG(ODocumentLinkDialog, OnTextModified, Edit&, void) { validate( ); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 25d705ab30c3..126017e2f9b8 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -1012,7 +1012,7 @@ IMPL_LINK( SvxEMailTabPage, FileDialogHdl_Impl, Button*, pButton, void ) { if (m_pMailerURLPB == pButton && !pImpl->bROProgram) { - FileDialogHelper aHelper( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE ); + FileDialogHelper aHelper(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::NONE, this); OUString sPath = m_pMailerURLED->GetText(); if ( sPath.isEmpty() ) sPath = "/usr/bin"; diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index f8345e7b93fb..a23b5d5942c5 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -908,7 +908,7 @@ void SvxJavaClassPathDlg::dispose() IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void) { - sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE ); + sfx2::FileDialogHelper aDlg(TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::NONE, this); aDlg.SetTitle( CuiResId( RID_SVXSTR_ARCHIVE_TITLE ) ); aDlg.AddFilter( CuiResId( RID_SVXSTR_ARCHIVE_HEADLINE ), "*.jar;*.zip" ); OUString sFolder; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index ffa76d28fed2..d38f5bfe67fb 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1135,7 +1135,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl, Button*, void) bool bHtml = 0 != ( nHtmlMode & HTMLMODE_ON ); OUString aStrBrowse(get<vcl::Window>("findgraphicsft")->GetText()); - pImportDlg = new SvxOpenGraphicDialog( aStrBrowse ); + pImportDlg = new SvxOpenGraphicDialog(aStrBrowse, this); if ( bHtml ) pImportDlg->EnableLink(false); pImportDlg->SetPath( aBgdGraphicPath, m_pBtnLink->IsChecked() ); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 7e6cfcfc1dc6..a50dba3c49e4 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -986,8 +986,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, void) IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void) { - - sfx2::FileDialogHelper aFileDialog(0); + sfx2::FileDialogHelper aFileDialog(0, FileDialogFlags::NONE, this); aFileDialog.SetTitle(CuiResId(RID_SVXSTR_ADD_IMAGE)); if ( aFileDialog.Execute() != ERRCODE_NONE ) return; @@ -1947,7 +1946,7 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, void ) OUString aGrfName; Size aSize; bool bSucc(false); - SvxOpenGraphicDialog aGrfDlg( CuiResId(RID_SVXSTR_EDIT_GRAPHIC) ); + SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_SVXSTR_EDIT_GRAPHIC), this); if(MN_GALLERY_ENTRY <= nItemId ) { diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index c6667bf53a02..ddf6e0b69c4b 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -758,7 +758,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ModifyTileOffsetHdl, Edit&, void) IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, Button*, void) { - SvxOpenGraphicDialog aDlg( "Import" ); + SvxOpenGraphicDialog aDlg("Import", this); aDlg.EnableLink(false); long nCount = m_pBitmapList->Count(); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 01a0417e50d7..809a5dd0a778 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -463,7 +463,7 @@ void SvxLineTabPage::SymbolSelected(MenuButton const * pButton) break; default: { - SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_SVXSTR_EDIT_GRAPHIC)); + SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_SVXSTR_EDIT_GRAPHIC), this); aGrfDlg.EnableLink(false); aGrfDlg.AsLink(false); if( !aGrfDlg.Execute() ) diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 28984fa50ec7..49e2bb8a028e 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -710,7 +710,6 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl, Button*, void) } } - IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) { sal_uInt16 nReturn = RET_YES; @@ -727,7 +726,8 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) if ( nReturn != RET_CANCEL ) { - ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE ); + ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, + FileDialogFlags::NONE, this); OUString aStrFilterType( "*.sod" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); OUString aPalettePath(SvtPathOptions().GetPalettePath()); @@ -790,10 +790,9 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void) } } - IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void) { - ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE ); + ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, FileDialogFlags::NONE, this); OUString aStrFilterType( "*.sod" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); @@ -843,7 +842,6 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void) } } - void SvxLineDefTabPage::FillDash_Impl() { css::drawing::DashStyle eXDS; diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index bb52e85621d7..4ac321a6e65c 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -539,7 +539,8 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) if ( nReturn != RET_CANCEL ) { - ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE ); + ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, + FileDialogFlags::NONE, this); OUString aStrFilterType( "*.soe" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); @@ -606,7 +607,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void) IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl, Button*, void) { - ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE ); + ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, FileDialogFlags::NONE, this); OUString aStrFilterType( "*.soe" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); |