diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-18 13:03:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-19 08:25:03 +0200 |
| commit | 48bb2913a7459edb17a5f62c2f6e6fbc4f1051e2 (patch) | |
| tree | 7e2f09fc8998bc1016f4d2ba7fa09e3125663361 /cui | |
| parent | bdad6d0fe492a2334cb27ef54fc5d1cba17d1970 (diff) | |
convert SFX_FILTER_ constants to enum class
Change-Id: I7e53cfc90cefd9da7d6ecd795b09214bd44b1613
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/inc/pch/precompiled_cui.hxx | 1 | ||||
| -rw-r--r-- | cui/source/customize/macropg.cxx | 1 | ||||
| -rw-r--r-- | cui/source/dialogs/about.cxx | 1 | ||||
| -rw-r--r-- | cui/source/options/optsave.cxx | 8 |
4 files changed, 4 insertions, 7 deletions
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index b4657c1efef8..ec60619b5231 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -397,7 +397,6 @@ #include <sfx2/printopt.hxx> #include <sfx2/request.hxx> #include <sfx2/sfxcommands.h> -#include <sfx2/sfxdefs.hxx> #include <sfx2/sfxdlg.hxx> #include <sfx2/sfxresid.hxx> #include <sfx2/sfxuno.hxx> diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 00126b18baa7..ea52b32e1d84 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -29,7 +29,6 @@ #include <tools/diagnose_ex.h> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> -#include <sfx2/sfxdefs.hxx> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <dialmgr.hxx> diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 0134af78c018..f5761d3093ff 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -44,7 +44,6 @@ #include <sfx2/sfxcommands.h> #include "about.hxx" #include <config_buildid.h> -#include <sfx2/sfxdefs.hxx> #include <sfx2/app.hxx> #include <rtl/ustrbuf.hxx> #include <vcl/bitmap.hxx> diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index bbecdaab6ef9..312aa12bc4be 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -403,9 +403,9 @@ void SfxSaveTabPage::Reset( const SfxItemSet* ) sal_IntPtr nData = reinterpret_cast<sal_IntPtr>(aDocTypeLB->GetEntryData(n)); OUString sCommand; sCommand = "matchByDocumentService=%1:iflags=" + - OUString::number(SFX_FILTER_IMPORT|SFX_FILTER_EXPORT) + + OUString::number(static_cast<sal_Int32>(SfxFilterFlags::IMPORT|SfxFilterFlags::EXPORT)) + ":eflags=" + - OUString::number(SFX_FILTER_NOTINFILEDLG) + + OUString::number(static_cast<sal_Int32>(SfxFilterFlags::NOTINFILEDLG)) + ":default_first"; OUString sReplace; switch(nData) @@ -430,9 +430,9 @@ void SfxSaveTabPage::Reset( const SfxItemSet* ) OUString sFilter = aFilter.getUnpackedValueOrDefault("Name",OUString()); if (!sFilter.isEmpty()) { - sal_Int32 nFlags = aFilter.getUnpackedValueOrDefault("Flags",sal_Int32()); + SfxFilterFlags nFlags = static_cast<SfxFilterFlags>(aFilter.getUnpackedValueOrDefault("Flags",sal_Int32())); lList.push_back(sFilter); - lAlienList.push_back(0 != (nFlags & SFX_FILTER_ALIEN)); + lAlienList.push_back(bool(nFlags & SfxFilterFlags::ALIEN)); lODFList.push_back( isODFFormat( sFilter ) ); } } |