diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-12-01 14:13:07 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-12-01 14:17:07 +0000 |
| commit | 1aa5f6f272f7712f7d64acb758b0250796c9f27c (patch) | |
| tree | 3e7e2400a375aad175e3c777dc3a742a107754f7 /dbaccess | |
| parent | 373daf55d98ba706d3dea131e755da3a00eb259f (diff) | |
WaE: -Werror=switch
Change-Id: I347bcc82795da95f14ad9be90cc6c9020fd697ca
Diffstat (limited to 'dbaccess')
4 files changed, 18 insertions, 19 deletions
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 08155e90708c..3584044a87df 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -722,8 +722,8 @@ bool OTableWindow::PreNotify(NotifyEvent& rNEvt) m_nMoveCount = 0; // reset our movement count m_nMoveIncrement = 1; } - } break; + } case MouseNotifyEvent::KEYUP: { const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); @@ -734,7 +734,9 @@ bool OTableWindow::PreNotify(NotifyEvent& rNEvt) m_nMoveCount = 0; // reset our movement count m_nMoveIncrement = 1; } + break; } + default: break; } if (!bHandled) diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 35eac4cbace4..6d8f85558468 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -150,8 +150,10 @@ bool OTableWindowListBox::PreNotify(NotifyEvent& rNEvt) break; if (FirstSelected()) static_cast<OTableWindow*>(Window::GetParent())->OnEntryDoubleClicked(FirstSelected()); + break; } - break; + default: + break; } if (!bHandled) diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 16bc2dfc9cce..ed577c6778f3 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -222,16 +222,14 @@ void OTableDesignView::resizeDocumentView(Rectangle& _rPlayground) bool OTableDesignView::PreNotify( NotifyEvent& rNEvt ) { bool bHandled = false; - switch(rNEvt.GetType()) + if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) { - case MouseNotifyEvent::GETFOCUS: - if( GetDescWin() && GetDescWin()->HasChildPathFocus() ) - m_eChildFocus = DESCRIPTION; - else if ( GetEditorCtrl() && GetEditorCtrl()->HasChildPathFocus() ) - m_eChildFocus = EDITOR; - else - m_eChildFocus = NONE; - break; + if( GetDescWin() && GetDescWin()->HasChildPathFocus() ) + m_eChildFocus = DESCRIPTION; + else if ( GetEditorCtrl() && GetEditorCtrl()->HasChildPathFocus() ) + m_eChildFocus = EDITOR; + else + m_eChildFocus = NONE; } return bHandled || ODataView::PreNotify(rNEvt); diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index fecf0f348b22..1cd013e008cf 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -267,16 +267,13 @@ void OTableFieldDescWin::LoseFocus() bool OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt ) { bool bHandled = false; - switch(rNEvt.GetType()) + if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) { - case MouseNotifyEvent::GETFOCUS: - if( getGenPage() && getGenPage()->HasChildPathFocus() ) - m_eChildFocus = DESCRIPTION; - else - m_eChildFocus = HELP; - break; + if( getGenPage() && getGenPage()->HasChildPathFocus() ) + m_eChildFocus = DESCRIPTION; + else + m_eChildFocus = HELP; } - return bHandled || TabPage::PreNotify(rNEvt); } |