Skip to content

C
core
Kaydet (Commit) 42b82121 authored tarafından Oliver Bolte's avatar Oliver Bolte
Dosyalara gözat
Seçenekler

INTEGRATION: CWS aquavcl07 (1.111.28); FILE MERGED 

2008/04/28 13:08:39 pl 1.111.28.1: #i87830# add new keys
üst 71ff1ab0
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 4 deletions
svx/source/editeng/editeng.cxx
Dosyayı görüntüle @ 42b82121
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: editeng.cxx,v $ * $RCSfile: editeng.cxx,v $
* $Revision: 1.111 $ * $Revision: 1.112 $
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
...@@ -929,6 +929,16 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie ...@@ -929,6 +929,16 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
case KEY_END: case KEY_END:
case KEY_PAGEUP: case KEY_PAGEUP:
case KEY_PAGEDOWN: case KEY_PAGEDOWN:
case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE:
case com::sun::star::awt::Key::MOVE_TO_END_OF_LINE:
case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
case com::sun::star::awt::Key::MOVE_WORD_BACKWARD:
case com::sun::star::awt::Key::MOVE_WORD_FORWARD:
case com::sun::star::awt::Key::SELECT_BACKWARD:
case com::sun::star::awt::Key::SELECT_FORWARD:
case com::sun::star::awt::Key::SELECT_WORD_BACKWARD:
case com::sun::star::awt::Key::SELECT_WORD_FORWARD:
{ {
if ( !rKeyEvent.GetKeyCode().IsMod2() || ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) ) if ( !rKeyEvent.GetKeyCode().IsMod2() || ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) )
{ {
...@@ -956,13 +966,37 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie ...@@ -956,13 +966,37 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
break; break;
case KEY_BACKSPACE: case KEY_BACKSPACE:
case KEY_DELETE: case KEY_DELETE:
case com::sun::star::awt::Key::DELETE_WORD_BACKWARD:
case com::sun::star::awt::Key::DELETE_WORD_FORWARD:
{ {
if ( !bReadOnly && !rKeyEvent.GetKeyCode().IsMod2() ) if ( !bReadOnly && !rKeyEvent.GetKeyCode().IsMod2() )
{ {
BYTE nDel = ( nCode == KEY_DELETE ) ? DEL_RIGHT : DEL_LEFT; BYTE nDel = 0, nMode = 0;
BYTE nMode = rKeyEvent.GetKeyCode().IsMod1() ? DELMODE_RESTOFWORD : DELMODE_SIMPLE; switch( nCode )
if ( ( nMode == DELMODE_RESTOFWORD ) && rKeyEvent.GetKeyCode().IsShift() ) {
case com::sun::star::awt::Key::DELETE_WORD_BACKWARD:
nMode = DELMODE_RESTOFWORD;
nDel = DEL_LEFT;
break;
case com::sun::star::awt::Key::DELETE_WORD_FORWARD:
nMode = DELMODE_RESTOFWORD;
nDel = DEL_RIGHT;
break;
case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH:
nMode = DELMODE_RESTOFCONTENT;
nDel = DEL_LEFT;
break;
case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH:
nMode = DELMODE_RESTOFCONTENT; nMode = DELMODE_RESTOFCONTENT;
nDel = DEL_RIGHT;
break;
default:
nDel = ( nCode == KEY_DELETE ) ? DEL_RIGHT : DEL_LEFT;
nMode = rKeyEvent.GetKeyCode().IsMod1() ? DELMODE_RESTOFWORD : DELMODE_SIMPLE;
if ( ( nMode == DELMODE_RESTOFWORD ) && rKeyEvent.GetKeyCode().IsShift() )
nMode = DELMODE_RESTOFCONTENT;
break;
}
pEditView->pImpEditView->DrawSelection(); pEditView->pImpEditView->DrawSelection();
pImpEditEngine->UndoActionStart( EDITUNDO_DELETE ); pImpEditEngine->UndoActionStart( EDITUNDO_DELETE );
aCurSel = pImpEditEngine->DeleteLeftOrRight( aCurSel, nDel, nMode ); aCurSel = pImpEditEngine->DeleteLeftOrRight( aCurSel, nDel, nMode );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment