[libreoffice-online] 02/04: Merge tag 'upstream/5.4.0.0.beta2' into experimental

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch experimental
in repository libreoffice-online.

commit b27daf3289ab2c3a68b6fd711e3377d1d12d4644
Merge: a366bad a7b23dd
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Tue Jun 13 10:12:25 2017 +0200

    Merge tag 'upstream/5.4.0.0.beta2' into experimental
    
    Upstream version 5.4.0.0.beta2

 Makefile.am                               |   9 --
 Makefile.in                               |   7 +-
 common/Session.cpp                        |   3 +-
 configure                                 |  20 ++--
 configure.ac                              |   2 +-
 dist_git_hash                             |   2 +-
 kit/ChildSession.cpp                      |  20 +---
 kit/ChildSession.hpp                      |   5 +-
 kit/Kit.cpp                               |  37 ++++----
 loleaflet/dist/errormessages.js           |   6 +-
 loleaflet/dist/toolbar/toolbar.js         |   5 +-
 loleaflet/main.js                         |   2 +-
 loleaflet/po/help-de.po                   |   6 +-
 loleaflet/po/ui-cs.po                     |  20 ++--
 loleaflet/po/ui-da.po                     |  23 +++--
 loleaflet/po/ui-eu.po                     |   8 +-
 loleaflet/po/ui-pt.po                     |   8 +-
 loleaflet/src/control/Control.Dialog.js   |   5 +-
 loleaflet/src/control/Control.Header.js   |  11 ++-
 loleaflet/src/core/Socket.js              |  36 ++++++--
 loleaflet/src/layer/AnnotationManager.js  |  16 ++++
 loleaflet/src/map/Map.js                  |  15 ++-
 loleaflet/src/map/handler/Map.Keyboard.js |   3 +-
 loleaflet/src/map/handler/Map.WOPI.js     |   6 +-
 loolwsd.spec                              |   6 +-
 test/WhiteBoxTests.cpp                    |   2 +-
 test/httpwstest.cpp                       |  53 +++++++++++
 wsd/ClientSession.cpp                     |   5 +-
 wsd/DocumentBroker.cpp                    | 147 ++++++++++++++++--------------
 wsd/DocumentBroker.hpp                    |   8 +-
 wsd/Exceptions.hpp                        |   8 ++
 wsd/FileServer.cpp                        |   5 +-
 wsd/LOOLWSD.cpp                           |  17 +++-
 wsd/Storage.cpp                           |  92 ++++++++-----------
 wsd/Storage.hpp                           |  53 +----------
 wsd/reference.txt                         |   8 +-
 36 files changed, 371 insertions(+), 308 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice-online.git