diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-11-22 11:00:27 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-11-22 11:00:27 +0100 |
| commit | 13bea481cd7039aac80557def6a66a1b8357b520 (patch) | |
| tree | 8a3596c2e919dd1f7bafac001828f3ac6233a28b | |
| parent | 6715e1c1572d6b8902d841389ba9fbf162174f66 (diff) | |
Killed vcl-permit-global-shortcuts, got fixed in master meanwhile.
| -rw-r--r-- | patches/dev300/apply | 4 | ||||
| -rw-r--r-- | patches/dev300/vcl-permit-global-shortcuts.diff | 23 |
2 files changed, 0 insertions, 27 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index 37041fec5..457934527 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -208,10 +208,6 @@ sfx2-privateprotectedpublic.diff # UI + core to make OLE editing optionally outplace # needs major review/rewrite, caused at least lp#709778, fdo#36443, bnc#689375 and Debian #617319 #optional-outplace-ole.diff, i#98970, thorsten -# let ctrl-<keycode> stuff pass dlg keyboard handling, to permit -# global application-wide shortcuts also in open dialogs -# disabled for now because of sideeffects (see comments in i#105676), would need investigation before upstreaming -#vcl-permit-global-shortcuts.diff, i#105676, thorsten # unresolved Base64 Java classes base64.diff, i#100620, hmth diff --git a/patches/dev300/vcl-permit-global-shortcuts.diff b/patches/dev300/vcl-permit-global-shortcuts.diff deleted file mode 100644 index f9708732c..000000000 --- a/patches/dev300/vcl-permit-global-shortcuts.diff +++ /dev/null @@ -1,23 +0,0 @@ -# disabled for now because of sideeffects (see comments in i#105676), would need investigation before upstreaming ---- - vcl/source/window/dlgctrl.cxx | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git vcl/source/window/dlgctrl.cxx vcl/source/window/dlgctrl.cxx -index 306a5ea..ce7808a 100644 ---- vcl/source/window/dlgctrl.cxx -+++ vcl/source/window/dlgctrl.cxx -@@ -845,7 +845,9 @@ BOOL Window::ImplDlgCtrl( const KeyEvent& rKEvt, BOOL bKeyInput ) - pWindow = pWindow->GetWindow( WINDOW_NEXT ); - } - } -- else -+ else if ( !aKeyCode.IsMod1() ) // no ctrl pressed - those are -+ // application-wide shortcuts -+ // we want to let pass - { - xub_Unicode c = rKEvt.GetCharCode(); - if ( c ) --- -1.7.0.1 - |