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/dialog | |
| 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/dialog')
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 22 | ||||
| -rw-r--r-- | sfx2/source/dialog/filedlgimpl.hxx | 2 |
2 files changed, 12 insertions, 12 deletions
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(), |