summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-08-11 11:51:09 +0100
committerMichael Stahl <mstahl@redhat.com>2017-08-17 13:45:19 +0200
commita407285747c65894bc858c4aa722a24e57caca31 (patch)
tree0c9f11b18ca89eac2b5afd45f8e508df43fd7a6b /include
parent1d5f35218ef2176af445a0644bd329763b77feb4 (diff)
Resolves: tdf#110077 move the SvxBackgroundColorItem<->SvxBrushItem conversion
into the dialog itself Reviewed-on: https://gerrit.libreoffice.org/41029 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6284804c2ccb3ad8bb6e1c1dac8d622f66b8c07d) Change-Id: I83db9f02145a4927257dd5691f82dad1a11eaea6 Reviewed-on: https://gerrit.libreoffice.org/41168 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/svx/flagsdef.hxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx
index 0207a0ef1df5..30b1ff401203 100644
--- a/include/svx/flagsdef.hxx
+++ b/include/svx/flagsdef.hxx
@@ -39,14 +39,15 @@ namespace o3tl
// flags for SvxBackgroundTabPage
enum class SvxBackgroundTabFlags
{
- NONE = 0x00,
- SHOW_SELECTOR = 0x01,
- SHOW_TBLCTL = 0x08,
- SHOW_HIGHLIGHTING = 0x10,
+ NONE = 0x00,
+ SHOW_SELECTOR = 0x01,
+ SHOW_TBLCTL = 0x08,
+ SHOW_HIGHLIGHTING = 0x10,
+ SHOW_CHAR_BKGCOLOR = 0x20,
};
namespace o3tl
{
- template<> struct typed_flags<SvxBackgroundTabFlags> : is_typed_flags<SvxBackgroundTabFlags, 0x19> {};
+ template<> struct typed_flags<SvxBackgroundTabFlags> : is_typed_flags<SvxBackgroundTabFlags, 0x39> {};
}
// flags for SvxBorderTabPage