summaryrefslogtreecommitdiff
path: root/include/svx/tbcontrl.hxx
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2018-06-24 17:38:05 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2018-06-25 01:54:27 +0200
commit2fd31c75b677b145cf56404348857e60befcabff (patch)
tree4afc27f939582d8b38f89da5f41d8a6d1291bf2a /include/svx/tbcontrl.hxx
parent76d9d6c9bf0167d4203d7e2f6867254687915caa (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>
Diffstat (limited to 'include/svx/tbcontrl.hxx')
-rw-r--r--include/svx/tbcontrl.hxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index bf089f87153a..ded664983f21 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);