fdo#82577: Handle KeyCode

Put the VCL KeyCode class in the vcl namespace. Avoids clash with the X11
KeyCode typedef.

Change-Id: I624c9d937f7c5f5986d313b6c5f060bd8bb7e028

31 files changed, 52 insertions, 51 deletions

diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index c565a91c18ba..ba6e24779080 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -25,7 +25,6 @@
 #include <boost/shared_ptr.hpp>
 
 class SwPaM;
-class KeyCode;
 struct SwPosition;
 class SwTxtNode;
 
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 13c1e00ffff2..47bab9c37442 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -75,9 +75,9 @@ namespace sw { namespace mark
     {
         public:
             virtual const OUString& GetShortName() const =0;
-            virtual const KeyCode& GetKeyCode() const =0;
+            virtual const vcl::KeyCode& GetKeyCode() const =0;
             virtual void SetShortName(const OUString&) =0;
-            virtual void SetKeyCode(const KeyCode&) =0;
+            virtual void SetKeyCode(const vcl::KeyCode&) =0;
     };
 
     class SW_DLLPUBLIC IFieldmark
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index a7f9b1f0a9e7..93083005e06f 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -24,6 +24,7 @@
 #include <rtl/ustring.hxx>
 #include <tools/link.hxx>
 #include <tools/rtti.hxx>
+#include <vcl/keycod.hxx>
 
 #include <IShellCursorSupplier.hxx>
 #include "swdllapi.h"
@@ -38,7 +39,6 @@
 #include <node.hxx>
 #include <IDocumentMarkAccess.hxx>
 
-class KeyCode;
 class SfxItemSet;
 class SfxPoolItem;
 class SwCntntFrm;
@@ -559,7 +559,7 @@ public:
 
     // at CurCrsr.SPoint
     ::sw::mark::IMark* SetBookmark(
-        const KeyCode&,
+        const vcl::KeyCode&,
         const OUString& rName,
         const OUString& rShortName,
         IDocumentMarkAccess::MarkType eMark = IDocumentMarkAccess::BOOKMARK);
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 2ff506bbaa52..a1d6236cc9b5 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -62,7 +62,6 @@ class DateTime;
 class EditFieldInfo;
 class JobSetup;
 class Color;
-class KeyCode;
 class Outliner;
 class OutputDevice;
 class Point;
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 8284ec0ca01e..588283e0c416 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -248,7 +248,7 @@ namespace sw { namespace mark
     }
 
     Bookmark::Bookmark(const SwPaM& aPaM,
-        const KeyCode& rCode,
+        const vcl::KeyCode& rCode,
         const OUString& rName,
         const OUString& rShortName)
         : DdeBookmark(aPaM)
diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx
index 219d8607b0d1..30031ae971c6 100644
--- a/sw/source/core/crsr/crbm.cxx
+++ b/sw/source/core/crsr/crbm.cxx
@@ -80,7 +80,7 @@ namespace
 
 // at CurCrsr.SPoint
 ::sw::mark::IMark* SwCrsrShell::SetBookmark(
-    const KeyCode& rCode,
+    const vcl::KeyCode& rCode,
     const OUString& rName,
     const OUString& rShortName,
     IDocumentMarkAccess::MarkType eMark)
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 89c5471e6a1d..269af4e5f2cb 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -33,7 +33,7 @@ namespace
 namespace sw { namespace mark
 {
     CrossRefBookmark::CrossRefBookmark(const SwPaM& rPaM,
-        const KeyCode& rCode,
+        const vcl::KeyCode& rCode,
         const OUString& rName,
         const OUString& rShortName,
         const OUString& rPrefix)
@@ -67,7 +67,7 @@ namespace sw { namespace mark
     }
 
     CrossRefHeadingBookmark::CrossRefHeadingBookmark(const SwPaM& rPaM,
-        const KeyCode& rCode,
+        const vcl::KeyCode& rCode,
         const OUString& rName,
         const OUString& rShortName)
         : CrossRefBookmark(rPaM, rCode, rName, rShortName, IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix())
@@ -79,7 +79,7 @@ namespace sw { namespace mark
     }
 
     CrossRefNumItemBookmark::CrossRefNumItemBookmark(const SwPaM& rPaM,
-        const KeyCode& rCode,
+        const vcl::KeyCode& rCode,
         const OUString& rName,
         const OUString& rShortName)
         : CrossRefBookmark(rPaM, rCode, rName, rShortName, IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix())
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 68499060670c..4a04d1dc6a79 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -396,16 +396,16 @@ namespace sw { namespace mark
                 pMark = boost::shared_ptr<IMark>(new NavigatorReminder(rPaM));
                 break;
             case IDocumentMarkAccess::BOOKMARK:
-                pMark = boost::shared_ptr<IMark>(new Bookmark(rPaM, KeyCode(), rName, OUString()));
+                pMark = boost::shared_ptr<IMark>(new Bookmark(rPaM, vcl::KeyCode(), rName, OUString()));
                 break;
             case IDocumentMarkAccess::DDE_BOOKMARK:
                 pMark = boost::shared_ptr<IMark>(new DdeBookmark(rPaM));
                 break;
             case IDocumentMarkAccess::CROSSREF_HEADING_BOOKMARK:
-                pMark = boost::shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, KeyCode(), rName, OUString()));
+                pMark = boost::shared_ptr<IMark>(new CrossRefHeadingBookmark(rPaM, vcl::KeyCode(), rName, OUString()));
                 break;
             case IDocumentMarkAccess::CROSSREF_NUMITEM_BOOKMARK:
-                pMark = boost::shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, KeyCode(), rName, OUString()));
+                pMark = boost::shared_ptr<IMark>(new CrossRefNumItemBookmark(rPaM, vcl::KeyCode(), rName, OUString()));
                 break;
             case IDocumentMarkAccess::UNO_BOOKMARK:
                 pMark = boost::shared_ptr<IMark>(new UnoMark(rPaM));
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 5b5e6e62f610..b5eef562e59a 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -22,6 +22,7 @@
 
 #include <cppuhelper/weakref.hxx>
 #include <sfx2/Metadatable.hxx>
+#include <vcl/keycod.hxx>
 #include <boost/scoped_ptr.hpp>
 #include <boost/noncopyable.hpp>
 #include <map>
@@ -165,18 +166,18 @@ namespace sw {
         {
         public:
             Bookmark(const SwPaM& rPaM,
-                const KeyCode& rCode,
+                const vcl::KeyCode& rCode,
                 const OUString& rName,
                 const OUString& rShortName);
             virtual void InitDoc(SwDoc* const io_Doc) SAL_OVERRIDE;
 
             virtual const OUString& GetShortName() const SAL_OVERRIDE
                 { return m_sShortName; }
-            virtual const KeyCode& GetKeyCode() const SAL_OVERRIDE
+            virtual const vcl::KeyCode& GetKeyCode() const SAL_OVERRIDE
                 { return m_aCode; }
             virtual void SetShortName(const OUString& rShortName) SAL_OVERRIDE
                 { m_sShortName = rShortName; }
-            virtual void SetKeyCode(const KeyCode& rCode) SAL_OVERRIDE
+            virtual void SetKeyCode(const vcl::KeyCode& rCode) SAL_OVERRIDE
                 { m_aCode = rCode; }
 
             // ::sfx2::Metadatable
@@ -188,7 +189,7 @@ namespace sw {
                 ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE;
 
         private:
-            KeyCode m_aCode;
+            vcl::KeyCode m_aCode;
             OUString m_sShortName;
         };
 
diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx
index b43775de0f78..1b8c2b10db82 100644
--- a/sw/source/core/inc/crossrefbookmark.hxx
+++ b/sw/source/core/inc/crossrefbookmark.hxx
@@ -23,6 +23,7 @@
 #include <IMark.hxx>
 #include <bookmrk.hxx>
 #include <rtl/ustring.hxx>
+#include <vcl/keycod.hxx>
 
 namespace sw {
     namespace mark {
@@ -31,7 +32,7 @@ namespace sw {
         {
         public:
             CrossRefBookmark(const SwPaM& rPaM,
-                const KeyCode& rCode,
+                const vcl::KeyCode& rCode,
                 const OUString& rName,
                 const OUString& rShortName,
                 const OUString& rPrefix);
@@ -65,7 +66,7 @@ namespace sw {
         {
         public:
             CrossRefHeadingBookmark(const SwPaM& rPaM,
-                const KeyCode& rCode,
+                const vcl::KeyCode& rCode,
                 const OUString& rName,
                 const OUString& rShortName);
             static bool IsLegalName(const OUString& rName);
@@ -76,7 +77,7 @@ namespace sw {
         {
         public:
             CrossRefNumItemBookmark(const SwPaM& rPaM,
-                const KeyCode& rCode,
+                const vcl::KeyCode& rCode,
                 const OUString& rName,
                 const OUString& rShortName);
             static bool IsLegalName(const OUString& rName);
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 3b24951e8f57..f40fc34f9bc0 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -60,7 +60,7 @@ namespace sw { namespace mark
         private:
             OUString m_aName;
             OUString m_aShortName;
-            KeyCode m_aCode;
+            vcl::KeyCode m_aCode;
             bool m_bSavePos;
             bool m_bSaveOtherPos;
             IDocumentMarkAccess::MarkType m_eOrigBkmType;
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 2e585cb3fb0e..74ccea142575 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -19,8 +19,9 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_ROLBCK_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_ROLBCK_HXX
 
-#include <tools/solar.h>
 #include <svl/itemset.hxx>
+#include <tools/solar.h>
+#include <vcl/keycod.hxx>
 
 #include <vector>
 #include <set>
@@ -260,7 +261,7 @@ class SwHistoryBookmark : public SwHistoryHint
     private:
         const OUString m_aName;
         OUString m_aShortName;
-        KeyCode m_aKeycode;
+        vcl::KeyCode m_aKeycode;
         const sal_uLong m_nNode;
         const sal_uLong m_nOtherNode;
         const sal_Int32 m_nCntnt;
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index 60462cbdea29..a39d363ba3ad 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -140,7 +140,7 @@ class SW_DLLPUBLIC SwFltControlStack : private ::boost::noncopyable
     friend class SwFltShell;
 
     sal_uLong nFieldFlags;
-    KeyCode aEmptyKeyCode; // fuer Bookmarks
+    vcl::KeyCode aEmptyKeyCode; // fuer Bookmarks
 
 private:
     bool bHasSdOD;
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() ) ||
diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx
index c20a5b23a38e..05cda9e485be 100644
--- a/sw/source/uibase/cctrl/actctrl.cxx
+++ b/sw/source/uibase/cctrl/actctrl.cxx
@@ -33,7 +33,7 @@ bool NumEditAction::Notify( NotifyEvent& rNEvt )
     if ( rNEvt.GetType() == EVENT_KEYINPUT )
     {
         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_RETURN &&
                 !nModifier)
@@ -50,7 +50,7 @@ bool NumEditAction::Notify( NotifyEvent& rNEvt )
 
 void ReturnActionEdit::KeyInput( const KeyEvent& rEvt)
 {
-    const KeyCode aKeyCode = rEvt.GetKeyCode();
+    const vcl::KeyCode aKeyCode = rEvt.GetKeyCode();
     const sal_uInt16 nModifier = aKeyCode.GetModifier();
     if( aKeyCode.GetCode() == KEY_RETURN &&
             !nModifier)
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 99b7b4163d00..0d537acbde8c 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -3628,7 +3628,7 @@ SwTrnsfrDdeLink::SwTrnsfrDdeLink( SwTransferable& rTrans, SwWrtShell& rSh )
         bool bIsModified = rSh.IsModified();
 
         ::sw::mark::IMark* pMark = rSh.SetBookmark(
-            KeyCode(),
+            vcl::KeyCode(),
             OUString(),
             OUString(),
             IDocumentMarkAccess::DDE_BOOKMARK);
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
index 051d7eebcd7c..a7ba9954ba3d 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx
@@ -187,7 +187,7 @@ void AnnotationMenuButton::Paint( const Rectangle& /*rRect*/ )
 
 void AnnotationMenuButton::KeyInput( const KeyEvent& rKeyEvt )
 {
-    const KeyCode& rKeyCode = rKeyEvt.GetKeyCode();
+    const vcl::KeyCode& rKeyCode = rKeyEvt.GetKeyCode();
     const sal_uInt16 nKey = rKeyCode.GetCode();
     if ( nKey == KEY_TAB )
     {
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index 1915d3306024..f6cba0bb8298 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -187,7 +187,7 @@ void SidebarTxtControl::Paint( const Rectangle& rRect)
 
 void SidebarTxtControl::KeyInput( const KeyEvent& rKeyEvt )
 {
-    const KeyCode& rKeyCode = rKeyEvt.GetKeyCode();
+    const vcl::KeyCode& rKeyCode = rKeyEvt.GetKeyCode();
     sal_uInt16 nKey = rKeyCode.GetCode();
     if ( ( rKeyCode.IsMod1() && rKeyCode.IsMod2() ) &&
          ( (nKey == KEY_PAGEUP) || (nKey == KEY_PAGEDOWN) ) )
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index b20f5082a4fe..5030a4a2c272 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -1440,12 +1440,12 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
             }
 
             aKeyEvent = KeyEvent( rKEvt.GetCharCode(),
-                                  KeyCode( nKey, rKEvt.GetKeyCode().GetModifier() ),
+                                  vcl::KeyCode( nKey, rKEvt.GetKeyCode().GetModifier() ),
                                   rKEvt.GetRepeat() );
         }
     }
 
-    const KeyCode& rKeyCode = aKeyEvent.GetKeyCode();
+    const vcl::KeyCode& rKeyCode = aKeyEvent.GetKeyCode();
     sal_Unicode aCh = aKeyEvent.GetCharCode();
 
     // enable switching to notes ankor with Ctrl - Alt - Page Up/Down
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index bbcaaf1a6399..0acaf594cac0 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -225,8 +225,8 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
             }
             case SwContentAtPos::SW_SMARTTAG:
             {
-                KeyCode aCode( KEY_SPACE );
-                KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 );
+                vcl::KeyCode aCode( KEY_SPACE );
+                vcl::KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 );
                 OUString aModStr( aModifiedCode.GetName() );
                 aModStr = aModStr.replaceFirst(aCode.GetName(), OUString());
                 aModStr = aModStr.replaceAll("+", OUString());
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index c3caec60a7fe..f3e4035fd629 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -504,7 +504,7 @@ void SwInputWindow::DelBoxCntnt()
 
 void InputEdit::KeyInput(const KeyEvent& rEvent)
 {
-    const KeyCode aCode = rEvent.GetKeyCode();
+    const vcl::KeyCode aCode = rEvent.GetKeyCode();
     if(aCode == KEY_RETURN || aCode == KEY_F2 )
         ((SwInputWindow*)GetParent())->ApplyFormula();
     else if(aCode == KEY_ESCAPE )
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index c8995964b19a..6a9a0b05b3ae 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -591,7 +591,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             if ( pItem )
             {
                 OUString sName = ((SfxStringItem*)pItem)->GetValue();
-                rWrtSh.SetBookmark( KeyCode(), sName, OUString() );
+                rWrtSh.SetBookmark( vcl::KeyCode(), sName, OUString() );
             }
             else
             {
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 074868c00c80..5ab8185eebf5 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -417,7 +417,7 @@ OUString SwPagePreviewWin::GetStatusStr( sal_uInt16 nPageCnt ) const
 
 void  SwPagePreviewWin::KeyInput( const KeyEvent &rKEvt )
 {
-    const KeyCode& rKeyCode = rKEvt.GetKeyCode();
+    const vcl::KeyCode& rKeyCode = rKEvt.GetKeyCode();
     bool bHandled = false;
     if(!rKeyCode.GetModifier())
     {
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index eb2889cc7a8c..87bf12066949 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2592,7 +2592,7 @@ void  SwContentTree::GetFocus()
 
 void  SwContentTree::KeyInput(const KeyEvent& rEvent)
 {
-    const KeyCode aCode = rEvent.GetKeyCode();
+    const vcl::KeyCode aCode = rEvent.GetKeyCode();
     if(aCode.GetCode() == KEY_RETURN)
     {
         SvTreeListEntry* pEntry = FirstSelected();
@@ -2729,7 +2729,7 @@ void  SwContentTree::KeyInput(const KeyEvent& rEvent)
                             {
                                 SwEditWin& pEditWindow =
                                     pActiveShell->GetView().GetEditWin();
-                                KeyCode tempKeycode( KEY_ESCAPE );
+                                vcl::KeyCode tempKeycode( KEY_ESCAPE );
                                 KeyEvent rKEvt( 0 , tempKeycode );
                                 ((Window*)&pEditWindow)->KeyInput( rKEvt );
                                 //rView.GetEditWin().GrabFocus();
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 276a930d96bd..b693296bbc96 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -599,7 +599,7 @@ void     SwGlobalTree::GetFocus()
 
 void     SwGlobalTree::KeyInput(const KeyEvent& rKEvt)
 {
-    const KeyCode aCode = rKEvt.GetKeyCode();
+    const vcl::KeyCode aCode = rKEvt.GetKeyCode();
     if(aCode.GetCode() == KEY_RETURN)
     {
         switch(aCode.GetModifier())
diff --git a/sw/source/uibase/utlui/initui.cxx b/sw/source/uibase/utlui/initui.cxx
index 44dc6762b69a..1d6095f41536 100644
--- a/sw/source/uibase/utlui/initui.cxx
+++ b/sw/source/uibase/utlui/initui.cxx
@@ -218,8 +218,8 @@ ShellResource::ShellResource()
 {
     const sal_uInt16 nCount = FLD_DOCINFO_END - FLD_DOCINFO_BEGIN;
 
-    KeyCode aCode( KEY_SPACE );
-    KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 );
+    vcl::KeyCode aCode( KEY_SPACE );
+    vcl::KeyCode aModifiedCode( KEY_SPACE, KEY_MOD1 );
     OUString aModStr( aModifiedCode.GetName() );
     aModStr = aModStr.replaceFirst(aCode.GetName(), OUString());
     aModStr = aModStr.replaceAll("+", OUString());
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 9f01965d40dc..2c35600cc2bd 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -522,7 +522,7 @@ void SwNavigationPI::MakeMark()
     if(vNavMarkNames.size() == MAX_MARKS)
         pMarkAccess->deleteMark(pMarkAccess->findMark(vNavMarkNames[nAutoMarkIdx]));
 
-    rSh.SetBookmark(KeyCode(), OUString(), OUString(), IDocumentMarkAccess::NAVIGATOR_REMINDER);
+    rSh.SetBookmark(vcl::KeyCode(), OUString(), OUString(), IDocumentMarkAccess::NAVIGATOR_REMINDER);
     SwView::SetActMark( nAutoMarkIdx );
 
     if(++nAutoMarkIdx == MAX_MARKS)