summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--avmedia/source/viewer/mediawindow.cxx4
-rw-r--r--cui/source/customize/acccfg.cxx2
-rw-r--r--cui/source/customize/cfg.cxx2
-rw-r--r--cui/source/dialogs/hldoctp.cxx2
-rw-r--r--cui/source/dialogs/insdlg.cxx2
-rw-r--r--cui/source/options/doclinkdialog.cxx2
-rw-r--r--cui/source/options/optinet2.cxx4
-rw-r--r--cui/source/options/optjava.cxx2
-rw-r--r--cui/source/tabpages/numpages.cxx2
-rw-r--r--cui/source/tabpages/tpbitmap.cxx4
-rw-r--r--cui/source/tabpages/tpcolor.cxx4
-rw-r--r--cui/source/tabpages/tpgradnt.cxx4
-rw-r--r--cui/source/tabpages/tphatch.cxx4
-rw-r--r--cui/source/tabpages/tplnedef.cxx4
-rw-r--r--cui/source/tabpages/tplneend.cxx4
-rw-r--r--dbaccess/source/ui/app/AppController.cxx2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx14
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx2
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx2
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx2
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx6
-rw-r--r--filter/source/xsltdialog/xmlfiltersettingsdialog.cxx5
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertestdialog.cxx5
-rw-r--r--forms/source/component/ImageControl.cxx2
-rw-r--r--forms/source/richtext/richtextvclcontrol.cxx2
-rw-r--r--include/sfx2/docinsert.hxx3
-rw-r--r--include/sfx2/filedlghelper.hxx27
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx2
-rw-r--r--sc/source/ui/miscdlgs/datastreamdlg.cxx2
-rw-r--r--sc/source/ui/view/tabvwshb.cxx2
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx2
-rw-r--r--sd/source/ui/dlg/dlgass.cxx2
-rw-r--r--sd/source/ui/dlg/filedlg.cxx2
-rw-r--r--sd/source/ui/dlg/tpaction.cxx2
-rw-r--r--sd/source/ui/func/fuinsert.cxx2
-rw-r--r--sd/source/ui/func/fuinsfil.cxx2
-rw-r--r--sfx2/source/appl/appopen.cxx2
-rw-r--r--sfx2/source/appl/lnkbase2.cxx2
-rw-r--r--sfx2/source/appl/opengrf.cxx2
-rw-r--r--sfx2/source/appl/shutdownicon.cxx2
-rw-r--r--sfx2/source/dialog/filedlghelper.cxx22
-rw-r--r--sfx2/source/dialog/filedlgimpl.hxx2
-rw-r--r--sfx2/source/doc/docinsert.cxx8
-rw-r--r--sfx2/source/doc/guisaveas.cxx6
-rw-r--r--sfx2/source/doc/templatedlg.cxx2
-rw-r--r--svx/source/core/graphichelper.cxx4
-rw-r--r--svx/source/dialog/imapdlg.cxx4
-rw-r--r--svx/source/form/databaselocationinput.cxx2
-rw-r--r--svx/source/form/datanavi.cxx2
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx2
-rw-r--r--sw/source/ui/fldui/javaedit.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx4
-rw-r--r--sw/source/ui/index/cnttab.cxx2
-rw-r--r--sw/source/ui/misc/glossary.cxx2
-rw-r--r--sw/source/uibase/app/docsh2.cxx6
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx2
-rw-r--r--sw/source/uibase/dbui/mailmergehelper.cxx2
-rw-r--r--sw/source/uibase/uiview/srcview.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx2
62 files changed, 113 insertions, 115 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index f28db42ab05b..110730ce5cf0 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -211,9 +211,9 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
bool MediaWindow::executeMediaURLDialog(vcl::Window*,
OUString& rURL, bool *const o_pbLink)
{
- ::sfx2::FileDialogHelper aDlg( (o_pbLink)
+ ::sfx2::FileDialogHelper aDlg( o_pbLink
? ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW
- : ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ : ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
static const char aWildcard[] = "*.";
FilterNameVector aFilters;
static const char aSeparator[] = ";";
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 758975b3e475..b12b59c71bbb 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1423,7 +1423,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& r
short nDialogType = bSave ? ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION
: ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE;
delete m_pFileDlg;
- m_pFileDlg = new sfx2::FileDialogHelper( nDialogType, 0 );
+ m_pFileDlg = new sfx2::FileDialogHelper( nDialogType );
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 c9c770a7026c..6a4138075b1a 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -5210,7 +5210,7 @@ IMPL_LINK_NOARG_TYPED( SvxIconSelectorDialog, ImportHdl, Button *, void)
{
sfx2::FileDialogHelper aImportDialog(
css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW,
- SFXWB_GRAPHIC | SFXWB_MULTISELECTION );
+ FileDialogFlags::Graphic | FileDialogFlags::MultiSelection );
// disable the link checkbox in the dialog
uno::Reference< css::ui::dialogs::XFilePickerControlAccess >
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 4deb11d47964..4d1665f84f57 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -197,7 +197,7 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, Button*, void)
{
// Open Fileopen-Dialog
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0,
+ css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::NONE,
GetParent() );
OUString aOldURL( GetCurrentURL() );
if( aOldURL.startsWithIgnoreAsciiCase( sFileScheme ) )
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index bfa1437c0883..a5008d252c80 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -628,7 +628,7 @@ IMPL_LINK_NOARG_TYPED( SfxInsertFloatingFrameDialog, OpenHdl, Button*, void)
// create the file dialog
sfx2::FileDialogHelper aFileDlg(
- ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0, OUString() );
+ ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, FileDialogFlags::NONE, OUString() );
// set the title
aFileDlg.SetTitle(CUI_RESSTR(RID_SVXSTR_SELECT_FILE_IFRAME));
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index de5f1e8a522f..b056e48b7df3 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -163,7 +163,7 @@ namespace svx
IMPL_LINK_NOARG_TYPED(ODocumentLinkDialog, OnBrowseFile, Button*, void)
{
::sfx2::FileDialogHelper aFileDlg(
- ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
+ ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION);
std::shared_ptr<const SfxFilter> pFilter = SfxFilter::GetFilterByName("StarOffice XML (Base)");
if ( pFilter )
{
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index be551b5116f7..9ca93fca9231 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -1065,9 +1065,7 @@ IMPL_LINK_TYPED( SvxEMailTabPage, FileDialogHdl_Impl, Button*, pButton, void )
{
if (m_pMailerURLPB == pButton && !pImpl->bROProgram)
{
- FileDialogHelper aHelper(
- css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
- 0 );
+ FileDialogHelper aHelper( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
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 c9955912d3ef..b7c2dde23360 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -994,7 +994,7 @@ void SvxJavaClassPathDlg::dispose()
IMPL_LINK_NOARG_TYPED(SvxJavaClassPathDlg, AddArchiveHdl_Impl, Button*, void)
{
- sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE );
aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), "*.jar;*.zip" );
OUString sFolder;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 763e701bc5f7..22d23e0bb7e3 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -998,7 +998,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, DoubleClickHdl_Impl, ValueSet*, void
IMPL_LINK_NOARG_TYPED(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, Button*, void)
{
- sfx2::FileDialogHelper aFileDialog(0, 0);
+ sfx2::FileDialogHelper aFileDialog(0);
aFileDialog.SetTitle(CUI_RES(RID_SVXSTR_ADD_IMAGE));
if ( aFileDialog.Execute() != ERRCODE_NONE )
return;
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 163c0cf3e66b..093348abe57a 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -770,7 +770,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickLoadHdl_Impl, Button*, void)
if ( nReturn != RET_CANCEL )
{
- ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
OUString aStrFilterType( "*.sob" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
OUString aPalettePath(SvtPathOptions().GetPalettePath());
@@ -856,7 +856,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickLoadHdl_Impl, Button*, void)
IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickSaveHdl_Impl, Button*, void)
{
- ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
+ ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE );
OUString aStrFilterType( "*.sob" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index a84a182d2a19..de4366432e8b 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -135,7 +135,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickLoadHdl_Impl, Button*, void)
if ( nReturn != RET_CANCEL )
{
- ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
OUString aStrFilterType( XPropertyList::GetDefaultExtFilter( meType ) );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
@@ -200,7 +200,7 @@ void SvxColorTabPage::EnableSave( bool bCanSave )
IMPL_LINK_NOARG_TYPED(SvxColorTabPage, ClickSaveHdl_Impl, Button*, void)
{
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
+ css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE );
OUString aStrFilterType( XPropertyList::GetDefaultExtFilter( meType ) );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index e23564012423..c87694a87ae2 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -643,7 +643,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickLoadHdl_Impl, Button*, void)
if ( nReturn != RET_CANCEL )
{
- ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
OUString aStrFilterType( "*.sog" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
OUString aPalettePath(SvtPathOptions().GetPalettePath());
@@ -733,7 +733,7 @@ IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickLoadHdl_Impl, Button*, void)
IMPL_LINK_NOARG_TYPED(SvxGradientTabPage, ClickSaveHdl_Impl, Button*, void)
{
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
+ css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE );
OUString aStrFilterType( "*.sog" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 766ac7a5102c..f5d863ea94fb 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -677,7 +677,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickLoadHdl_Impl, Button*, void)
if ( nReturn != RET_CANCEL )
{
- ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
OUString aStrFilterType( "*.soh" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
OUString aPalettePath(SvtPathOptions().GetPalettePath());
@@ -756,7 +756,7 @@ IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickLoadHdl_Impl, Button*, void)
IMPL_LINK_NOARG_TYPED(SvxHatchTabPage, ClickSaveHdl_Impl, Button*, void)
{
- ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
+ ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE );
OUString aStrFilterType( "*.soh" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index daa5b3e0ff74..3eab7dea9f19 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -736,7 +736,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void)
if ( nReturn != RET_CANCEL )
{
- ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
OUString aStrFilterType( "*.sod" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
OUString aPalettePath(SvtPathOptions().GetPalettePath());
@@ -802,7 +802,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickLoadHdl_Impl, Button*, void)
IMPL_LINK_NOARG_TYPED(SvxLineDefTabPage, ClickSaveHdl_Impl, Button*, void)
{
- ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
+ ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE );
OUString aStrFilterType( "*.sod" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 03f2a1e608ca..3364d3e9de9c 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -550,7 +550,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void)
if ( nReturn != RET_CANCEL )
{
- ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ ::sfx2::FileDialogHelper aDlg(css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
OUString aStrFilterType( "*.soe" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
@@ -617,7 +617,7 @@ IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickLoadHdl_Impl, Button*, void)
IMPL_LINK_NOARG_TYPED(SvxLineEndDefTabPage, ClickSaveHdl_Impl, Button*, void)
{
- ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
+ ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE );
OUString aStrFilterType( "*.soe" );
aDlg.AddFilter( aStrFilterType, aStrFilterType );
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 351dfa1c83e9..01fe86d961e5 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -1127,7 +1127,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION,
- 0, getView());
+ FileDialogFlags::NONE, getView());
aFileDlg.SetDisplayDirectory( sUrl );
std::shared_ptr<const SfxFilter> pFilter = getStandardDatabaseFilter();
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index e237f4a101ab..49be4caf4bd5 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -222,7 +222,7 @@ namespace dbaui
SvtModuleOptions aModule;
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
- 0,
+ FileDialogFlags::NONE,
aModule.GetFactoryEmptyDocumentURL(SvtModuleOptions::EFactory::CALC)
,SfxFilterFlags::IMPORT);
askForFileName(aFileDlg);
@@ -233,8 +233,7 @@ namespace dbaui
const OUString sExt("*.mdb;*.mde");
OUString sFilterName(ModuleRes (STR_MSACCESS_FILTERNAME));
::sfx2::FileDialogHelper aFileDlg(
- ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
- 0);
+ ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION);
aFileDlg.AddFilter(sFilterName,sExt);
aFileDlg.SetCurrentFilter(sFilterName);
askForFileName(aFileDlg);
@@ -245,8 +244,7 @@ namespace dbaui
const OUString sAccdb("*.accdb;*.accde");
OUString sFilterName2(ModuleRes (STR_MSACCESS_2007_FILTERNAME));
::sfx2::FileDialogHelper aFileDlg(
- ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
- 0);
+ ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION);
aFileDlg.AddFilter(sFilterName2,sAccdb);
aFileDlg.SetCurrentFilter(sFilterName2);
askForFileName(aFileDlg);
@@ -326,8 +324,7 @@ namespace dbaui
const OUString sExt("*.fdb");
OUString sFilterName(ModuleRes (STR_FIREBIRD_FILTERNAME));
::sfx2::FileDialogHelper aFileDlg(
- ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
- 0);
+ ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE);
aFileDlg.AddFilter(sFilterName,sExt);
aFileDlg.SetCurrentFilter(sFilterName);
askForFileName(aFileDlg);
@@ -351,8 +348,7 @@ namespace dbaui
const OUString sExt("*.fdb");
OUString sFilterName(ModuleRes (STR_FIREBIRD_FILTERNAME));
::sfx2::FileDialogHelper aFileDlg(
- ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION,
- 0);
+ ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION);
aFileDlg.AddFilter(sFilterName,sExt);
aFileDlg.SetCurrentFilter(sFilterName);
askForFileName(aFileDlg);
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 5c31f87b3a57..37e89b59a29b 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -794,7 +794,7 @@ bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
bool bRet = false;
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION,
- 0, this);
+ FileDialogFlags::NONE, this);
std::shared_ptr<const SfxFilter> pFilter = getStandardDatabaseFilter();
if ( pFilter )
{
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index f6371ccc0f24..570302e98ef5 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -717,7 +717,7 @@ namespace dbaui
{
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
- 0, OUString("sdatabase") );
+ FileDialogFlags::NONE, OUString("sdatabase") );
std::shared_ptr<const SfxFilter> pFilter = getStandardDatabaseFilter();
if ( pFilter )
{
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 3a7b53cfebe0..aec95586715e 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -196,7 +196,7 @@ namespace dbp
IMPL_LINK_NOARG_TYPED( OTableSelectionPage, OnSearchClicked, Button*, void )
{
::sfx2::FileDialogHelper aFileDlg(
- ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
+ ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION);
aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() );
std::shared_ptr<const SfxFilter> pFilter = SfxFilter::GetFilterByName("StarOffice XML (Base)");
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 4f32e2019280..4f9f9ebb5147 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2767,7 +2767,7 @@ namespace pcr
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW,
- SFXWB_GRAPHIC);
+ FileDialogFlags::Graphic);
aFileDlg.SetTitle(aStrTrans);
// non-linked images ( e.g. those located in the document
@@ -2834,7 +2834,7 @@ namespace pcr
bool FormComponentPropertyHandler::impl_browseForTargetURL_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
{
::sfx2::FileDialogHelper aFileDlg(
- ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
+ ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION);
OUString sURL;
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_TARGET_URL ) >>= sURL );
@@ -2888,7 +2888,7 @@ namespace pcr
bool FormComponentPropertyHandler::impl_browseForDatabaseDocument_throw( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
{
::sfx2::FileDialogHelper aFileDlg(
- ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0,
+ ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, FileDialogFlags::NONE,
OUString("sdatabase"));
OUString sDataSource;
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 8583483df7b1..506f76ef2126 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -877,8 +877,7 @@ void XMLFilterSettingsDialog::onSave()
// Open Fileopen-Dialog
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION,
- 0 );
+ css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION );
OUString aExtensions( "*.jar" );
OUString aFilterName(RESIDSTR(STR_FILTER_PACKAGE));
@@ -920,7 +919,7 @@ void XMLFilterSettingsDialog::onOpen()
// Open Fileopen-Dialog
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
OUString aExtensions( "*.jar" );
OUString aFilterName(RESIDSTR(STR_FILTER_PACKAGE));
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 47e24a96a2a2..2fbf0e83a3bc 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -170,7 +170,7 @@ IMPL_LINK_TYPED ( XMLFilterTabPageXSLT, ClickBrowseHdl_Impl, Button *, pButton,
// Open Fileopen-Dialog
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
aDlg.SetDisplayDirectory( GetURL( pURLBox ) );
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 826244942ca5..1deae62fa545 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -311,8 +311,7 @@ void XMLFilterTestDialog::onExportBrowse()
{
// Open Fileopen-Dialog
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
- 0 );
+ css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
Reference< XNameAccess > xFilterContainer( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.FilterFactory", mxContext ), UNO_QUERY );
Reference< XNameAccess > xTypeDetection( mxContext->getServiceManager()->createInstanceWithContext( "com.sun.star.document.TypeDetection", mxContext ), UNO_QUERY );
@@ -546,7 +545,7 @@ void XMLFilterTestDialog::onImportBrowse()
{
// Open Fileopen-Dialog
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
OUString aFilterName( m_pFilterInfo->maInterfaceName );
OUString aExtensions;
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index cc3be59c1432..2410dc77ed89 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -794,7 +794,7 @@ bool OImageControlControl::implInsertGraphics()
// build some arguments for the upcoming dialog
try
{
- ::sfx2::FileDialogHelper aDialog( TemplateDescription::FILEOPEN_LINK_PREVIEW, SFXWB_GRAPHIC );
+ ::sfx2::FileDialogHelper aDialog( TemplateDescription::FILEOPEN_LINK_PREVIEW, FileDialogFlags::Graphic );
aDialog.SetTitle( sTitle );
Reference< XFilePickerControlAccess > xController( aDialog.GetFilePicker(), UNO_QUERY_THROW );
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index ca5665159cc7..53076eebd1cc 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -235,7 +235,7 @@ namespace frm
{ "Text (*.txt)", "*.txt", EE_FORMAT_TEXT }
};
- ::sfx2::FileDialogHelper aFP( bLoad ? css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE : css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, 0, this );
+ ::sfx2::FileDialogHelper aFP( bLoad ? css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE : css::ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION, FileDialogFlags::NONE, this );
for (auto & aExportFormat : aExportFormats)
{
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx
index dfc423acf1f4..736577627a60 100644
--- a/include/sfx2/docinsert.hxx
+++ b/include/sfx2/docinsert.hxx
@@ -29,6 +29,7 @@
namespace sfx2 { class FileDialogHelper; }
class SfxMedium;
class SfxItemSet;
+enum class FileDialogFlags;
typedef ::std::vector< SfxMedium* > SfxMediumList;
@@ -41,7 +42,7 @@ private:
OUString m_sFilter;
Link<sfx2::FileDialogHelper*,void> m_aDialogClosedLink;
- sal_Int64 const m_nDlgFlags;
+ FileDialogFlags const m_nDlgFlags;
ErrCode m_nError;
sfx2::FileDialogHelper* m_pFileDlg;
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index d8a8fe97b14c..952bd17dd554 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.hxx
@@ -58,12 +58,17 @@ namespace com
class SfxItemSet;
namespace vcl { class Window; }
-// the SFXWB constants are for the nFlags parameter of the constructor
-#define SFXWB_INSERT 0x04000000L // turn Open into Insert dialog
-#define SFXWB_EXPORT 0x40000000L // turn Save into Export dialog
-#define SFXWB_SAVEACOPY 0x00400000L // turn Save into Save a Copy dialog
-#define SFXWB_MULTISELECTION 0x20000000L
-#define SFXWB_GRAPHIC 0x00800000L // register graphic formats
+enum class FileDialogFlags {
+ NONE = 0x00,
+ Insert = 0x01, // turn Open into Insert dialog
+ Export = 0x02, // turn Save into Export dialog
+ SaveACopy = 0x04, // turn Save into Save a Copy dialog
+ MultiSelection = 0x08,
+ Graphic = 0x10 // register graphic formats
+};
+namespace o3tl {
+ template<> struct typed_flags<FileDialogFlags> : is_typed_flags<FileDialogFlags, 0x1f> {};
+}
#define FILEDIALOG_FILTER_ALL "*.*"
@@ -101,17 +106,17 @@ private:
public:
FileDialogHelper( sal_Int16 nDialogType,
- sal_Int64 nFlags,
+ FileDialogFlags nFlags = FileDialogFlags::NONE,
vcl::Window* _pPreferredParent = nullptr );
FileDialogHelper( sal_Int16 nDialogType,
- sal_Int64 nFlags,
+ FileDialogFlags nFlags,
const OUString& rFactory,
SfxFilterFlags nMust = SfxFilterFlags::NONE,
SfxFilterFlags nDont = SfxFilterFlags::NONE );
FileDialogHelper( sal_Int16 nDialogType,
- sal_Int64 nFlags,
+ FileDialogFlags nFlags,
const OUString& rFactory,
sal_Int16 nDialog,
SfxFilterFlags nMust,
@@ -121,7 +126,7 @@ public:
vcl::Window* _pPreferredParent = nullptr);
FileDialogHelper( sal_Int16 nDialogType,
- sal_Int64 nFlags,
+ FileDialogFlags nFlags,
const OUString& aFilterUIName,
const OUString& aExtName,
const OUString& rStandardDir,
@@ -240,7 +245,7 @@ public:
#define SFX2_IMPL_DIALOG_REMOTE 3
ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType,
- sal_Int64 nFlags,
+ FileDialogFlags nFlags,
const OUString& rFact,
std::vector<OUString>& rpURLList,
OUString& rFilter,
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 0125f607c7bd..1138d2ea741f 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3032,7 +3032,7 @@ void OReportController::insertGraphic()
try
{
uno::Reference< report::XSection> xSection = getDesignView()->getCurrentSection();
- ::sfx2::FileDialogHelper aDialog( ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW, SFXWB_GRAPHIC );
+ ::sfx2::FileDialogHelper aDialog( ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW, FileDialogFlags::Graphic );
aDialog.SetTitle( sTitle );
uno::Reference< ui::dialogs::XFilePickerControlAccess > xController(aDialog.GetFilePicker(), UNO_QUERY_THROW);
diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index ddd2102dfbff..432ae7ede665 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -81,7 +81,7 @@ void DataStreamDlg::dispose()
IMPL_LINK_NOARG_TYPED(DataStreamDlg, BrowseHdl, Button*, void)
{
- sfx2::FileDialogHelper aFileDialog(0, 0);
+ sfx2::FileDialogHelper aFileDialog(0);
if ( aFileDialog.Execute() != ERRCODE_NONE )
return;
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 8aa8c4b62bbb..ec7ce83e3c72 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -302,7 +302,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
try
{
sfx2::FileDialogHelper aDlg(ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
- 0, OUString("com.sun.star.chart2.ChartDocument"));
+ FileDialogFlags::NONE, OUString("com.sun.star.chart2.ChartDocument"));
if(aDlg.Execute() == ERRCODE_NONE )
{
INetURLObject aURLObj( aDlg.GetPath() );
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 54389ade9151..04a7b8088e4a 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -477,7 +477,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, FileHdl, Button*, void)
{
::sfx2::FileDialogHelper aDlg(
css::ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW,
- SFXWB_GRAPHIC | SFXWB_MULTISELECTION
+ FileDialogFlags::Graphic | FileDialogFlags::MultiSelection
);
// Read configuration
OUString sUrl(officecfg::Office::Impress::Pictures::Path::get());
diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index ec125ef8500b..50581e0061c3 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1755,7 +1755,7 @@ void AssistentDlg::FinishHdl()
if (aFileToOpen.isEmpty())
{
sfx2::FileDialogHelper aFileDlg(
- ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0,
+ ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, FileDialogFlags::NONE,
OUString("simpress") );
if ( aFileDlg.Execute() == ERRCODE_NONE )
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 4776b107f96d..df68e879c825 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -214,7 +214,7 @@ void SdFileDialog_Imp::CheckSelectionState()
}
SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType ) :
- FileDialogHelper( nDialogType, 0 ),
+ FileDialogHelper( nDialogType ),
mnPlaySoundEvent( nullptr ),
mbUsableSelection( false ),
mbLabelPlaying(false)
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index dda6c664b8c3..99175dbee38f 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -445,7 +445,7 @@ void SdTPAction::OpenFileDialog()
else
{
sfx2::FileDialogHelper aFileDialog(
- ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
+ ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION);
if (bDocument && aFile.isEmpty())
aFile = SvtPathOptions().GetWorkPath();
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 268336ff9033..63410aae10e1 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -770,7 +770,7 @@ rtl::Reference<FuPoor> FuInsert3DModel::Create( ViewShell* pViewSh, ::sd::Window
void FuInsert3DModel::DoExecute( SfxRequest& )
{
- sfx2::FileDialogHelper aDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ sfx2::FileDialogHelper aDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
aDlg.SetTitle( SD_RESSTR( STR_INSERT_3D_MODEL_TITLE ) );
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 706b95723b68..badd3edb7ddb 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -138,7 +138,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
{
sfx2::FileDialogHelper aFileDialog(
ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
- SFXWB_INSERT );
+ FileDialogFlags::Insert );
Reference< XFilePicker > xFilePicker( aFileDialog.GetFilePicker(), UNO_QUERY );
Reference< XFilterManager > xFilterManager( xFilePicker, UNO_QUERY );
OUString aOwnCont;
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 6d41236c5baa..f1cfc5a2c45c 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -630,7 +630,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq )
sal_uIntPtr nErr = sfx2::FileOpenDialog_Impl(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
- SFXWB_MULTISELECTION, OUString(), aURLList,
+ FileDialogFlags::MultiSelection, OUString(), aURLList,
aFilter, pSet, &aPath, nDialog, sStandardDir, aBlackList );
if ( nErr == ERRCODE_ABORT )
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 6f869467ab05..7b154c15be45 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -539,7 +539,7 @@ FileDialogHelper & SvBaseLink::GetInsertFileDialog(const OUString& rFactory) con
delete pImpl->m_pFileDlg;
pImpl->m_pFileDlg = new FileDialogHelper(
ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
- SFXWB_INSERT, rFactory);
+ FileDialogFlags::Insert, rFactory);
return *pImpl->m_pFileDlg;
}
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index 2668096f3750..a41e6131618f 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -83,7 +83,7 @@ struct SvxOpenGrf_Impl
SvxOpenGrf_Impl::SvxOpenGrf_Impl()
: aFileDlg(ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW,
- SFXWB_GRAPHIC)
+ FileDialogFlags::Graphic)
{
uno::Reference < XFilePicker2 > xFP = aFileDlg.GetFilePicker();
xCtrlAcc.set(xFP, UNO_QUERY);
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index f26e4748df63..d515d40df609 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -353,7 +353,7 @@ void ShutdownIcon::StartFileDialog()
if ( !m_pFileDlg )
m_pFileDlg = new FileDialogHelper(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
- SFXWB_MULTISELECTION, OUString() );
+ FileDialogFlags::MultiSelection, OUString() );
m_pFileDlg->StartExecuteModal( LINK( this, ShutdownIcon, DialogClosedHdl_Impl ) );
}
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index be788616c6a2..17e05c1eb379 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -847,7 +847,7 @@ static open_or_save_t lcl_OpenOrSave(sal_Int16 const nDialogType)
FileDialogHelper_Impl::FileDialogHelper_Impl(
FileDialogHelper* _pAntiImpl,
sal_Int16 nDialogType,
- sal_Int64 nFlags,
+ FileDialogFlags nFlags,
sal_Int16 nDialog,
vcl::Window* _pPreferredParentWindow,
const OUString& sStandardDir,
@@ -888,12 +888,12 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
mbHasVersions = false;
mbHasPreview = false;
mbShowPreview = false;
- mbAddGraphicFilter = SFXWB_GRAPHIC == (nFlags & SFXWB_GRAPHIC);
+ mbAddGraphicFilter = bool(nFlags & FileDialogFlags::Graphic);
mbDeleteMatcher = false;
- mbInsert = SFXWB_INSERT == ( nFlags & SFXWB_INSERT );
- mbExport = SFXWB_EXPORT == ( nFlags & SFXWB_EXPORT );
+ mbInsert = bool(nFlags & FileDialogFlags::Insert);
+ mbExport = bool(nFlags & FileDialogFlags::Export);
mbIsSaveDlg = false;
- mbIsSaveACopyDlg = SFXWB_SAVEACOPY == ( nFlags & SFXWB_SAVEACOPY );
+ mbIsSaveACopyDlg = bool(nFlags & FileDialogFlags::SaveACopy);
mbPwdCheckBoxState = false;
mbSelection = false;
mbSelectionEnabled = true;
@@ -1070,7 +1070,7 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
// set multiselection mode
- if ( nFlags & SFXWB_MULTISELECTION )
+ if ( nFlags & FileDialogFlags::MultiSelection )
mxFileDlg->setMultiSelectionMode( true );
if (mbAddGraphicFilter) // generate graphic filter only on demand
@@ -2210,7 +2210,7 @@ void FileDialogHelper_Impl::SetContext( FileDialogHelper::Context _eNewContext )
FileDialogHelper::FileDialogHelper(
sal_Int16 nDialogType,
- sal_Int64 nFlags,
+ FileDialogFlags nFlags,
const OUString& rFact,
SfxFilterFlags nMust,
SfxFilterFlags nDont )
@@ -2226,7 +2226,7 @@ FileDialogHelper::FileDialogHelper(
FileDialogHelper::FileDialogHelper(
sal_Int16 nDialogType,
- sal_Int64 nFlags,
+ FileDialogFlags nFlags,
const OUString& rFact,
sal_Int16 nDialog,
SfxFilterFlags nMust,
@@ -2246,7 +2246,7 @@ FileDialogHelper::FileDialogHelper(
FileDialogHelper::FileDialogHelper(
sal_Int16 nDialogType,
- sal_Int64 nFlags,
+ FileDialogFlags nFlags,
vcl::Window* _pPreferredParent )
: m_nError(0)
{
@@ -2256,7 +2256,7 @@ FileDialogHelper::FileDialogHelper(
FileDialogHelper::FileDialogHelper(
sal_Int16 nDialogType,
- sal_Int64 nFlags,
+ FileDialogFlags nFlags,
const OUString& aFilterUIName,
const OUString& aExtName,
const OUString& rStandardDir,
@@ -2576,7 +2576,7 @@ void SAL_CALL FileDialogHelper::DialogClosed( const DialogClosedEvent& _rEvent )
}
ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType,
- sal_Int64 nFlags,
+ FileDialogFlags nFlags,
const OUString& rFact,
std::vector<OUString>& rpURLList,
OUString& rFilter,
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 01b7c6eadef5..4e63998bfcdf 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -173,7 +173,7 @@ namespace sfx2
FileDialogHelper_Impl(
FileDialogHelper* _pAntiImpl,
const short nDialogType,
- sal_Int64 nFlags,
+ FileDialogFlags nFlags,
sal_Int16 nDialog = SFX2_IMPL_DIALOG_CONFIG,
vcl::Window* _pPreferredParentWindow = nullptr,
const OUString& sStandardDir = OUString(),
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index b4b3d74c5eda..1706d1bd992e 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -53,8 +53,8 @@ DocumentInserter::DocumentInserter(
m_sDocFactory ( rFactory )
, m_nDlgFlags ( (bEnableMultiSelection)
- ? (SFXWB_INSERT|SFXWB_MULTISELECTION)
- : SFXWB_INSERT )
+ ? (FileDialogFlags::Insert|FileDialogFlags::MultiSelection)
+ : FileDialogFlags::Insert )
, m_nError ( ERRCODE_NONE )
, m_pFileDlg ( nullptr )
, m_pItemSet ( nullptr )
@@ -209,7 +209,7 @@ IMPL_LINK_NOARG_TYPED(DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*
catch( const IllegalArgumentException& ){}
}
- if ( SFXWB_EXPORT == ( m_nDlgFlags & SFXWB_EXPORT ) )
+ if ( m_nDlgFlags & FileDialogFlags::Export )
{
try
{
@@ -226,7 +226,7 @@ IMPL_LINK_NOARG_TYPED(DocumentInserter, DialogClosedHdl, sfx2::FileDialogHelper*
// set the read-only flag. When inserting a file, this flag is always set
- if ( SFXWB_INSERT == ( m_nDlgFlags & SFXWB_INSERT ) )
+ if ( m_nDlgFlags & FileDialogFlags::Insert )
m_pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, true ) );
else
{
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 722d951191b5..e528accdcb21 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -835,7 +835,7 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS)
: (css::ui::dialogs::TemplateDescription::
FILESAVE_AUTOEXTENSION_PASSWORD);
- sal_Int64 aDialogFlags = 0;
+ FileDialogFlags aDialogFlags = FileDialogFlags::NONE;
if( ( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED ) )
{
@@ -845,12 +845,12 @@ bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
else
aDialogMode = css::ui::dialogs::TemplateDescription::
FILESAVE_AUTOEXTENSION_SELECTION;
- aDialogFlags = SFXWB_EXPORT;
+ aDialogFlags = FileDialogFlags::Export;
}
if( ( nStoreMode & EXPORT_REQUESTED ) && ( nStoreMode & SAVEACOPY_REQUESTED ) && ( nStoreMode & WIDEEXPORT_REQUESTED ) )
{
- aDialogFlags = SFXWB_SAVEACOPY;
+ aDialogFlags = FileDialogFlags::SaveACopy;
}
std::unique_ptr<sfx2::FileDialogHelper> pFileDlg;
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 28e0e415de07..6ef03a886e31 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -872,7 +872,7 @@ void SfxTemplateManagerDlg::OnTemplateImport ()
sal_Int16 nDialogType =
css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE;
- sfx2::FileDialogHelper aFileDlg(nDialogType, SFXWB_MULTISELECTION);
+ sfx2::FileDialogHelper aFileDlg(nDialogType, FileDialogFlags::MultiSelection);
// add "All" filter
aFileDlg.AddFilter( SfxResId(STR_SFX_FILTERNAME_ALL).toString(),
diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index abfbaa01995e..b051cbd36e78 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -98,7 +98,7 @@ OUString GraphicHelper::ExportGraphic( const Graphic& rGraphic, const OUString&
SvtPathOptions aPathOpt;
OUString sGraphicsPath( aPathOpt.GetGraphicPath() );
- FileDialogHelper aDialogHelper( TemplateDescription::FILESAVE_AUTOEXTENSION, 0 );
+ FileDialogHelper aDialogHelper( TemplateDescription::FILESAVE_AUTOEXTENSION );
Reference < XFilePicker2 > xFilePicker = aDialogHelper.GetFilePicker();
INetURLObject aPath;
@@ -211,7 +211,7 @@ void GraphicHelper::SaveShapeAsGraphic( const Reference< drawing::XShape >& xSha
SvtPathOptions aPathOpt;
OUString sGraphicPath( aPathOpt.GetGraphicPath() );
- FileDialogHelper aDialogHelper( TemplateDescription::FILESAVE_AUTOEXTENSION, 0 );
+ FileDialogHelper aDialogHelper( TemplateDescription::FILESAVE_AUTOEXTENSION );
Reference < XFilePicker2 > xFilePicker = aDialogHelper.GetFilePicker();
aDialogHelper.SetTitle( "Save as Image" );
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index f9d44dc17bbe..4cd862a3f138 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -459,7 +459,7 @@ IMPL_LINK_TYPED( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx, void )
void SvxIMapDlg::DoOpen()
{
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
ImageMap aLoadIMap;
const OUString aFilter( IMAP_ALL_FILTER );
@@ -498,7 +498,7 @@ void SvxIMapDlg::DoOpen()
bool SvxIMapDlg::DoSave()
{
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
+ css::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE );
const OUString aBinFilter( IMAP_BINARY_FILTER );
const OUString aCERNFilter( IMAP_CERN_FILTER );
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 80d8459a9ed2..019bbc08a9c3 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -230,7 +230,7 @@ namespace svx
{
::sfx2::FileDialogHelper aFileDlg(
TemplateDescription::FILESAVE_AUTOEXTENSION,
- 0,
+ FileDialogFlags::NONE,
m_rLocationInput.GetSystemWindow()
);
aFileDlg.SetDisplayDirectory( impl_getCurrentURL() );
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 5f5c94335c63..a76caa7b7c12 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -3402,7 +3402,7 @@ namespace svxform
IMPL_LINK_NOARG_TYPED(AddInstanceDialog, FilePickerHdl, Button*, void)
{
::sfx2::FileDialogHelper aDlg(
- css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
INetURLObject aFile( SvtPathOptions().GetWorkPath() );
aDlg.AddFilter( m_sAllFilterName, FILEDIALOG_FILTER_ALL );
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 9ebfad1f79c6..860ecf1995eb 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -302,7 +302,7 @@ VclPtr<SfxTabPage> SwCharURLPage::Create( vcl::Window* pParent,
IMPL_LINK_NOARG_TYPED(SwCharURLPage, InsertFileHdl, Button*, void)
{
- FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE );
if( aDlgHelper.Execute() == ERRCODE_NONE )
{
Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx
index d1ef267898a2..06d4974c78ed 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/createaddresslistdialog.cxx
@@ -623,7 +623,7 @@ IMPL_LINK_NOARG_TYPED(SwCreateAddressListDialog, OkHdl_Impl, Button*, void)
{
if(m_sURL.isEmpty())
{
- sfx2::FileDialogHelper aDlgHelper( TemplateDescription::FILESAVE_SIMPLE, 0 );
+ sfx2::FileDialogHelper aDlgHelper( TemplateDescription::FILESAVE_SIMPLE );
uno::Reference < XFilePicker2 > 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 31232e600652..22bc4545791c 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -135,7 +135,7 @@ IMPL_LINK_TYPED(SwMailMergeDocSelectPage, FileSelectHdl, Button*, pButton, void)
if(!bTemplate)
{
- sfx2::FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ sfx2::FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE );
Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
xFP->setDisplayDirectory( SvtPathOptions().GetWorkPath() );
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 02e965df8511..df81c3c1cb29 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -260,7 +260,7 @@ IMPL_LINK_TYPED( SwJavaEditDialog, InsertFileHdl, Button *, pBtn, void )
pFileDlg = new ::sfx2::FileDialogHelper(
ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE,
- SFXWB_INSERT, OUString("swriter") );
+ FileDialogFlags::Insert, OUString("swriter") );
}
pFileDlg->StartExecuteModal( LINK( this, SwJavaEditDialog, DlgClosedHdl ) );
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 1944ca989be5..075a0b683565 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2573,7 +2573,7 @@ IMPL_LINK_NOARG_TYPED(SwGrfExtPage, BrowseHdl, Button*, void)
{
pGrfDlg = new FileDialogHelper(
ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW,
- SFXWB_GRAPHIC );
+ FileDialogFlags::Graphic );
pGrfDlg->SetTitle(get<VclFrame>("linkframe")->get_label());
}
pGrfDlg->SetDisplayDirectory( m_pConnectED->GetText() );
@@ -2841,7 +2841,7 @@ VclPtr<SfxTabPage> SwFrameURLPage::Create(vcl::Window *pParent, const SfxItemSet
IMPL_LINK_NOARG_TYPED(SwFrameURLPage, InsertFileHdl, Button*, void)
{
- FileDialogHelper aDlgHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ FileDialogHelper aDlgHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
uno::Reference < ui::dialogs::XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
try
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 20662f2dea2c..4a329ebb372e 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -100,7 +100,7 @@ static OUString lcl_CreateAutoMarkFileDlg( const OUString& rURL,
OUString sRet;
FileDialogHelper aDlgHelper( bOpen ?
- TemplateDescription::FILEOPEN_SIMPLE : TemplateDescription::FILESAVE_AUTOEXTENSION, 0 );
+ TemplateDescription::FILEOPEN_SIMPLE : TemplateDescription::FILESAVE_AUTOEXTENSION );
uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 5043c77d6933..b84742525609 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -571,7 +571,7 @@ IMPL_LINK_TYPED( SwGlossaryDlg, MenuHdl, Menu *, pMn, bool )
else if (sItemIdent == "import")
{
// call the FileOpenDialog do find WinWord - Files with templates
- FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE );
uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
SvtPathOptions aPathOpt;
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 1273ff71ce67..83fca394af11 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -502,7 +502,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
nRet = pNewFileDlg->Execute();
if(RET_TEMPLATE_LOAD == nRet)
{
- FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ FileDialogHelper aDlgHelper( TemplateDescription::FILEOPEN_SIMPLE );
uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
xFP->setDisplayDirectory( aPathOpt.GetWorkPath() );
@@ -614,7 +614,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
}
if(!bLocalHasName)
{
- FileDialogHelper aDlgHelper( TemplateDescription::FILESAVE_AUTOEXTENSION, 0 );
+ FileDialogHelper aDlgHelper( TemplateDescription::FILESAVE_AUTOEXTENSION );
aDlgHelper.AddFilter( pHtmlFlt->GetFilterName(), pHtmlFlt->GetDefaultExtension() );
aDlgHelper.SetCurrentFilter( pHtmlFlt->GetFilterName() );
if( ERRCODE_NONE != aDlgHelper.Execute())
@@ -876,7 +876,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
{
bool bError = false;
- FileDialogHelper aDlgHelper( TemplateDescription::FILESAVE_AUTOEXTENSION_TEMPLATE, 0 );
+ FileDialogHelper aDlgHelper( TemplateDescription::FILESAVE_AUTOEXTENSION_TEMPLATE );
const sal_Int16 nControlIds[] = {
CommonFilePickerElementIds::PUSHBUTTON_OK,
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index e19412807cba..576a9fa9adac 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -2498,7 +2498,7 @@ uno::Sequence<OUString> SwDBManager::GetExistingDatabaseNames()
OUString SwDBManager::LoadAndRegisterDataSource(SwDocShell* pDocShell)
{
- sfx2::FileDialogHelper aDlgHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
+ sfx2::FileDialogHelper aDlgHelper( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE );
uno::Reference < ui::dialogs::XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
OUString sHomePath(SvtPathOptions().GetWorkPath());
diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx
index 97f59f5a9601..e8d6c36e42be 100644
--- a/sw/source/uibase/dbui/mailmergehelper.cxx
+++ b/sw/source/uibase/dbui/mailmergehelper.cxx
@@ -55,7 +55,7 @@ namespace SwMailMergeHelper
OUString CallSaveAsDialog(OUString& rFilter)
{
::sfx2::FileDialogHelper aDialog( ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION,
- 0,
+ FileDialogFlags::NONE,
OUString::createFromAscii(SwDocShell::Factory().GetShortName()) );
if (aDialog.Execute()!=ERRCODE_NONE)
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 8e0b6c48fa16..b369b4e6c70a 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -298,7 +298,7 @@ void SwSrcView::Execute(SfxRequest& rReq)
SvtPathOptions aPathOpt;
// filesave dialog with autoextension
FileDialogHelper aDlgHelper(
- TemplateDescription::FILESAVE_AUTOEXTENSION, 0 );
+ TemplateDescription::FILESAVE_AUTOEXTENSION );
uno::Reference < XFilePicker2 > xFP = aDlgHelper.GetFilePicker();
uno::Reference<XFilterManager> xFltMgr(xFP, UNO_QUERY);
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 939d0f17ce0e..5d6991b389de 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -300,7 +300,7 @@ bool SwView::InsertGraphicDlg( SfxRequest& rReq )
// when in HTML mode insert only as a link
std::unique_ptr<FileDialogHelper> pFileDlg(new FileDialogHelper(
ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE,
- SFXWB_GRAPHIC ));
+ FileDialogFlags::Graphic ));
pFileDlg->SetTitle(SW_RESSTR(STR_INSERT_GRAPHIC ));
pFileDlg->SetContext( FileDialogHelper::SW_INSERT_GRAPHIC );
uno::Reference < XFilePicker2 > xFP = pFileDlg->GetFilePicker();