Use switch-case instead of overly long 'if (a || b || ...)'

they were growing a bit out of control

Change-Id: I80441179b4d4aacc57c469fc8f3a3937866ceae8

svx/source/tbxctrls/tbcontrl.cxx

@@ -1226,12 +1226,18 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
     mpColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT | WB_TABSTOP) );
     mpRecentColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT | WB_TABSTOP) );
 
-    if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId )
+    switch ( theSlotId )
+    {
+        case SID_ATTR_CHAR_COLOR_BACKGROUND:
+        case SID_BACKGROUND_COLOR:
         {
             mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
             mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) );
+            break;
         }
-    else if ( SID_ATTR_CHAR_COLOR == theSlotId || SID_ATTR_CHAR_COLOR2 == theSlotId || SID_EXTRUSION_3D_COLOR == theSlotId )
+        case SID_ATTR_CHAR_COLOR:
+        case SID_ATTR_CHAR_COLOR2:
+        case SID_EXTRUSION_3D_COLOR:
         {
             SfxPoolItem* pDummy;
 
@@ -1245,24 +1251,29 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString&            rCommand,
                 mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) );
                 mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_TEXTCOLOR ) );
             }
+            break;
         }
-    else if ( SID_FRAME_LINECOLOR == theSlotId )
+        case SID_FRAME_LINECOLOR:
         {
             mpButtonAutoColor->Hide();
             mpAutomaticSeparator->Hide();
             mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_FRAME_COLOR ) );
+            break;
         }
-    else if ( SID_ATTR_LINE_COLOR == theSlotId )
+        case SID_ATTR_LINE_COLOR:
         {
             mpButtonAutoColor->Hide();
             mpAutomaticSeparator->Hide();
             mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_LINECOLOR ) );
+            break;
         }
-    else if ( SID_ATTR_FILL_COLOR == theSlotId )
+        case SID_ATTR_FILL_COLOR:
         {
             mpButtonAutoColor->Hide();
             mpAutomaticSeparator->Hide();
             mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_FILLCOLOR ) );
+            break;
+        }
     }
 
     mpPaletteListBox->SetStyle( mpPaletteListBox->GetStyle() | WB_BORDER | WB_AUTOSIZE );
@@ -1365,10 +1376,22 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectPaletteHdl)
 IMPL_LINK_NOARG(SvxColorWindow_Impl, AutoColorClickHdl)
 {
     Color aColor;
-    if (SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId)
+    switch ( theSlotId )
+    {
+        case SID_ATTR_CHAR_COLOR_BACKGROUND:
+        case SID_BACKGROUND_COLOR:
+        {
             aColor = COL_TRANSPARENT;
-    else if (SID_ATTR_CHAR_COLOR == theSlotId || SID_ATTR_CHAR_COLOR2 == theSlotId || SID_EXTRUSION_3D_COLOR == theSlotId)
+            break;
+        }
+        case SID_ATTR_CHAR_COLOR:
+        case SID_ATTR_CHAR_COLOR2:
+        case SID_EXTRUSION_3D_COLOR:
+        {
             aColor = COL_AUTO;
+            break;
+        }
+    }
 
     mpRecentColorSet->SetNoSelection();