summaryrefslogtreecommitdiff
path: root/desktop/source
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2020-02-26 09:48:48 +0100
committerTamás Zolnai <tamas.zolnai@collabora.com>2020-02-26 12:05:14 +0100
commitb833536ac6a95a58ecc975a7fd511ec77ff53634 (patch)
treee2857ece18e341080ef158fb6250179d2af73fda /desktop/source
parentbdb815750d0bc57d53200b2a470bbff020cf4ca9 (diff)
Revert "jsdialog: Refresh dialog after action"
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 <tamas.zolnai@collabora.com> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'desktop/source')
-rw-r--r--desktop/source/lib/init.cxx19
1 files changed, 1 insertions, 18 deletions
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();
}
}