[Libreoffice-commits] online.git: wsd/ClientSession.cpp

[Miklos Vajna (via logerrit)]

 wsd/ClientSession.cpp |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit e080b8af04eff9a36ee81a5a4747a31f992ab71d
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Sep 28 09:07:43 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Sep 28 09:33:18 2020 +0200

    ClientSession: clean up copy&paste
    
    dialogevent and formfieldevent has the same handler, do that at a single
    place.
    
    Change-Id: I4e0f7b36484f6ef65539616c0fe81a331c9caa98
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103529
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 44b3f0271..cb26a8f64 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -687,7 +687,7 @@ bool ClientSession::_handleInput(const char *buffer, int length)
         docBroker->saveAsToStorage(getId(), "", wopiFilename, true);
         return true;
     }
-    else if (tokens.equals(0, "dialogevent"))
+    else if (tokens.equals(0, "dialogevent") || tokens.equals(0, "formfieldevent"))
     {
         return forwardToChild(firstLine, docBroker);
     }
@@ -695,10 +695,6 @@ bool ClientSession::_handleInput(const char *buffer, int length)
     {
         return forwardToChild(std::string(buffer, length), docBroker);
     }
-    else if (tokens.equals(0, "formfieldevent"))
-    {
-        return forwardToChild(firstLine, docBroker);
-    }
     else if (tokens[0] == "outlinestate" ||
              tokens[0] == "downloadas" ||
              tokens[0] == "getchildid" ||