diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-06-22 16:00:41 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-06-22 16:52:34 +0400 |
| commit | 15f79efe1522389d52d068d620beaa268aaebdeb (patch) | |
| tree | c080dd5e644bdb94c062b74e2ea4f8d0dd5366ce /svx/source/sidebar | |
| parent | d88b434e10ef356d6937da0bcb2b3e33e6ab4bb5 (diff) | |
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
Diffstat (limited to 'svx/source/sidebar')
| -rw-r--r-- | svx/source/sidebar/area/AreaPropertyPanel.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx index df87602696c3..c08963156c8f 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx @@ -87,7 +87,7 @@ AreaPropertyPanel::AreaPropertyPanel( mpMTRTransparent(new MetricField(this, SVX_RES(MTR_TRANSPARENT))), mpBTNGradientBackground(sfx2::sidebar::ControlFactory::CreateToolBoxBackground(this)), mpBTNGradient(sfx2::sidebar::ControlFactory::CreateToolBox(mpBTNGradientBackground.get(), SVX_RES(BTN_GRADIENT))), - mpColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_FILL_COLOR, TBI_COLOR, mpToolBoxColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW)), + mpColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_FILL_COLOR, TBI_COLOR, mpToolBoxColor.get())), mpStyleItem(), mpColorItem(), mpFillGradientItem(), diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 130220560c9b..1330f4636fb9 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -185,7 +185,7 @@ LinePropertyPanel::LinePropertyPanel( maEdgeStyle(SID_ATTR_LINE_JOINT, *pBindings, *this), maCapStyle(SID_ATTR_LINE_CAP, *pBindings, *this), maColor(COL_BLACK), - mpColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_LINE_COLOR, TBI_COLOR, mpTBColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW)), + mpColorUpdater(new ::svx::ToolboxButtonColorUpdater(SID_ATTR_LINE_COLOR, TBI_COLOR, mpTBColor.get())), mpStyleItem(), mpDashItem(), mnTrans(0), diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 4934f97f7629..f2d384075d63 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -439,7 +439,7 @@ void ParaPropertyPanel::InitToolBoxIndent() void ParaPropertyPanel::InitToolBoxBGColor() { - mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_BACKGROUND_COLOR, TBI_BACK_COLOR, mpTBxBackColor.get(), TBX_UPDATER_MODE_CHAR_COLOR_NEW )); + mpColorUpdater.reset(new ::svx::ToolboxButtonColorUpdater(SID_BACKGROUND_COLOR, TBI_BACK_COLOR, mpTBxBackColor.get())); mpTBxBackColor->SetItemImage(TBI_BACK_COLOR, GetDisplayBackground().GetColor().IsDark()? maImgBackColorHigh : maImgBackColor); mpTBxBackColor->SetItemBits( TBI_BACK_COLOR, mpTBxBackColor->GetItemBits( TBI_BACK_COLOR ) | TIB_DROPDOWNONLY ); |