diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2019-10-15 14:06:08 +0200 |
---|---|---|
committer | Szymon Kłos <szymon.klos@collabora.com> | 2019-10-15 14:06:08 +0200 |
commit | ca4351e6ef5be85378e4a88833510f326c37c06c (patch) | |
tree | 7adcd5833ef39fde165b34f94bd1bb16ee82a4c5 /kit | |
parent | f6b2cd63a40522cef311932cc0745520887111e7 (diff) |
Revert "jsdialogs: send events to the core"
core not yet ready
This reverts commit 80ecaa60f62aa41584ef1ab8b040806f8d92a0a7.
Diffstat (limited to 'kit')
-rw-r--r-- | kit/ChildSession.cpp | 25 | ||||
-rw-r--r-- | kit/ChildSession.hpp | 1 |
2 files changed, 1 insertions, 25 deletions
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp index 05c9ba772..cd38ec7a7 100644 --- a/kit/ChildSession.cpp +++ b/kit/ChildSession.cpp @@ -42,7 +42,6 @@ #include <Util.hpp> #include <Unit.hpp> #include <Clipboard.hpp> -#include <string> using Poco::JSON::Object; using Poco::JSON::Parser; @@ -296,8 +295,7 @@ bool ChildSession::_handleInput(const char *buffer, int length) tokens[0] == "uploadsigneddocument" || tokens[0] == "exportsignanduploaddocument" || tokens[0] == "rendershapeselection" || - tokens[0] == "removetextcontext" || - tokens[0] == "dialogevent"); + tokens[0] == "removetextcontext"); if (tokens[0] == "clientzoom") { @@ -421,10 +419,6 @@ bool ChildSession::_handleInput(const char *buffer, int length) { return removeTextContext(buffer, length, tokens); } - else if (tokens[0] == "dialogevent") - { - return dialogEvent(buffer, length, tokens); - } else { assert(false && "Unknown command token."); @@ -1381,23 +1375,6 @@ bool ChildSession::mouseEvent(const char* /*buffer*/, int /*length*/, return true; } -bool ChildSession::dialogEvent(const char* /*buffer*/, int /*length*/, const std::vector<std::string>& tokens) -{ - if (tokens.size() <= 2) - { - sendTextFrame("error: cmd=dialogevent kind=syntax"); - return false; - } - - getLOKitDocument()->setView(_viewId); - - unsigned nLOKWindowId = std::stoi(tokens[1].c_str()); - getLOKitDocument()->sendDialogEvent(nLOKWindowId, - Poco::cat(std::string(" "), tokens.begin() + 2, tokens.end()).c_str()); - - return true; -} - bool ChildSession::unoCommand(const char* /*buffer*/, int /*length*/, const std::vector<std::string>& tokens) { if (tokens.size() <= 1) diff --git a/kit/ChildSession.hpp b/kit/ChildSession.hpp index 971b4158b..88166a0c4 100644 --- a/kit/ChildSession.hpp +++ b/kit/ChildSession.hpp @@ -259,7 +259,6 @@ private: bool dialogKeyEvent(const char* buffer, int length, const std::vector<std::string>& tokens); bool mouseEvent(const char* buffer, int length, const std::vector<std::string>& tokens, const LokEventTargetEnum target); bool gestureEvent(const char* buffer, int length, const std::vector<std::string>& tokens); - bool dialogEvent(const char* buffer, int length, const std::vector<std::string>& tokens); bool unoCommand(const char* buffer, int length, const std::vector<std::string>& tokens); bool selectText(const char* buffer, int length, const std::vector<std::string>& tokens); bool selectGraphic(const char* buffer, int length, const std::vector<std::string>& tokens); |