patches/dev300/apply | 3 ++-
patches/dev300/vcl-permit-global-shortcuts.diff | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit f5c9ac62777729d3ec756bda5f49d51168687978
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Thu Nov 17 14:26:09 2011 +0100
add warning to vcl-permit-global-shortcuts.diff
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 697760c..ee2f3d5 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 a34e55f..f970873 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(-)
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
