diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-08-11 11:51:09 +0100 |
|---|---|---|
| committer | Aron Budea <aron.budea@collabora.com> | 2018-02-05 17:45:06 +0100 |
| commit | 8a322f65715af84f3a2dc089700671b9172f3333 (patch) | |
| tree | f7c691078cac5d2de3f81028110e639410044a74 /include | |
| parent | 5943ef41a382d2c9ce42ff25ab67530193023334 (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)
Reviewed-on: https://gerrit.libreoffice.org/41168
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit a407285747c65894bc858c4aa722a24e57caca31)
Change-Id: I83db9f02145a4927257dd5691f82dad1a11eaea6
(cherry picked from commit b0958ff8bf86b86682131b4da99da701a4a72adb)
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/flagsdef.hxx | 11 |
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 |