summaryrefslogtreecommitdiff
path: root/sfx2/source
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source')
-rw-r--r--sfx2/source/appl/newhelp.cxx10
-rw-r--r--sfx2/source/appl/newhelp.hxx2
-rw-r--r--sfx2/source/control/thumbnailview.cxx2
-rw-r--r--sfx2/source/control/thumbnailviewitem.cxx2
-rw-r--r--sfx2/source/dialog/backingwindow.cxx4
-rw-r--r--sfx2/source/dialog/templdlg.cxx4
-rw-r--r--sfx2/source/dialog/versdlg.cxx2
-rw-r--r--sfx2/source/sidebar/FocusManager.cxx2
-rw-r--r--sfx2/source/sidebar/FocusManager.hxx5
9 files changed, 16 insertions, 17 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index a10c8a82b3c6..188ef595d6ec 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1610,7 +1610,7 @@ bool SfxHelpIndexWindow_Impl::PreNotify(NotifyEvent& rNEvt)
sal_uInt16 nType = rNEvt.GetType();
if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() )
{
- const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
+ const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
sal_uInt16 nCode = rKeyCode.GetCode();
if ( KEY_TAB == nCode )
@@ -2125,7 +2125,7 @@ Reference< XTextRange > SfxHelpTextWindow_Impl::getCursor() const
-bool SfxHelpTextWindow_Impl::isHandledKey( const KeyCode& _rKeyCode )
+bool SfxHelpTextWindow_Impl::isHandledKey( const vcl::KeyCode& _rKeyCode )
{
bool bRet = false;
sal_uInt16 nCode = _rKeyCode.GetCode();
@@ -2429,8 +2429,8 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
}
else if ( EVENT_KEYINPUT == nType && rNEvt.GetKeyEvent() )
{
- const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
- const KeyCode& rKeyCode = pKEvt->GetKeyCode();
+ const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
+ const vcl::KeyCode& rKeyCode = pKEvt->GetKeyCode();
sal_uInt16 nKeyGroup = rKeyCode.GetGroup();
sal_uInt16 nKey = rKeyCode.GetCode();
if ( KEYGROUP_ALPHA == nKeyGroup && !isHandledKey( rKeyCode ) )
@@ -3022,7 +3022,7 @@ bool SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt )
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
// Backward == <ALT><LEFT> or <BACKSPACE> Forward == <ALT><RIGHT>
- const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
+ const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
sal_uInt16 nKey = rKeyCode.GetCode();
if ( ( rKeyCode.IsMod2() && ( KEY_LEFT == nKey || KEY_RIGHT == nKey ) ) ||
( !rKeyCode.GetModifier() && KEY_BACKSPACE == nKey && !pIndexWin->HasFocusOnEdit() ) )
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 53bb10c23fbf..01dfbb8922b1 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -438,7 +438,7 @@ private:
GetBreakIterator();
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >
getCursor() const;
- bool isHandledKey( const KeyCode& _rKeyCode );
+ bool isHandledKey( const vcl::KeyCode& _rKeyCode );
DECL_LINK(SelectHdl, void *);
DECL_LINK( NotifyHdl, SvtMiscOptions* );
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 0f93b77e1c2e..5c9a20b8dc32 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -537,7 +537,7 @@ void ThumbnailView::KeyInput( const KeyEvent& rKEvt )
bool bValidRange = false;
bool bHasSelRange = mpStartSelRange != mFilteredItemList.end();
size_t nNextPos = nLastPos;
- KeyCode aKeyCode = rKEvt.GetKeyCode();
+ vcl::KeyCode aKeyCode = rKEvt.GetKeyCode();
ThumbnailViewItem* pNext = NULL;
if (aKeyCode.IsShift() && bHasSelRange)
diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx
index c23521c47f84..b2e44621a527 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -78,7 +78,7 @@ bool ResizableMultiLineEdit::PreNotify(NotifyEvent& rNEvt)
if( rNEvt.GetType() == EVENT_KEYINPUT )
{
const KeyEvent& rKEvt = *rNEvt.GetKeyEvent();
- KeyCode aCode = rKEvt.GetKeyCode();
+ vcl::KeyCode aCode = rKEvt.GetKeyCode();
switch (aCode.GetCode())
{
case KEY_RETURN:
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 60ab3fde3f95..1e6c4c82d534 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -372,7 +372,7 @@ bool BackingWindow::PreNotify( NotifyEvent& rNEvt )
if( rNEvt.GetType() == EVENT_KEYINPUT )
{
const KeyEvent* pEvt = rNEvt.GetKeyEvent();
- const KeyCode& rKeyCode(pEvt->GetKeyCode());
+ const vcl::KeyCode& rKeyCode(pEvt->GetKeyCode());
// Subwindows of BackingWindow: Sidebar and Thumbnail view
if( rKeyCode.GetCode() == KEY_F6 )
{
@@ -413,7 +413,7 @@ bool BackingWindow::Notify( NotifyEvent& rNEvt )
mpAccExec->init( comphelper::getProcessComponentContext(), mxFrame);
}
const KeyEvent* pEvt = rNEvt.GetKeyEvent();
- const KeyCode& rKeyCode(pEvt->GetKeyCode());
+ const vcl::KeyCode& rKeyCode(pEvt->GetKeyCode());
const OUString aCommand = mpAccExec->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rKeyCode));
if((aCommand != "vnd.sun.star.findbar:FocusToFindbar") && pEvt && mpAccExec->execute(rKeyCode))
return true;
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 35565df6ca58..7b022d35f825 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -302,7 +302,7 @@ bool DropListBox_Impl::Notify( NotifyEvent& rNEvt )
bool nRet = false;
if( rNEvt.GetType() == EVENT_KEYINPUT )
{
- const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
+ const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
if(!rKeyCode.GetModifier())
{
if( pDialog->bCanDel && KEY_DELETE == rKeyCode.GetCode())
@@ -541,7 +541,7 @@ bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
bool nRet = false;
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
- const KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
+ const vcl::KeyCode& rKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
if ( !rKeyCode.GetModifier() && KEY_RETURN == rKeyCode.GetCode() )
{
aDoubleClickLink.Call( this );
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index d1128aa23f1e..503d0ddc6518 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -133,7 +133,7 @@ SfxVersionInfo::SfxVersionInfo()
void SfxVersionsTabListBox_Impl::KeyInput(const KeyEvent& rKeyEvent)
{
- const KeyCode& rCode = rKeyEvent.GetKeyCode();
+ const vcl::KeyCode& rCode = rKeyEvent.GetKeyCode();
switch (rCode.GetCode())
{
case KEY_RETURN :
diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index 0b12d607ee40..244fc9413412 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -434,7 +434,7 @@ bool FocusManager::MoveFocusInsideDeckTitle (
void FocusManager::HandleKeyEvent (
- const KeyCode& rKeyCode,
+ const vcl::KeyCode& rKeyCode,
const Window& rWindow)
{
const FocusLocation aLocation (GetFocusLocation(rWindow));
diff --git a/sfx2/source/sidebar/FocusManager.hxx b/sfx2/source/sidebar/FocusManager.hxx
index 23f2f5280043..d0d9c2c2a5b2 100644
--- a/sfx2/source/sidebar/FocusManager.hxx
+++ b/sfx2/source/sidebar/FocusManager.hxx
@@ -21,12 +21,11 @@
#include "Panel.hxx"
#include <tools/link.hxx>
+#include <vcl/keycod.hxx>
class Button;
-class KeyCode;
class VclSimpleEvent;
-
namespace sfx2 { namespace sidebar {
class DeckTitleBar;
@@ -141,7 +140,7 @@ private:
const sal_Int32 nDirection);
void HandleKeyEvent (
- const KeyCode& rKeyCode,
+ const vcl::KeyCode& rKeyCode,
const Window& rWindow);
FocusLocation GetFocusLocation (const Window& rWindow) const;
generated by cgit (git 2.34.1) at 2024-07-30 09:02:24 +0000