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

3 files changed, 32 insertions, 50 deletions

diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index b4ce7cde262e..cef5f887031e 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -981,7 +981,7 @@ ExtrusionColorControl::ExtrusionColorControl(
   mLastColor( COL_AUTO )
 {
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
-    mpBtnUpdater = new ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox(), TBX_UPDATER_MODE_CHAR_COLOR_NEW );
+    mpBtnUpdater = new ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() );
 }
 
 // -----------------------------------------------------------------------
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() );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 85f580fe38ff..289395868748 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -45,16 +45,12 @@ namespace svx
     ToolboxButtonColorUpdater::ToolboxButtonColorUpdater(
         sal_uInt16 nId,
         sal_uInt16 nTbxBtnId,
-        ToolBox* ptrTbx,
-        sal_uInt16 nMode ) :
-        mnDrawMode        ( nMode ),
+        ToolBox* ptrTbx) :
         mnBtnId           ( nTbxBtnId ),
         mnSlotId           ( nId ),
         mpTbx             ( ptrTbx ),
         maCurColor        ( COL_TRANSPARENT )
     {
-        if (mnSlotId == SID_BACKGROUND_COLOR)
-            mnDrawMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
         DBG_ASSERT( ptrTbx, "ToolBox not found :-(" );
         mbWasHiContrastMode = ptrTbx ? ( ptrTbx->GetSettings().GetStyleSettings().GetHighContrastMode() ) : sal_False;
         switch( mnSlotId )
@@ -126,7 +122,7 @@ namespace svx
 
                 mbWasHiContrastMode = mpTbx->GetSettings().GetStyleSettings().GetHighContrastMode();
 
-                if( mnDrawMode == TBX_UPDATER_MODE_CHAR_COLOR_NEW && ( COL_TRANSPARENT != aColor.GetColor() ) )
+                if( COL_TRANSPARENT != aColor.GetColor() )
                     pBmpAcc->SetLineColor( aColor );
                 else if( mpTbx->GetBackground().GetColor().IsDark() )
                     pBmpAcc->SetLineColor( Color( COL_WHITE ) );
@@ -135,46 +131,38 @@ namespace svx
 
                 pBmpAcc->SetFillColor( maCurColor = aColor );
 
-                if( TBX_UPDATER_MODE_CHAR_COLOR_NEW == mnDrawMode )
+                if( maBmpSize.Width() <= 16 )
+                    maUpdRect = Rectangle( Point( 0,12 ), Size( maBmpSize.Width(), 4 ) );
+                else if(76 == maBmpSize.Width() && 12 == maBmpSize.Height())
                 {
-                    if( maBmpSize.Width() <= 16 )
-                        maUpdRect = Rectangle( Point( 0,12 ), Size( maBmpSize.Width(), 4 ) );
-                    else if(76 == maBmpSize.Width() && 12 == maBmpSize.Height())
-                    {
-                        maUpdRect.Left() = 22;
-                        maUpdRect.Top() = 2;
-                        maUpdRect.Right() = 73;
-                        maUpdRect.Bottom() = 9;
-                    }
-                    else if(maBmpSize.Width() >= (2 * maBmpSize.Height() - 2) && maBmpSize.Height() >= 16)
-                    {
-                        maUpdRect.Left() = maBmpSize.Height() + 2;
-                        maUpdRect.Top() = 2;
-                        maUpdRect.Right() = maBmpSize.Width() - 3;
-                        maUpdRect.Bottom() = maBmpSize.Height() - 3;
-                    }
-                    else
-                        maUpdRect = Rectangle( Point( 1, maBmpSize.Height() - 7 ), Size( maBmpSize.Width() - 2 ,6 ) );
+                    maUpdRect.Left() = 22;
+                    maUpdRect.Top() = 2;
+                    maUpdRect.Right() = 73;
+                    maUpdRect.Bottom() = 9;
+                }
+                else if(maBmpSize.Width() >= (2 * maBmpSize.Height() - 2) && maBmpSize.Height() >= 16)
+                {
+                    maUpdRect.Left() = maBmpSize.Height() + 2;
+                    maUpdRect.Top() = 2;
+                    maUpdRect.Right() = maBmpSize.Width() - 3;
+                    maUpdRect.Bottom() = maBmpSize.Height() - 3;
+                }
+                else
+                    maUpdRect = Rectangle( Point( 1, maBmpSize.Height() - 7 ), Size( maBmpSize.Width() - 2 ,6 ) );
 
-                    pBmpAcc->DrawRect( maUpdRect );
+                pBmpAcc->DrawRect( maUpdRect );
 
-                    if( pMskAcc )
+                if( pMskAcc )
+                {
+                    if( COL_TRANSPARENT == aColor.GetColor() )
                     {
-                        if( COL_TRANSPARENT == aColor.GetColor() )
-                        {
-                            pMskAcc->SetLineColor( COL_BLACK );
-                            pMskAcc->SetFillColor( COL_WHITE );
-                        }
-                        else
-                            pMskAcc->SetFillColor( COL_BLACK );
-
-                        pMskAcc->DrawRect( maUpdRect );
+                        pMskAcc->SetLineColor( COL_BLACK );
+                        pMskAcc->SetFillColor( COL_WHITE );
                     }
-                }
-                else
-                {
-                    OSL_FAIL( "ToolboxButtonColorUpdater::Update: TBX_UPDATER_MODE_CHAR_COLOR / TBX_UPDATER_MODE_CHAR_BACKGROUND" );
-                    // !!! DrawChar( aVirDev, aColor );
+                    else
+                        pMskAcc->SetFillColor( COL_BLACK );
+
+                    pMskAcc->DrawRect( maUpdRect );
                 }
 
                 aBmp.ReleaseAccess( pBmpAcc );