sw/qa/uitest/writer_tests/xwindow.py | 2 ++
vcl/source/window/event.cxx | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit ece261bdae686a03558aa1d849142a63960a6d2f
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Fri May 24 12:56:53 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Fri May 24 13:18:50 2019 +0200
Temporary fix for basic editor crashing
Disable code until we have a fix
Change-Id: I0d30aba5d78ac6e0c48952dec43f66f8acf38556
Reviewed-on: https://gerrit.libreoffice.org/72903
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/qa/uitest/writer_tests/xwindow.py
b/sw/qa/uitest/writer_tests/xwindow.py
index a1be89bf2981..b263ebff33d3 100644
--- a/sw/qa/uitest/writer_tests/xwindow.py
+++ b/sw/qa/uitest/writer_tests/xwindow.py
@@ -78,6 +78,8 @@ class XKeyListenerExtended(unohelper.Base, XKeyListener):
# Test that registered mouse/key listeners for top window receive mouse/key
events
class XWindow(UITestCase):
def test_listeners(self):
+ # Disabled until basic editor crash is fixed
+ return
global mouseListenerCount
global keyListenerCount
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 6f092ce3729a..1e4d47b8f647 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -216,8 +216,9 @@ void Window::CallEventListeners( VclEventId nEvent, void*
pData )
// If maEventListeners is empty, the XVCLWindow has not yet been
initialized.
// Calling GetComponentInterface will do that.
+ /* FIXME: This leads to a crash in Basic Editor
if (mpWindowImpl->maEventListeners.empty() && pData)
- xWindow->GetComponentInterface();
+ xWindow->GetComponentInterface();*/
if (!mpWindowImpl->maEventListeners.empty())
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
