summaryrefslogtreecommitdiff
path: root/include/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-04-04 16:35:25 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-04-05 06:49:56 +0000
commite3eadc96cc05135880b72c42358eb3fe51ea94c4 (patch)
tree6478330637b3d6b12882fcb4ca60790b5800a87c /include/sfx2
parentff339c89b51ed571d55c762e43aa1a6ee9ada1cb (diff)
teach constantparam plugin to find always on and always off bitmask values
Change-Id: If56a483494bd3d7feb3fa67c01000dddd0d34421 Reviewed-on: https://gerrit.libreoffice.org/36085 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2')
-rw-r--r--include/sfx2/objsh.hxx11
-rw-r--r--include/sfx2/viewsh.hxx3
2 files changed, 6 insertions, 8 deletions
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index d8a74fcbf307..716da53f9db3 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -119,16 +119,15 @@ namespace com { namespace sun { namespace star {
enum class SfxObjectShellFlags
{
- HASOPENDOC = 0x01L,
- HASMENU = 0x04L,
- DONTCLOSE = 0x10L,
- NODOCINFO = 0x20L,
- STD_NORMAL = HASOPENDOC,
+ STD_NORMAL = 0x0000000,
+ HASMENU = 0x0000004,
+ DONTCLOSE = 0x0000010,
+ NODOCINFO = 0x0000020,
UNDEFINED = 0xf000000
};
namespace o3tl
{
- template<> struct typed_flags<SfxObjectShellFlags> : is_typed_flags<SfxObjectShellFlags, 0xf000035> {};
+ template<> struct typed_flags<SfxObjectShellFlags> : is_typed_flags<SfxObjectShellFlags, 0xf000034> {};
}
#define SFX_TITLE_TITLE 0
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 72fed2785283..54a300b7eab7 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -96,13 +96,12 @@ enum class SfxViewShellFlags
{
NONE = 0x0000,
HAS_PRINTOPTIONS = 0x0010, /* Options-Button and Options-Dialog in PrintDialog */
- CAN_PRINT = 0x0020, /* Printing enabled without having to create a Printer */
NO_SHOW = 0x0040, /* Window of the ViewShell shall not be showed automatically */
NO_NEWWINDOW = 0x0100, /* Allow N View */
};
namespace o3tl
{
- template<> struct typed_flags<SfxViewShellFlags> : is_typed_flags<SfxViewShellFlags, 0x0170> {};
+ template<> struct typed_flags<SfxViewShellFlags> : is_typed_flags<SfxViewShellFlags, 0x0150> {};
}
/* [Description]