diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-08-23 22:22:32 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-08-23 22:33:30 +0300 |
commit | 30ae83c268125383866d47a7ee3e4a5dfcf59f71 (patch) | |
tree | ab52f8ecd7ed9517d70e13b22843b7948f20c9e9 /reportdesign | |
parent | 02f6c270e79879188b2be670c6db4feb56bb064e (diff) |
fdo#82577: Handle KeyCode
Put the VCL KeyCode class in the vcl namespace. Avoids clash with the X11
KeyCode typedef.
Change-Id: I624c9d937f7c5f5986d313b6c5f060bd8bb7e028
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/ui/dlg/AddField.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/dlg/CondFormat.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/ViewsWindow.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/DesignView.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/dlgedfunc.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 5bea9c5d311d..686c97f9925c 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -243,7 +243,7 @@ bool OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt ) { if ( EVENT_KEYINPUT == _rNEvt.GetType() ) { - const KeyCode& rKeyCode = _rNEvt.GetKeyEvent()->GetKeyCode(); + const vcl::KeyCode& rKeyCode = _rNEvt.GetKeyEvent()->GetKeyCode(); if ( ( 0 == rKeyCode.GetModifier() ) && ( KEY_RETURN == rKeyCode.GetCode() ) ) { if ( m_aCreateLink.IsSet() ) diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 7390352cb0fe..6f73a53e9b22 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -475,7 +475,7 @@ namespace rptui case EVENT_KEYINPUT: { const KeyEvent* pKeyEvent( _rNEvt.GetKeyEvent() ); - const KeyCode& rKeyCode = pKeyEvent->GetKeyCode(); + const vcl::KeyCode& rKeyCode = pKeyEvent->GetKeyCode(); if ( rKeyCode.IsMod1() && rKeyCode.IsMod2() ) { if ( rKeyCode.GetCode() == 0x0508 ) diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index fde7caf0d79d..f4c457728e81 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -302,7 +302,7 @@ namespace rptui void ForceMarkedToAnotherPage(); bool IsAction() const; bool IsDragObj() const; - void handleKey(const KeyCode& _rCode); + void handleKey(const vcl::KeyCode& _rCode); void stopScrollTimer(); /** return the section at the given point which is relative to the given section diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index c94c27a9555b..b4e9de932b96 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -202,7 +202,7 @@ bool ODesignView::PreNotify( NotifyEvent& rNEvt ) nRet = true; else if ( nRet && m_pAccel.get() ) { - const KeyCode& rCode = pKeyEvent->GetKeyCode(); + const vcl::KeyCode& rCode = pKeyEvent->GetKeyCode(); util::URL aUrl; aUrl.Complete = m_pAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rCode)); if ( aUrl.Complete.isEmpty() || !m_rController.isCommandEnabled( aUrl.Complete ) ) diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 154eaf9c1b18..5fb908d71dee 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -1437,7 +1437,7 @@ sal_uInt32 OViewsWindow::getMarkedObjectCount() const return nCount; } -void OViewsWindow::handleKey(const KeyCode& _rCode) +void OViewsWindow::handleKey(const vcl::KeyCode& _rCode) { const sal_uInt16 nCode = _rCode.GetCode(); if ( _rCode.IsMod1() ) diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 087ad6e3fd3d..07067619fff9 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -272,7 +272,7 @@ bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent) if ( !m_bUiActive ) { - const KeyCode& rCode = _rEvent.GetKeyCode(); + const vcl::KeyCode& rCode = _rEvent.GetKeyCode(); sal_uInt16 nCode = rCode.GetCode(); switch ( nCode ) |