diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-11 13:07:30 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-12 06:57:19 +0000 |
| commit | 1342818790083ec1324f76c4eb1813827a4f5b72 (patch) | |
| tree | 998289c3aaeb78f41c10f88d8455f6cc46426886 /sfx2/source/doc | |
| parent | 0f4ac20e0456b32995f7a3aff4e46b59e64704a6 (diff) | |
convert SFXWB file dialog flags to scoped enum
Change-Id: I1ab5191dc582c46785da58d50b2e68c30b5cbc9b
Reviewed-on: https://gerrit.libreoffice.org/24881
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2/source/doc')
| -rw-r--r-- | sfx2/source/doc/docinsert.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/doc/guisaveas.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
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(), |