summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx2
-rw-r--r--sd/source/ui/annotations/annotationwindow.cxx2
-rw-r--r--sd/source/ui/dlg/RemoteDialogClientBox.cxx4
-rw-r--r--sd/source/ui/func/fudraw.cxx6
-rw-r--r--sd/source/ui/func/futext.cxx4
-rw-r--r--sd/source/ui/sidebar/SidebarFocusManager.hxx6
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx2
-rw-r--r--sd/source/ui/view/drviewse.cxx6
-rw-r--r--sd/source/ui/view/outlnvsh.cxx4
-rw-r--r--sd/source/ui/view/viewshel.cxx2
10 files changed, 19 insertions, 19 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 99446e92d7b9..c3bc421df3b7 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -373,7 +373,7 @@ bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt )
sal_uInt16 nSwitch=rNEvt.GetType();
if (nSwitch==EVENT_KEYINPUT)
{
- const KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode();
+ const vcl::KeyCode& aKeyCode=rNEvt.GetKeyEvent()->GetKeyCode();
sal_uInt16 nKey=aKeyCode.GetCode();
if (nKey==KEY_DOWN && aKeyCode.IsMod2())
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 9c6e530e0bc6..c9f0e31b2663 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -145,7 +145,7 @@ void AnnotationTextWindow::Paint( const Rectangle& rRect)
void AnnotationTextWindow::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/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index ab454a1809c9..4cbe097eca8b 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -598,8 +598,8 @@ bool ClientBox::Notify( NotifyEvent& rNEvt )
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
- KeyCode aKeyCode = pKEvt->GetKeyCode();
- sal_uInt16 nKeyCode = aKeyCode.GetCode();
+ vcl::KeyCode aKeyCode = pKEvt->GetKeyCode();
+ sal_uInt16 nKeyCode = aKeyCode.GetCode();
if ( nKeyCode == KEY_TAB )
bHandled = HandleTabKey( aKeyCode.IsShift() );
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index f12799583fc4..39228ef29f6e 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -409,7 +409,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
case KEY_TAB:
{
- KeyCode aCode = rKEvt.GetKeyCode();
+ vcl::KeyCode aCode = rKEvt.GetKeyCode();
if ( !aCode.IsMod1() && !aCode.IsMod2() )
{
@@ -445,7 +445,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
case KEY_END:
{
- KeyCode aCode = rKEvt.GetKeyCode();
+ vcl::KeyCode aCode = rKEvt.GetKeyCode();
if ( aCode.IsMod1() )
{
@@ -463,7 +463,7 @@ bool FuDraw::KeyInput(const KeyEvent& rKEvt)
case KEY_HOME:
{
- KeyCode aCode = rKEvt.GetKeyCode();
+ vcl::KeyCode aCode = rKEvt.GetKeyCode();
if ( aCode.IsMod1() )
{
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index cafa2da771b7..2b4ca731a409 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -895,7 +895,7 @@ bool FuText::KeyInput(const KeyEvent& rKEvt)
bool bReturn = false;
mpView->SetMarkHdlWhenTextEdit(true);
- KeyCode nCode = rKEvt.GetKeyCode();
+ vcl::KeyCode nCode = rKEvt.GetKeyCode();
bool bShift = nCode.IsShift();
if(mxTextObj.is())
@@ -923,7 +923,7 @@ bool FuText::KeyInput(const KeyEvent& rKEvt)
}
sal_uInt16 nKey = nCode.GetCode();
- KeyCode aKeyCode (nKey, bShift, nCode.IsMod1(), nCode.IsMod2(), nCode.IsMod3() );
+ vcl::KeyCode aKeyCode (nKey, bShift, nCode.IsMod1(), nCode.IsMod2(), nCode.IsMod3() );
KeyEvent aKEvt(rKEvt.GetCharCode(), aKeyCode);
bool bOK = true;
diff --git a/sd/source/ui/sidebar/SidebarFocusManager.hxx b/sd/source/ui/sidebar/SidebarFocusManager.hxx
index 7fed4902be13..2904dd56767c 100644
--- a/sd/source/ui/sidebar/SidebarFocusManager.hxx
+++ b/sd/source/ui/sidebar/SidebarFocusManager.hxx
@@ -21,10 +21,10 @@
#define INCLUDED_SD_SOURCE_UI_SIDEBAR_SIDEBARFOCUSMANAGER_HXX
#include <tools/link.hxx>
+#include <vcl/keycod.hxx>
#include <memory>
-class KeyCode;
class VclSimpleEvent;
class Window;
@@ -56,7 +56,7 @@ public:
void RegisterLink (
::Window* pSource,
::Window* pTarget,
- const KeyCode& rKey);
+ const vcl::KeyCode& rKey);
/** Register a link that will move the focus from the source window to
the target window when the source window is focused and KEY_ESCAPE
@@ -92,7 +92,7 @@ public:
When there is no rule for this combination of source window and key
code then the focus stays where it is.
*/
- bool TransferFocus (::Window* pSource, const KeyCode& rCode);
+ bool TransferFocus (::Window* pSource, const vcl::KeyCode& rCode);
private:
friend struct FocusManagerCreator;
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 85c67010f317..0da6c42d5874 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -390,7 +390,7 @@ bool SelectionFunction::KeyInput (const KeyEvent& rEvent)
FocusManager& rFocusManager (mrController.GetFocusManager());
bool bResult = false;
- const KeyCode& rCode (rEvent.GetKeyCode());
+ const vcl::KeyCode& rCode (rEvent.GetKeyCode());
switch (rCode.GetCode())
{
case KEY_RETURN:
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index f9340b08ea56..77ebf9616f89 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -125,7 +125,7 @@ void ImpAddPrintableCharactersToTextEdit(SfxRequest& rReq, ::sd::View* pView)
for(sal_Int32 a(0); a < aInputString.getLength(); a++)
{
sal_Char aChar = (sal_Char)aInputString[a];
- KeyCode aKeyCode;
+ vcl::KeyCode aKeyCode;
KeyEvent aKeyEvent(aChar, aKeyCode);
// add actual character
@@ -866,7 +866,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
if (pOLV)
{
- KeyCode aKCode(KEY_DELETE);
+ vcl::KeyCode aKCode(KEY_DELETE);
KeyEvent aKEvt( 0, aKCode);
pOLV->PostKeyEvent(aKEvt);
}
@@ -878,7 +878,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
}
else
{
- KeyCode aKCode(KEY_DELETE);
+ vcl::KeyCode aKCode(KEY_DELETE);
KeyEvent aKEvt( 0, aKCode);
bool bConsumed = mpDrawView && mpDrawView->getSmartTags().KeyInput( aKEvt );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index e3b4aa7a7522..8e8b35ee978a 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -541,7 +541,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq)
{
OutlineViewPageChangesGuard aGuard2(pOlView);
- KeyCode aKCode(KEY_DELETE);
+ vcl::KeyCode aKCode(KEY_DELETE);
KeyEvent aKEvt( 0, aKCode );
pOutlView->PostKeyEvent(aKEvt);
@@ -1445,7 +1445,7 @@ bool OutlineViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin)
Invalidate(SID_STYLE_FAMILY5);
// check and distinguish cursor movements- or input-keys
- KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() );
+ vcl::KeyCode aKeyGroup( rKEvt.GetKeyCode().GetGroup() );
if( (aKeyGroup != KEYGROUP_CURSOR && aKeyGroup != KEYGROUP_FKEYS) ||
(GetActualPage() != pLastPage) )
{
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 440eaf748b77..23de40151bbf 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -450,7 +450,7 @@ bool ViewShell::KeyInput(const KeyEvent& rKEvt, ::sd::Window* pWin)
if(!bReturn && GetActiveWindow())
{
- KeyCode aKeyCode = rKEvt.GetKeyCode();
+ vcl::KeyCode aKeyCode = rKEvt.GetKeyCode();
if (aKeyCode.IsMod1() && aKeyCode.IsShift()
&& aKeyCode.GetCode() == KEY_R)