diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2018-06-24 17:38:05 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2018-06-25 15:15:28 +0200 |
| commit | 415368daf3047a6dfb2577822a72f65df7374df8 (patch) | |
| tree | b883c4c87da9ded977ad02ece257e9289739d8eb /include | |
| parent | f220bce256a799e0df45e2419f59e8714b9972e9 (diff) | |
tdf#117987 tdf#118138 Compare with the currently used color
... when deciding whether to toggle highlighting. Had to move
the whole thing into sw, as otherwise there is no way to
correctly handle the "brush" mode (as the toolbox controller
in svx has no way to know in advance which text will be
selected by the user).
Change-Id: Id2dec4c3647332e82260d12da1311b249f5b9c12
Reviewed-on: https://gerrit.libreoffice.org/56358
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
(cherry picked from commit 2fd31c75b677b145cf56404348857e60befcabff)
Reviewed-on: https://gerrit.libreoffice.org/56375
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/tbcontrl.hxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 1f5079f69a22..57d1dcba5f22 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -212,7 +212,6 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public cppu::ImplInheritanceHelper< std::shared_ptr<PaletteManager> m_xPaletteManager; BorderColorStatus m_aBorderColorStatus; bool m_bSplitButton; - bool m_bIsNoFill; sal_uInt16 m_nSlotId; ColorSelectFunction m_aColorSelectFunction; DECL_LINK(SelectedHdl, const NamedColor&, void); |