Skip to content

C
core
Kaydet (Commit) 83a597af authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

WaE: -Werror=switch 

Change-Id: Ic5b7f1da92ac5a936857fe122cb8db0441b6d291
üst 2dc8ed69
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 202 deletions
svtools/source/brwbox/ebbcontrols.cxx
Dosyayı görüntüle @ 83a597af
...@@ -52,37 +52,29 @@ namespace svt ...@@ -52,37 +52,29 @@ namespace svt
bool ComboBoxControl::PreNotify( NotifyEvent& rNEvt ) bool ComboBoxControl::PreNotify( NotifyEvent& rNEvt )
{ {
switch (rNEvt.GetType()) if (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT && !IsInDropDown())
{ {
case MouseNotifyEvent::KEYINPUT: const KeyEvent *pEvt = rNEvt.GetKeyEvent();
if (!IsInDropDown()) const vcl::KeyCode rKey = pEvt->GetKeyCode();
if ((rKey.GetCode() == KEY_UP || rKey.GetCode() == KEY_DOWN) &&
(!pEvt->GetKeyCode().IsShift() && pEvt->GetKeyCode().IsMod1()))
{
// select next resp. previous entry
sal_Int32 nPos = GetEntryPos(GetText());
int nDir = (rKey.GetCode() == KEY_DOWN ? 1 : -1);
if (!((nPos == 0 && nDir == -1) || (nPos >= GetEntryCount() && nDir == 1)))
{ {
const KeyEvent *pEvt = rNEvt.GetKeyEvent(); nPos += nDir;
const vcl::KeyCode rKey = pEvt->GetKeyCode(); SetText(GetEntry(nPos));
if ((rKey.GetCode() == KEY_UP || rKey.GetCode() == KEY_DOWN) &&
(!pEvt->GetKeyCode().IsShift() && pEvt->GetKeyCode().IsMod1()))
{
// select next resp. previous entry
sal_Int32 nPos = GetEntryPos(GetText());
int nDir = (rKey.GetCode() == KEY_DOWN ? 1 : -1);
if (!((nPos == 0 && nDir == -1) || (nPos >= GetEntryCount() && nDir == 1)))
{
nPos += nDir;
SetText(GetEntry(nPos));
}
return true;
}
} }
break; return true;
}
} }
return ComboBox::PreNotify(rNEvt); return ComboBox::PreNotify(rNEvt);
} }
//= ComboBoxCellController //= ComboBoxCellController
ComboBoxCellController::ComboBoxCellController(ComboBoxControl* pWin) ComboBoxCellController::ComboBoxCellController(ComboBoxControl* pWin)
:CellController(pWin) :CellController(pWin)
{ {
...@@ -133,22 +125,17 @@ namespace svt ...@@ -133,22 +125,17 @@ namespace svt
return GetComboBox().IsValueChangedFromSaved(); return GetComboBox().IsValueChangedFromSaved();
} }
void ComboBoxCellController::ClearModified() void ComboBoxCellController::ClearModified()
{ {
GetComboBox().SaveValue(); GetComboBox().SaveValue();
} }
void ComboBoxCellController::SetModifyHdl(const Link& rLink) void ComboBoxCellController::SetModifyHdl(const Link& rLink)
{ {
GetComboBox().SetModifyHdl(rLink); GetComboBox().SetModifyHdl(rLink);
} }
//= ListBoxControl //= ListBoxControl
ListBoxControl::ListBoxControl(vcl::Window* pParent, WinBits nWinStyle) ListBoxControl::ListBoxControl(vcl::Window* pParent, WinBits nWinStyle)
:ListBox(pParent, nWinStyle|WB_DROPDOWN|WB_NOBORDER) :ListBox(pParent, nWinStyle|WB_DROPDOWN|WB_NOBORDER)
{ {
...@@ -157,43 +144,34 @@ namespace svt ...@@ -157,43 +144,34 @@ namespace svt
SetDropDownLineCount(20); SetDropDownLineCount(20);
} }
bool ListBoxControl::PreNotify( NotifyEvent& rNEvt ) bool ListBoxControl::PreNotify( NotifyEvent& rNEvt )
{ {
switch (rNEvt.GetType()) switch (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT && !IsInDropDown())
{ {
case MouseNotifyEvent::KEYINPUT: const KeyEvent *pEvt = rNEvt.GetKeyEvent();
if (!IsInDropDown()) const vcl::KeyCode rKey = pEvt->GetKeyCode();
if ((rKey.GetCode() == KEY_UP || rKey.GetCode() == KEY_DOWN) &&
(!pEvt->GetKeyCode().IsShift() && pEvt->GetKeyCode().IsMod1()))
{
// select next resp. previous entry
sal_Int32 nPos = GetSelectEntryPos();
int nDir = (rKey.GetCode() == KEY_DOWN ? 1 : -1);
if (!((nPos == 0 && nDir == -1) || (nPos >= GetEntryCount() && nDir == 1)))
{ {
const KeyEvent *pEvt = rNEvt.GetKeyEvent(); nPos += nDir;
const vcl::KeyCode rKey = pEvt->GetKeyCode(); SelectEntryPos(nPos);
if ((rKey.GetCode() == KEY_UP || rKey.GetCode() == KEY_DOWN) &&
(!pEvt->GetKeyCode().IsShift() && pEvt->GetKeyCode().IsMod1()))
{
// select next resp. previous entry
sal_Int32 nPos = GetSelectEntryPos();
int nDir = (rKey.GetCode() == KEY_DOWN ? 1 : -1);
if (!((nPos == 0 && nDir == -1) || (nPos >= GetEntryCount() && nDir == 1)))
{
nPos += nDir;
SelectEntryPos(nPos);
}
Select(); // for calling Modify
return true;
}
else if (GetParent()->PreNotify(rNEvt))
return true;
} }
break; Select(); // for calling Modify
return true;
}
else if (GetParent()->PreNotify(rNEvt))
return true;
} }
return ListBox::PreNotify(rNEvt); return ListBox::PreNotify(rNEvt);
} }
//= ListBoxCellController //= ListBoxCellController
ListBoxCellController::ListBoxCellController(ListBoxControl* pWin) ListBoxCellController::ListBoxCellController(ListBoxControl* pWin)
:CellController(pWin) :CellController(pWin)
{ {
...@@ -333,6 +311,9 @@ namespace svt ...@@ -333,6 +311,9 @@ namespace svt
break; break;
case MouseNotifyEvent::LOSEFOCUS: case MouseNotifyEvent::LOSEFOCUS:
HideFocus(); HideFocus();
break;
default:
break;
} }
return Control::PreNotify(rEvt); return Control::PreNotify(rEvt);
} }
......
svtools/source/brwbox/editbrowsebox.cxx
Dosyayı görüntüle @ 83a597af
...@@ -608,126 +608,123 @@ namespace svt ...@@ -608,126 +608,123 @@ namespace svt
BrowseBox::Dispatch( _nId ); BrowseBox::Dispatch( _nId );
} }
bool EditBrowseBox::PreNotify(NotifyEvent& rEvt) bool EditBrowseBox::PreNotify(NotifyEvent& rEvt)
{ {
switch (rEvt.GetType()) if (rEvt.GetType() == MouseNotifyEvent::KEYINPUT)
{ {
case MouseNotifyEvent::KEYINPUT: if ( (IsEditing() && Controller()->GetWindow().HasChildPathFocus())
if ( (IsEditing() && Controller()->GetWindow().HasChildPathFocus()) || rEvt.GetWindow() == &GetDataWindow()
|| rEvt.GetWindow() == &GetDataWindow() || (!IsEditing() && HasChildPathFocus())
|| (!IsEditing() && HasChildPathFocus()) )
) {
{ const KeyEvent* pKeyEvent = rEvt.GetKeyEvent();
const KeyEvent* pKeyEvent = rEvt.GetKeyEvent(); sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode();
sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode(); bool bShift = pKeyEvent->GetKeyCode().IsShift();
bool bShift = pKeyEvent->GetKeyCode().IsShift(); bool bCtrl = pKeyEvent->GetKeyCode().IsMod1();
bool bCtrl = pKeyEvent->GetKeyCode().IsMod1(); bool bAlt = pKeyEvent->GetKeyCode().IsMod2();
bool bAlt = pKeyEvent->GetKeyCode().IsMod2(); bool bLocalSelect = false;
bool bLocalSelect = false; bool bNonEditOnly = false;
bool bNonEditOnly = false; sal_uInt16 nId = BROWSER_NONE;
sal_uInt16 nId = BROWSER_NONE;
if (!bAlt && !bCtrl && !bShift )
if (!bAlt && !bCtrl && !bShift ) switch ( nCode )
switch ( nCode ) {
{ case KEY_DOWN: nId = BROWSER_CURSORDOWN; break;
case KEY_DOWN: nId = BROWSER_CURSORDOWN; break; case KEY_UP: nId = BROWSER_CURSORUP; break;
case KEY_UP: nId = BROWSER_CURSORUP; break; case KEY_PAGEDOWN: nId = BROWSER_CURSORPAGEDOWN; break;
case KEY_PAGEDOWN: nId = BROWSER_CURSORPAGEDOWN; break; case KEY_PAGEUP: nId = BROWSER_CURSORPAGEUP; break;
case KEY_PAGEUP: nId = BROWSER_CURSORPAGEUP; break; case KEY_HOME: nId = BROWSER_CURSORHOME; break;
case KEY_HOME: nId = BROWSER_CURSORHOME; break; case KEY_END: nId = BROWSER_CURSOREND; break;
case KEY_END: nId = BROWSER_CURSOREND; break;
case KEY_TAB:
case KEY_TAB: // ask if traveling to the next cell is allowed
// ask if traveling to the next cell is allowed if (IsTabAllowed(true))
if (IsTabAllowed(true)) nId = BROWSER_CURSORRIGHT;
nId = BROWSER_CURSORRIGHT; break;
break;
case KEY_RETURN:
case KEY_RETURN: // save the cell content (if necessary)
// save the cell content (if necessary) if (IsEditing() && aController->IsModified() && !((EditBrowseBox *) this)->SaveModified())
if (IsEditing() && aController->IsModified() && !((EditBrowseBox *) this)->SaveModified()) {
{ // maybe we're not visible ...
// maybe we're not visible ... EnableAndShow();
EnableAndShow(); aController->GetWindow().GrabFocus();
aController->GetWindow().GrabFocus(); return true;
return true; }
} // ask if traveling to the next cell is allowed
// ask if traveling to the next cell is allowed if (IsTabAllowed(true))
if (IsTabAllowed(true)) nId = BROWSER_CURSORRIGHT;
nId = BROWSER_CURSORRIGHT;
break;
break; case KEY_RIGHT: nId = BROWSER_CURSORRIGHT; break;
case KEY_RIGHT: nId = BROWSER_CURSORRIGHT; break; case KEY_LEFT: nId = BROWSER_CURSORLEFT; break;
case KEY_LEFT: nId = BROWSER_CURSORLEFT; break; case KEY_SPACE: nId = BROWSER_SELECT; bNonEditOnly = bLocalSelect = true; break;
case KEY_SPACE: nId = BROWSER_SELECT; bNonEditOnly = bLocalSelect = true; break; }
}
if ( !bAlt && !bCtrl && bShift ) if ( !bAlt && !bCtrl && bShift )
switch ( nCode ) switch ( nCode )
{ {
case KEY_DOWN: nId = BROWSER_SELECTDOWN; bLocalSelect = true; break; case KEY_DOWN: nId = BROWSER_SELECTDOWN; bLocalSelect = true; break;
case KEY_UP: nId = BROWSER_SELECTUP; bLocalSelect = true; break; case KEY_UP: nId = BROWSER_SELECTUP; bLocalSelect = true; break;
case KEY_HOME: nId = BROWSER_SELECTHOME; bLocalSelect = true; break; case KEY_HOME: nId = BROWSER_SELECTHOME; bLocalSelect = true; break;
case KEY_END: nId = BROWSER_SELECTEND; bLocalSelect = true; break; case KEY_END: nId = BROWSER_SELECTEND; bLocalSelect = true; break;
case KEY_TAB: case KEY_TAB:
if (IsTabAllowed(false)) if (IsTabAllowed(false))
nId = BROWSER_CURSORLEFT; nId = BROWSER_CURSORLEFT;
break; break;
} }
if ( !bAlt && bCtrl && bShift ) if ( !bAlt && bCtrl && bShift )
switch ( nCode ) switch ( nCode )
{ {
case KEY_SPACE: nId = BROWSER_SELECTCOLUMN; bLocalSelect = true; break; case KEY_SPACE: nId = BROWSER_SELECTCOLUMN; bLocalSelect = true; break;
} }
if ( !bAlt && bCtrl && !bShift ) if ( !bAlt && bCtrl && !bShift )
switch ( nCode ) switch ( nCode )
{ {
case KEY_DOWN: nId = BROWSER_SCROLLUP; break; case KEY_DOWN: nId = BROWSER_SCROLLUP; break;
case KEY_UP: nId = BROWSER_SCROLLDOWN; break; case KEY_UP: nId = BROWSER_SCROLLDOWN; break;
case KEY_PAGEDOWN: nId = BROWSER_CURSORENDOFFILE; break; case KEY_PAGEDOWN: nId = BROWSER_CURSORENDOFFILE; break;
case KEY_PAGEUP: nId = BROWSER_CURSORTOPOFFILE; break; case KEY_PAGEUP: nId = BROWSER_CURSORTOPOFFILE; break;
case KEY_HOME: nId = BROWSER_CURSORTOPOFSCREEN; break; case KEY_HOME: nId = BROWSER_CURSORTOPOFSCREEN; break;
case KEY_END: nId = BROWSER_CURSORENDOFSCREEN; break; case KEY_END: nId = BROWSER_CURSORENDOFSCREEN; break;
case KEY_SPACE: nId = BROWSER_ENHANCESELECTION; bLocalSelect = true; break; case KEY_SPACE: nId = BROWSER_ENHANCESELECTION; bLocalSelect = true; break;
} }
if ( ( nId != BROWSER_NONE ) if ( ( nId != BROWSER_NONE )
&& ( !IsEditing() && ( !IsEditing()
|| ( !bNonEditOnly || ( !bNonEditOnly
&& aController->MoveAllowed( *pKeyEvent ) && aController->MoveAllowed( *pKeyEvent )
)
) )
) )
)
{
if (nId == BROWSER_SELECT || BROWSER_SELECTCOLUMN == nId )
{ {
if (nId == BROWSER_SELECT || BROWSER_SELECTCOLUMN == nId ) // save the cell content (if necessary)
if (IsEditing() && aController->IsModified() && !((EditBrowseBox *) this)->SaveModified())
{ {
// save the cell content (if necessary) // maybe we're not visible ...
if (IsEditing() && aController->IsModified() && !((EditBrowseBox *) this)->SaveModified()) EnableAndShow();
{ aController->GetWindow().GrabFocus();
// maybe we're not visible ... return true;
EnableAndShow();
aController->GetWindow().GrabFocus();
return true;
}
} }
}
Dispatch(nId); Dispatch(nId);
if (bLocalSelect && (GetSelectRowCount() || GetSelection() != NULL)) if (bLocalSelect && (GetSelectRowCount() || GetSelection() != NULL))
DeactivateCell(); DeactivateCell();
return true; return true;
}
} }
}
} }
return BrowseBox::PreNotify(rEvt); return BrowseBox::PreNotify(rEvt);
} }
bool EditBrowseBox::IsTabAllowed(bool) const bool EditBrowseBox::IsTabAllowed(bool) const
{ {
return true; return true;
...@@ -745,6 +742,9 @@ namespace svt ...@@ -745,6 +742,9 @@ namespace svt
case MouseNotifyEvent::LOSEFOCUS: case MouseNotifyEvent::LOSEFOCUS:
DetermineFocus( 0 ); DetermineFocus( 0 );
break; break;
default:
break;
} }
return BrowseBox::Notify(rEvt); return BrowseBox::Notify(rEvt);
} }
......
svtools/source/control/fileurlbox.cxx
Dosyayı görüntüle @ 83a597af
...@@ -68,17 +68,18 @@ namespace svt ...@@ -68,17 +68,18 @@ namespace svt
if ( IsWindowOrChild( _rNEvt.GetWindow() ) ) if ( IsWindowOrChild( _rNEvt.GetWindow() ) )
DisplayURL( GetText() ); DisplayURL( GetText() );
break; break;
default:
break;
} }
return SvtURLBox::PreNotify(_rNEvt); return SvtURLBox::PreNotify(_rNEvt);
} }
bool FileURLBox::Notify( NotifyEvent& _rNEvt ) bool FileURLBox::Notify( NotifyEvent& _rNEvt )
{ {
switch ( _rNEvt.GetType() ) switch (_rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
{ {
case MouseNotifyEvent::KEYINPUT:
if ( ( GetSubEdit() == _rNEvt.GetWindow() ) if ( ( GetSubEdit() == _rNEvt.GetWindow() )
&& ( KEY_RETURN == _rNEvt.GetKeyEvent()->GetKeyCode().GetCode() ) && ( KEY_RETURN == _rNEvt.GetKeyEvent()->GetKeyCode().GetCode() )
&& ( IsInDropDown() ) && ( IsInDropDown() )
...@@ -88,13 +89,11 @@ namespace svt ...@@ -88,13 +89,11 @@ namespace svt
DisplayURL( m_sPreservedText ); DisplayURL( m_sPreservedText );
return nReturn; return nReturn;
} }
break;
} }
return SvtURLBox::Notify(_rNEvt); return SvtURLBox::Notify(_rNEvt);
} }
} // namespace svt } // namespace svt
......
svtools/source/dialogs/addresstemplate.cxx
Dosyayı görüntüle @ 83a597af
...@@ -1225,58 +1225,53 @@ void AssignmentPersistentData::Commit() ...@@ -1225,58 +1225,53 @@ void AssignmentPersistentData::Commit()
return 0L; return 0L;
} }
bool AddressBookSourceDialog::PreNotify( NotifyEvent& _rNEvt ) bool AddressBookSourceDialog::PreNotify( NotifyEvent& _rNEvt )
{ {
switch (_rNEvt.GetType()) switch (_rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
{ {
case MouseNotifyEvent::KEYINPUT: const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent();
{ sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode();
const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); bool bShift = pKeyEvent->GetKeyCode().IsShift();
sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode(); bool bCtrl = pKeyEvent->GetKeyCode().IsMod1();
bool bShift = pKeyEvent->GetKeyCode().IsShift(); bool bAlt = pKeyEvent->GetKeyCode().IsMod2();
bool bCtrl = pKeyEvent->GetKeyCode().IsMod1();
bool bAlt = pKeyEvent->GetKeyCode().IsMod2(); if (KEY_TAB == nCode)
{ // somebody pressed the tab key
if (KEY_TAB == nCode) if (!bAlt && !bCtrl && !bShift)
{ // somebody pressed the tab key { // it's really the only the key (no modifiers)
if (!bAlt && !bCtrl && !bShift) if (m_pImpl->pFields[m_pImpl->nLastVisibleListIndex]->HasChildPathFocus())
{ // it's really the only the key (no modifiers) // the last of our visible list boxes has the focus
if (m_pImpl->pFields[m_pImpl->nLastVisibleListIndex]->HasChildPathFocus()) if (m_pImpl->nFieldScrollPos < m_pFieldScroller->GetRangeMax())
// the last of our visible list boxes has the focus { // we can still scroll down
if (m_pImpl->nFieldScrollPos < m_pFieldScroller->GetRangeMax()) sal_Int32 nNextFocusList = m_pImpl->nLastVisibleListIndex + 1 - 2;
{ // we can still scroll down // -> scroll down
sal_Int32 nNextFocusList = m_pImpl->nLastVisibleListIndex + 1 - 2; implScrollFields(m_pImpl->nFieldScrollPos + 1, false, true);
// -> scroll down // give the left control in the "next" line the focus
implScrollFields(m_pImpl->nFieldScrollPos + 1, false, true); m_pImpl->pFields[nNextFocusList]->GrabFocus();
// give the left control in the "next" line the focus // return saying "have handled this"
m_pImpl->pFields[nNextFocusList]->GrabFocus(); return true;
// return saying "have handled this" }
return true; }
} else if (!bAlt && !bCtrl && bShift)
} { // it's shift-tab
else if (!bAlt && !bCtrl && bShift) if (m_pImpl->pFields[0]->HasChildPathFocus())
{ // it's shift-tab // our first list box has the focus
if (m_pImpl->pFields[0]->HasChildPathFocus()) if (m_pImpl->nFieldScrollPos > 0)
// our first list box has the focus { // we can still scroll up
if (m_pImpl->nFieldScrollPos > 0) // -> scroll up
{ // we can still scroll up implScrollFields(m_pImpl->nFieldScrollPos - 1, false, true);
// -> scroll up // give the right control in the "prebious" line the focus
implScrollFields(m_pImpl->nFieldScrollPos - 1, false, true); m_pImpl->pFields[0 - 1 + 2]->GrabFocus();
// give the right control in the "prebious" line the focus // return saying "have handled this"
m_pImpl->pFields[0 - 1 + 2]->GrabFocus(); return true;
// return saying "have handled this" }
return true;
}
}
} }
} }
break;
} }
return ModalDialog::PreNotify(_rNEvt); return ModalDialog::PreNotify(_rNEvt);
} }
} // namespace svt } // namespace svt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment