diff options
author | Katarina Behrens <bubli@bubli.org> | 2021-07-19 17:42:02 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-08-25 21:41:14 +0200 |
commit | a7062af6bfb821c5b8e7d110476332d84d17f624 (patch) | |
tree | e26de4bc754244992d68e0bad12e396e79f9ca9e /include | |
parent | 3dad6c8f570cf539090b4a3cd4fd9f3db2d89b7c (diff) |
tdf#128612: Support applying pattern fill from toolbar
List available pattern fills and add 'pattern' case to state and
execute functions
This is likely not perfect and there's still boatloads of code
duplication that should be cleaned up eventually, but hey, it fixes
the bug
Change-Id: I3381a4271bb32a63c048cbecb0b54ebabe12ef51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119229
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <bubli@bubli.org>
(cherry picked from commit c1a8ff837e3e369561150c0022c6ab02aab27c2c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120241
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/fillctrl.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index ad428a10529f..e935fc7cc403 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -54,10 +54,11 @@ private: weld::Toolbar* mpToolBoxColor; weld::ComboBox* mpLbFillAttr; - css::drawing::FillStyle meLastXFS; + sal_Int32 mnLastXFS; sal_Int32 mnLastPosGradient; sal_Int32 mnLastPosHatch; sal_Int32 mnLastPosBitmap; + sal_Int32 mnLastPosPattern; DECL_LINK(SelectFillTypeHdl, weld::ComboBox&, void); DECL_LINK(SelectFillAttrHdl, weld::ComboBox&, void); |