diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-02 15:26:18 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-02 15:26:18 +0000 |
commit | 35e8d6de60cf91e97fe722834c294a0a9223922f (patch) | |
tree | 92c59ec6f18a49adf74678259cf5a9aef446a539 /svx | |
parent | 0416c98d433be40fe2e2d0199ebaa8d029e8e338 (diff) |
CWS-TOOLING: integrate CWS vcl97
2008-12-11 20:47:52 +0100 pl r265361 : #i93173# revert change, event listeners on the toolbar can lead to crashes
2008-12-11 17:55:54 +0100 pl r265344 : #i92715# fix some border cases
2008-12-11 16:36:01 +0100 pl r265334 : remove forgotten debug printf
2008-12-11 15:54:25 +0100 pl r265323 : add missing pointer initializer
2008-12-11 14:08:44 +0100 as r265297 : #i86520# dont show start module twice
2008-12-11 12:56:34 +0100 as r265289 : #i86520# dont show start module twice
2008-12-11 12:22:18 +0100 pl r265280 : fix a snafu
2008-12-11 12:15:27 +0100 hdu r265279 : #i96549# change some dbg_assert to dbg_warn
2008-12-11 11:57:22 +0100 pl r265276 : #i86520# startcenter on dock item click for mac
2008-12-11 11:31:47 +0100 pl r265271 : #i96964# fix a wrong condition
2008-12-11 11:21:49 +0100 as r265268 : #i86520# new framework slot for ShowStartModule
2008-12-11 10:17:32 +0100 hdu r265251 : #i97127# use fontconfig fallbacks for psprinting too (thanks CMC!)
2008-12-09 10:18:41 +0100 hdu r265060 : #i96549# workaround MAC_OS_X_VERSION_* macros not defined in older SDKs
2008-12-09 09:39:47 +0100 hdu r265057 : #i89650# workaround bogus device resolutions
2008-12-09 09:14:23 +0100 hdu r265054 : #i96549# set MAC_OS_X_VERSION_MIN_REQUIRED=1040
2008-12-08 19:17:42 +0100 pl r265016 : CWS-TOOLING: rebase CWS vcl97 to trunk@264807 (milestone: DEV300:m37)
2008-12-08 16:06:58 +0100 hdu r265004 : #i96549# set MAC_OS_X_VERSION_MIN_REQUIRED=1040 only for the Aqua port
2008-12-08 12:16:26 +0100 hdu r264988 : #i96549# prepare for MAC_OS_X_VERSION_MIN_REQUIRED>=1050
2008-12-08 11:59:25 +0100 hdu r264982 : #i96549# set MAC_OS_X_VERSION_MIN_REQUIRED=1040
2008-12-04 18:19:43 +0100 pl r264866 : #i86520# install a handler to be called on dock icon clicked
2008-12-03 13:04:32 +0100 pl r264769 : #i96551# on quartz build neither gtk nor cups in psprint is needed
2008-11-26 15:07:07 +0100 hdu r264400 : #i96317# adjust to extented SAL_DISABLE_FC_SUBST semantic
2008-11-21 16:15:31 +0100 pl r264147 : #i94443# generalize focus behavior when a child window becomes invisible
2008-11-21 15:45:03 +0100 pl r264144 : #i96433# improve torn off toolbar behavior
2008-11-21 11:50:01 +0100 pl r264119 : #i90083# improve key event dispatching
2008-11-20 17:28:03 +0100 pl r264076 : #i92715# do not execute app events during document recovery
2008-11-20 15:04:32 +0100 pl r264057 : #i92224# #i93249# more aqua key codes
2008-11-20 14:03:00 +0100 pl r264052 : #i92224# #i93249# remove debug printf
2008-11-20 14:00:29 +0100 pl r264049 : #i92224# #i93249# more aqua key codes
2008-11-20 13:59:34 +0100 pl r264048 : #i92224# #i93249# more aqua key codes
2008-11-20 13:52:38 +0100 pl r264047 : #i92224# #i93249# more aqua key codes
2008-11-19 18:42:17 +0100 pl r264017 : #i93249# support some mac specifc key codes: select to line end/begin
2008-11-19 18:40:26 +0100 pl r264016 : #i93249# support some mac specifc key codes: select to line end/begin
2008-11-19 18:32:31 +0100 pl r264014 : #i92224# support some mac specifc key codes: select to line end/begin
2008-11-19 17:34:50 +0100 pl r264009 : #i92224# some more needed keycodes
2008-11-19 16:11:33 +0100 pl r264003 : #i93249# support some mac specifc key codes
2008-11-19 16:10:31 +0100 pl r264002 : #i93249# support some mac specifc key codes
2008-11-19 15:50:03 +0100 pl r264000 : #i93249# support some mac specifc key codes
2008-11-19 14:17:41 +0100 pl r263993 : #i90015# strip appended parenthese entries from menubar
2008-11-17 18:30:37 +0100 pl r263737 : #i94601# emulate menu functionality for non vcl dialogs
2008-11-17 17:31:12 +0100 pl r263731 : #i95263# set inactive tab color on mac more distinct from the active tab color
2008-11-17 17:13:38 +0100 pl r263729 : #i93173# delete toolbar window in a more stack aware manner
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/editeng/editeng.cxx | 20 | ||||
-rw-r--r-- | svx/source/editeng/impedit2.cxx | 52 |
2 files changed, 66 insertions, 6 deletions
diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx index 467fabdc8d6b..bd0ebbe015a3 100644 --- a/svx/source/editeng/editeng.cxx +++ b/svx/source/editeng/editeng.cxx @@ -930,16 +930,22 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie case KEY_END: case KEY_PAGEUP: case KEY_PAGEDOWN: + case com::sun::star::awt::Key::MOVE_WORD_FORWARD: + case com::sun::star::awt::Key::SELECT_WORD_FORWARD: + case com::sun::star::awt::Key::MOVE_WORD_BACKWARD: + case com::sun::star::awt::Key::SELECT_WORD_BACKWARD: 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::SELECT_TO_BEGIN_OF_LINE: + case com::sun::star::awt::Key::SELECT_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: + case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: + case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: + case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: + case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: + case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: + case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: { if ( !rKeyEvent.GetKeyCode().IsMod2() || ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) ) { @@ -969,6 +975,8 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie case KEY_DELETE: case com::sun::star::awt::Key::DELETE_WORD_BACKWARD: case com::sun::star::awt::Key::DELETE_WORD_FORWARD: + case com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH: + case com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH: { if ( !bReadOnly && !rKeyEvent.GetKeyCode().IsMod2() ) { diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx index 66d322c26e52..5b5ca97174f5 100644 --- a/svx/source/editeng/impedit2.cxx +++ b/svx/source/editeng/impedit2.cxx @@ -895,12 +895,38 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE break; case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH: aPaM = CursorStartOfParagraph( aPaM ); + if( aPaM == aOldPaM ) + { + aPaM = CursorLeft( aPaM, i18n::CharacterIteratorMode::SKIPCELL ); + aPaM = CursorStartOfParagraph( aPaM ); + } bKeyModifySelection = false; break; case com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH: aPaM = CursorEndOfParagraph( aPaM ); + if( aPaM == aOldPaM ) + { + aPaM = CursorRight( aPaM, i18n::CharacterIteratorMode::SKIPCELL ); + aPaM = CursorEndOfParagraph( aPaM ); + } + bKeyModifySelection = false; + break; + case com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT: + aPaM = CursorStartOfDoc(); + bKeyModifySelection = false; + break; + case com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT: + aPaM = CursorEndOfDoc(); bKeyModifySelection = false; break; + case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE: + aPaM = CursorStartOfLine( aPaM ); + bKeyModifySelection = true; + break; + case com::sun::star::awt::Key::SELECT_TO_END_OF_LINE: + aPaM = CursorEndOfLine( aPaM ); + bKeyModifySelection = true; + break; case com::sun::star::awt::Key::SELECT_BACKWARD: aPaM = CursorLeft( aPaM, i18n::CharacterIteratorMode::SKIPCELL ); bKeyModifySelection = true; @@ -917,6 +943,32 @@ EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pE aPaM = WordRight( aPaM ); bKeyModifySelection = true; break; + case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH: + aPaM = CursorStartOfParagraph( aPaM ); + if( aPaM == aOldPaM ) + { + aPaM = CursorLeft( aPaM, i18n::CharacterIteratorMode::SKIPCELL ); + aPaM = CursorStartOfParagraph( aPaM ); + } + bKeyModifySelection = true; + break; + case com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH: + aPaM = CursorEndOfParagraph( aPaM ); + if( aPaM == aOldPaM ) + { + aPaM = CursorRight( aPaM, i18n::CharacterIteratorMode::SKIPCELL ); + aPaM = CursorEndOfParagraph( aPaM ); + } + bKeyModifySelection = true; + break; + case com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT: + aPaM = CursorStartOfDoc(); + bKeyModifySelection = true; + break; + case com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT: + aPaM = CursorEndOfDoc(); + bKeyModifySelection = true; + break; } if ( aOldPaM != aPaM ) |