From 15f79efe1522389d52d068d620beaa268aaebdeb Mon Sep 17 00:00:00 2001 From: Ivan Timofeev Date: Sat, 22 Jun 2013 16:00:41 +0400 Subject: kill TBX_UPDATER_MODE_* commit 4f036439f7597d33a9f90860d9a5b6ac28b270c7 "Kill unused TBX_UPDATER_MODE_NONE." removed TBX_UPDATER_MODE_NONE, but it was actually used, but written as literal 0 in ctor (default value for nMode). Worse, TBX_UPDATER_MODE_NONE meant "draw a square color mark" (!) and after removing it color-marks were not drawn for some buttons, e.g. frame color button. This patch makes use of TBX_UPDATER_MODE_CHAR_COLOR_NEW (which means "draw a rectangle color mark") everywhere, TBX_UPDATER_MODE_CHAR_COLOR and TBX_UPDATER_MODE_CHAR_BACKGROUND were unused. Change-Id: I7452bf73227cd7038e5ea9ab740745125ca079b4 --- reportdesign/source/ui/dlg/Condition.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'reportdesign') diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index eee8c29e0762..854ec4d6b705 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -295,7 +295,7 @@ Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rp m_pBtnUpdaterBackgroundColor = new ::svx::ToolboxButtonColorUpdater( SID_BACKGROUND_COLOR, SID_BACKGROUND_COLOR, &m_aActions ); m_pBtnUpdaterFontColor = new ::svx::ToolboxButtonColorUpdater( - SID_ATTR_CHAR_COLOR2, SID_ATTR_CHAR_COLOR2, &m_aActions, TBX_UPDATER_MODE_CHAR_COLOR_NEW ); + SID_ATTR_CHAR_COLOR2, SID_ATTR_CHAR_COLOR2, &m_aActions ); Show(); -- cgit