diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-17 14:26:09 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-17 14:26:09 +0100 |
| commit | f5c9ac62777729d3ec756bda5f49d51168687978 (patch) | |
| tree | 3f17c927af1bc0574a197d7a551227e3fbd0eedc | |
| parent | dd5b3aad28f19f2e2402b1cfebd6ea2ea6afaea6 (diff) | |
add warning to vcl-permit-global-shortcuts.diff
| -rw-r--r-- | patches/dev300/apply | 3 | ||||
| -rw-r--r-- | patches/dev300/vcl-permit-global-shortcuts.diff | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply index 697760c97..ee2f3d55c 100644 --- a/patches/dev300/apply +++ b/patches/dev300/apply @@ -215,7 +215,8 @@ sfx2-privateprotectedpublic.diff #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 -vcl-permit-global-shortcuts.diff, i#105676, thorsten +# 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 index a34e55f34..f9708732c 100644 --- a/patches/dev300/vcl-permit-global-shortcuts.diff +++ b/patches/dev300/vcl-permit-global-shortcuts.diff @@ -1,3 +1,4 @@ +# 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(-) |