summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-08-23 22:22:32 +0300
committerTor Lillqvist <tml@collabora.com>2014-08-23 22:33:30 +0300
commit30ae83c268125383866d47a7ee3e4a5dfcf59f71 (patch)
treeab52f8ecd7ed9517d70e13b22843b7948f20c9e9 /sw/source/ui
parent02f6c270e79879188b2be670c6db4feb56bb064e (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 'sw/source/ui')
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx2
-rw-r--r--sw/source/ui/fldui/fldvar.cxx2
-rw-r--r--sw/source/ui/index/cnttab.cxx8
-rw-r--r--sw/source/ui/misc/bookmark.cxx2
-rw-r--r--sw/source/ui/misc/glosbib.cxx2
5 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 14e5731a38f2..b29556d85faf 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -1350,7 +1350,7 @@ void SwInsertDBColAutoPilot::DataToDoc( const Sequence<Any>& rSelection,
rSh.SwCrsrShell::MovePara(
GetfnParaCurr(), GetfnParaStart() );
pMark = rSh.SetBookmark(
- KeyCode(),
+ vcl::KeyCode(),
OUString(),
OUString(), IDocumentMarkAccess::UNO_BOOKMARK );
rSh.SwCrsrShell::MovePara(
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 178495830f41..7205cc6ab317 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1267,7 +1267,7 @@ bool SelectionListBox::PreNotify( NotifyEvent& rNEvt )
if ( rNEvt.GetType() == EVENT_KEYUP )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
- const KeyCode aKeyCode = pKEvt->GetKeyCode();
+ const vcl::KeyCode aKeyCode = pKEvt->GetKeyCode();
const sal_uInt16 nModifier = aKeyCode.GetModifier();
if( aKeyCode.GetCode() == KEY_SPACE && !nModifier)
bCallAddSelection = true;
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index bc00cf989977..e5c0eeb507a1 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -559,7 +559,7 @@ sal_IntPtr SwIndexTreeLB::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab)
void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt )
{
SvTreeListEntry* pEntry = FirstSelected();
- KeyCode aCode = rKEvt.GetKeyCode();
+ vcl::KeyCode aCode = rKEvt.GetKeyCode();
bool bChanged = false;
if(pEntry)
{
@@ -1506,7 +1506,7 @@ void SwTOXEdit::KeyInput( const KeyEvent& rKEvt )
!rSel.A()) || rSel.A() == nTextLen )
{
bool bCall = false;
- KeyCode aCode = rKEvt.GetKeyCode();
+ vcl::KeyCode aCode = rKEvt.GetKeyCode();
if(aCode.GetCode() == KEY_RIGHT && rSel.A() == nTextLen)
{
bNextControl = true;
@@ -1633,7 +1633,7 @@ public:
void SwTOXButton::KeyInput( const KeyEvent& rKEvt )
{
bool bCall = false;
- KeyCode aCode = rKEvt.GetKeyCode();
+ vcl::KeyCode aCode = rKEvt.GetKeyCode();
if(aCode.GetCode() == KEY_RIGHT)
{
bNextControl = true;
@@ -2146,7 +2146,7 @@ bool SwTOXEntryTabPage::Notify( NotifyEvent& rNEvt )
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
const KeyEvent& rKEvt = *rNEvt.GetKeyEvent();
- KeyCode aCode = rKEvt.GetKeyCode();
+ vcl::KeyCode aCode = rKEvt.GetKeyCode();
if ( (aCode.GetCode() == KEY_F4) && aCode.IsShift() && !aCode.IsMod1() && !aCode.IsMod2() )
{
if ( m_pTokenWIN->GetActiveControl() )
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 86507168f199..9add4dc7ae31 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -103,7 +103,7 @@ void SwInsertBookmarkDlg::Apply()
OUString sEntry(comphelper::string::remove(m_pBookmarkBox->GetText(),
m_pBookmarkBox->GetMultiSelectionSeparator()));
- rSh.SetBookmark( KeyCode(), sEntry, OUString() );
+ rSh.SetBookmark( vcl::KeyCode(), sEntry, OUString() );
rReq.AppendItem( SfxStringItem( FN_INSERT_BOOKMARK, sEntry ) );
rReq.Done();
}
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index a62598835cbb..0fcc14f81e31 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -387,7 +387,7 @@ bool SwGlossaryGroupDlg::IsDeleteAllowed(const OUString &rGroup)
void FEdit::KeyInput( const KeyEvent& rKEvent )
{
- KeyCode aCode = rKEvent.GetKeyCode();
+ vcl::KeyCode aCode = rKEvent.GetKeyCode();
if( KEYGROUP_CURSOR == aCode.GetGroup() ||
( KEYGROUP_MISC == aCode.GetGroup() &&
KEY_DELETE >= aCode.GetCode() ) ||