From b833536ac6a95a58ecc975a7fd511ec77ff53634 Mon Sep 17 00:00:00 2001 From: Tamás Zolnai Date: Wed, 26 Feb 2020 09:48:48 +0100 Subject: Revert "jsdialog: Refresh dialog after action" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes some cypress tests to fail, the mobile wizard does not open or opens with an empty content. It seems it causes an issue when mobile wizard is opened/closed subsequently. One test case does not make this visible, but it needs to run more test cases subsequently. This reverts commit 0a35eafca9f74d2858bd3323d74d64813fa9107a. Change-Id: Iccb6bb3d77270340ac9b36a68cae749098ddaa3a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89502 Tested-by: Tamás Zolnai Reviewed-by: Tamás Zolnai --- desktop/source/lib/init.cxx | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'desktop/source') diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 65776dc3f1fb..16f18e3434d9 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -3595,24 +3595,7 @@ static void doc_sendDialogEvent(LibreOfficeKitDocument* /*pThis*/, unsigned nWin } catch(...) {} // force resend - const vcl::ILibreOfficeKitNotifier* pNotifier = pWindow->GetLOKNotifier(); - if (!pNotifier) - { - pWindow->Resize(); - return; - } - - try - { - // Mobile. - std::stringstream aStream; - boost::property_tree::ptree aTree = pWindow->DumpAsPropertyTree(); - aTree.put("id", pWindow->GetLOKWindowId()); - boost::property_tree::write_json(aStream, aTree); - const std::string message = aStream.str(); - pNotifier->libreOfficeKitViewCallback(LOK_CALLBACK_JSDIALOG, message.c_str()); - } - catch (boost::property_tree::json_parser::json_parser_error&) {} + pWindow->Resize(); } } -- cgit v1.2.3