WaE: -Werror=switch

Change-Id: Ic5b7f1da92ac5a936857fe122cb8db0441b6d291

svtools/source/brwbox/ebbcontrols.cxx

@@ -52,10 +52,7 @@ namespace svt
 
     bool ComboBoxControl::PreNotify( NotifyEvent& rNEvt )
     {
-        switch (rNEvt.GetType())
-        {
-            case MouseNotifyEvent::KEYINPUT:
-                if (!IsInDropDown())
+        if (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT && !IsInDropDown())
         {
             const KeyEvent *pEvt = rNEvt.GetKeyEvent();
             const vcl::KeyCode rKey = pEvt->GetKeyCode();
@@ -74,15 +71,10 @@ namespace svt
                 return true;
             }
         }
-                break;
-        }
         return ComboBox::PreNotify(rNEvt);
     }
 
-
     //= ComboBoxCellController
-
-
     ComboBoxCellController::ComboBoxCellController(ComboBoxControl* pWin)
                              :CellController(pWin)
     {
@@ -133,22 +125,17 @@ namespace svt
         return GetComboBox().IsValueChangedFromSaved();
     }
 
-
     void ComboBoxCellController::ClearModified()
     {
         GetComboBox().SaveValue();
     }
 
-
     void ComboBoxCellController::SetModifyHdl(const Link& rLink)
     {
         GetComboBox().SetModifyHdl(rLink);
     }
 
-
     //= ListBoxControl
-
-
     ListBoxControl::ListBoxControl(vcl::Window* pParent, WinBits nWinStyle)
                   :ListBox(pParent, nWinStyle|WB_DROPDOWN|WB_NOBORDER)
     {
@@ -157,13 +144,9 @@ namespace svt
         SetDropDownLineCount(20);
     }
 
-
     bool ListBoxControl::PreNotify( NotifyEvent& rNEvt )
     {
-        switch (rNEvt.GetType())
-        {
-            case MouseNotifyEvent::KEYINPUT:
-                if (!IsInDropDown())
+        switch (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT && !IsInDropDown())
         {
             const KeyEvent *pEvt = rNEvt.GetKeyEvent();
             const vcl::KeyCode rKey = pEvt->GetKeyCode();
@@ -185,15 +168,10 @@ namespace svt
             else if (GetParent()->PreNotify(rNEvt))
                 return true;
         }
-                break;
-        }
         return ListBox::PreNotify(rNEvt);
     }
 
-
     //= ListBoxCellController
-
-
     ListBoxCellController::ListBoxCellController(ListBoxControl* pWin)
                              :CellController(pWin)
     {
@@ -333,6 +311,9 @@ namespace svt
                 break;
             case MouseNotifyEvent::LOSEFOCUS:
                 HideFocus();
+                break;
+            default:
+                break;
         }
         return Control::PreNotify(rEvt);
     }

svtools/source/brwbox/editbrowsebox.cxx

@@ -608,12 +608,10 @@ namespace svt
         BrowseBox::Dispatch( _nId );
     }
 
-
     bool EditBrowseBox::PreNotify(NotifyEvent& rEvt)
     {
-        switch (rEvt.GetType())
+        if (rEvt.GetType() == MouseNotifyEvent::KEYINPUT)
         {
-            case MouseNotifyEvent::KEYINPUT:
             if  (   (IsEditing() && Controller()->GetWindow().HasChildPathFocus())
                 ||  rEvt.GetWindow() == &GetDataWindow()
                 ||  (!IsEditing() && HasChildPathFocus())
@@ -727,7 +725,6 @@ namespace svt
         return BrowseBox::PreNotify(rEvt);
     }
 
-
     bool EditBrowseBox::IsTabAllowed(bool) const
     {
         return true;
@@ -745,6 +742,9 @@ namespace svt
             case MouseNotifyEvent::LOSEFOCUS:
                 DetermineFocus( 0 );
                 break;
+
+            default:
+                break;
         }
         return BrowseBox::Notify(rEvt);
     }

svtools/source/control/fileurlbox.cxx

@@ -68,17 +68,18 @@ namespace svt
             if ( IsWindowOrChild( _rNEvt.GetWindow() ) )
                 DisplayURL( GetText() );
             break;
+
+        default:
+            break;
         }
 
         return SvtURLBox::PreNotify(_rNEvt);
     }
 
-
     bool FileURLBox::Notify( NotifyEvent& _rNEvt )
     {
-        switch ( _rNEvt.GetType() )
+        switch (_rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
         {
-        case MouseNotifyEvent::KEYINPUT:
             if  (   ( GetSubEdit() == _rNEvt.GetWindow()                         )
                 &&  ( KEY_RETURN == _rNEvt.GetKeyEvent()->GetKeyCode().GetCode() )
                 &&  ( IsInDropDown()                                             )
@@ -88,13 +89,11 @@ namespace svt
                 DisplayURL( m_sPreservedText );
                 return nReturn;
             }
-            break;
         }
 
         return SvtURLBox::Notify(_rNEvt);
     }
 
-
 }   // namespace svt
 
 

svtools/source/dialogs/addresstemplate.cxx

@@ -1225,12 +1225,9 @@ void AssignmentPersistentData::Commit()
         return 0L;
     }
 
-
     bool AddressBookSourceDialog::PreNotify( NotifyEvent& _rNEvt )
     {
-        switch (_rNEvt.GetType())
-        {
-            case MouseNotifyEvent::KEYINPUT:
+        switch (_rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
         {
             const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent();
             sal_uInt16 nCode  = pKeyEvent->GetKeyCode().GetCode();
@@ -1271,12 +1268,10 @@ void AssignmentPersistentData::Commit()
                 }
             }
         }
-            break;
-        }
+
         return ModalDialog::PreNotify(_rNEvt);
     }
 
-
 }   // namespace svt