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/tbxctrls/tbcontrl.cxx | |
| 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/tbxctrls/tbcontrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index cfeb01e4735a..781a9b55c5d5 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2292,7 +2292,7 @@ SvxFontColorToolBoxControl::SvxFontColorToolBoxControl( : SfxToolBoxControl( nSlotId, nId, rTbx ), pBtnUpdater( new ::svx::ToolboxButtonColorUpdater( - nSlotId, nId, &GetToolBox(), TBX_UPDATER_MODE_CHAR_COLOR_NEW )), + nSlotId, nId, &GetToolBox() )), mLastColor( COL_AUTO ) { rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); @@ -2449,8 +2449,6 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl( pBtnUpdater(0), mLastColor( COL_AUTO ) { - sal_uInt16 nMode; - rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); bChoiceFromPalette = sal_False; @@ -2459,13 +2457,11 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl( { case SID_ATTR_CHAR_COLOR: addStatusListener( OUString( ".uno:Color" )); - nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW; mLastColor = COL_RED; break; case SID_ATTR_CHAR_COLOR2: addStatusListener( OUString( ".uno:CharColorExt" )); - nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW; mLastColor = COL_RED; break; @@ -2473,18 +2469,16 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl( case SID_ATTR_CHAR_COLOR_BACKGROUND: default: addStatusListener( OUString( ".uno:CharBackgroundExt" )); - nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW; mLastColor = COL_YELLOW; break; case SID_FRAME_LINECOLOR: addStatusListener( OUString( ".uno:FrameLineColor" )); - nMode = 0; mLastColor = COL_BLUE; break; } - pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox(), nMode ); + pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() ); } // ----------------------------------------------------------------------- |