diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-31 11:22:03 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-31 09:55:17 +0000 |
| commit | dd4befa992300cc068467021c81594ffcea1be0c (patch) | |
| tree | e6519ca0a7b95667a7128ebe6e38b69c4c5226c1 /include | |
| parent | 9ffdcc76858bc01150727345de4dfd0ef40ed8c0 (diff) | |
fix crash in writer, thanks to my new assert in typed_flags_set
and clean up the duplication of constants between filter/ and
comphelper/ in the process
Change-Id: I0d1525b559c63a3d39deae51accff5dcdbb0aa82
Reviewed-on: https://gerrit.libreoffice.org/17446
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/documentconstants.hxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/comphelper/documentconstants.hxx b/include/comphelper/documentconstants.hxx index d747a9e95a2b..9dbbc764c89b 100644 --- a/include/comphelper/documentconstants.hxx +++ b/include/comphelper/documentconstants.hxx @@ -113,25 +113,28 @@ enum class SfxFilterFlags EXECUTABLE = 0x00000200L, SUPPORTSSELECTION = 0x00000400L, NOTINFILEDLG = 0x00001000L, + NOTINCHOOSER = 0x00002000L, + ASYNCHRON = 0x00004000L, OPENREADONLY = 0x00010000L, MUSTINSTALL = 0x00020000L, CONSULTSERVICE = 0x00040000L, - STARONEFILTER = 0x00080000L, + PACKED = 0x00100000L, + BROWSERPREFERRED = 0x00400000L, + COMBINED = 0x00800000L, ENCRYPTION = 0x01000000L, PASSWORDTOMODIFY = 0x02000000L, PREFERED = 0x10000000L, - STARTPRESENTATION = 0x20000000L, NONE = 0 }; namespace o3tl { - template<> struct typed_flags<SfxFilterFlags> : is_typed_flags<SfxFilterFlags, 0x331f17ffL> {}; + template<> struct typed_flags<SfxFilterFlags> : is_typed_flags<SfxFilterFlags, 0x33df77ffL> {}; } #define SFX_FILTER_NOTINSTALLED (SfxFilterFlags::MUSTINSTALL | SfxFilterFlags::CONSULTSERVICE) |