Commit graph

2841 commits

Author SHA1 Message Date
Ashod Nakashian
44a0e5785e loolwsd: cout -> cerr
Change-Id: I80ee313621ce093d75f2c331f3fef6125a187a42
Reviewed-on: https://gerrit.libreoffice.org/25263
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 15:53:11 +00:00
Ashod Nakashian
fae850189d loolwsd: include cleanup and organization
A source file (.cpp) must include its own header first.
This insures that the header is self-contained and
doesn't depend on arbitrary (and accidental) includes
before it to compile.

Furthermore, system headers should go next, followed by
C then C++ headers, then libraries (Poco, etc) and, finally,
project headers come last.

This makes sure that headers and included in the same dependency
order to avoid side-effects. For example, Poco should never rely on
anything from our project in the same way that a C header should
never rely on anything in C++, Poco, or project headers.

Also, includes ought to be sorted where possible, to improve
readability and avoid accidental duplicates (of which there
were a few).

Change-Id: I62cc1343e4a091d69195e37ed659dba20cfcb1ef
Reviewed-on: https://gerrit.libreoffice.org/25262
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 15:52:54 +00:00
Ashod Nakashian
b2fa9d6f2e loolwsd: moved TileDesc into own file
Change-Id: I54162f7ebaaca51f9c52a30af1e278db212562fa
Reviewed-on: https://gerrit.libreoffice.org/25261
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 15:49:10 +00:00
Ashod Nakashian
9347adc66f loolwsd: UnitPrefork can't use the more recent child
Change-Id: I6f60761498e61d9ceb48bc5f9a41967152293590
Reviewed-on: https://gerrit.libreoffice.org/25246
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:47:39 +00:00
Ashod Nakashian
5a0162f95c loolwsd: cleanup and improvements to UnitPrefork
Change-Id: I15394fa9199f0d2489a184d4c07602da02cbab64
Reviewed-on: https://gerrit.libreoffice.org/25245
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:43:45 +00:00
Ashod Nakashian
958f6ffcbd loolwsd: fix UnitPrefork deadlock/corruption
Reading from the socket in the test is not
thread-safe, and was causing all sorts of
problems.

The new code adds a test API and reads the
incoming data through it and not directly
from the socket. In addition, the read is
synchronized.

Change-Id: Id13821a40a59e32fd8a14f733a47306aee42ada8
Reviewed-on: https://gerrit.libreoffice.org/25244
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:43:15 +00:00
Ashod Nakashian
71cd345fd6 loolwsd: cleanup and reformatting of PrisonerSession
Change-Id: I26ea5a1bf5010458b1da9b2d25b4236ef104c4b9
Reviewed-on: https://gerrit.libreoffice.org/25243
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:41:28 +00:00
Ashod Nakashian
80786cc79d loolwsd: propagate error from forwardToPeer
Change-Id: Icea02f3ca48f9f4eb8aed14181c7b6101bfa1c2e
Reviewed-on: https://gerrit.libreoffice.org/25242
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:40:01 +00:00
Ashod Nakashian
81d7ccc2c3 loolwsd: handleInput returns socket send return
Change-Id: I9fb9fabad60993ef558803fb2d5cbfe8aa727f1d
Reviewed-on: https://gerrit.libreoffice.org/25241
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:33:08 +00:00
Ashod Nakashian
3cc295b7d2 loolwsd: remove thin wrapper
Change-Id: Id84a404aecd7f553665e65c1959dcca45309199e
Reviewed-on: https://gerrit.libreoffice.org/25240
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:29:51 +00:00
Ashod Nakashian
32ee3d0650 loolwsd: socket sending returns success or failure
Change-Id: I3f486b236e5b6a83292a9d7f3e4931e5235f3a33
Reviewed-on: https://gerrit.libreoffice.org/25239
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:28:16 +00:00
Ashod Nakashian
7f62bb54fd loolwsd: unified forwardToPeer
Change-Id: Ib12626adad1ff3cf647d6a32f9b1eae35f794b2f
Reviewed-on: https://gerrit.libreoffice.org/25238
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:26:15 +00:00
Ashod Nakashian
c6454ff9ed loolwsd: protect against null lok::Document
Change-Id: Iffa9c7f708d04bede5d98ba311e499a0874605fc
Reviewed-on: https://gerrit.libreoffice.org/25237
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:22:34 +00:00
Ashod Nakashian
46c5ce3041 loolwsd: remove unnecessary dispatchChild and simplify
Change-Id: I6edb5a51bc2d58b58f53f6689e9d37613fc508de
Reviewed-on: https://gerrit.libreoffice.org/25236
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:20:59 +00:00
Ashod Nakashian
7444ad4348 loolwsd: check for null WS before shutdown
Change-Id: I47ad44cdfdbcac61bf64bf9e698f23c502a748a5
Reviewed-on: https://gerrit.libreoffice.org/25235
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:19:46 +00:00
Ashod Nakashian
f3a1e6e81e loolwsd: replenish children on finishing a prisoner socket thread
Change-Id: Id6b1a12439431819910f6c5c99cb630b48c87805
Reviewed-on: https://gerrit.libreoffice.org/25234
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:19:27 +00:00
Ashod Nakashian
e797ae9861 loolwsd: logging improvements
Change-Id: Ic28e8f523f67e3339cae20adcf6cab966b610f24
Reviewed-on: https://gerrit.libreoffice.org/25233
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:19:04 +00:00
Ashod Nakashian
6ce9868a9c loolwsd: more frequent zombie reaping in forkit
Change-Id: I10d859880cfd933c38572852f506eedf603e8fad
Reviewed-on: https://gerrit.libreoffice.org/25232
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-21 03:16:56 +00:00
Andras Timar
cebc99c52d loleaflet: uno commands l10n, forgot to add this 2016-05-20 21:47:05 +02:00
Andras Timar
bd6ee3a8b6 loleaflet: initial l10n support of context menus 2016-05-20 18:13:44 +02:00
Andras Timar
625de77dd3 loolwsd: packaging, setcap cap_sys_admin=ep /usr/bin/loolmount 2016-05-20 15:51:05 +02:00
Andras Timar
2c2073231e loolwsd: fix deb dependency, will depend on collaboraoffice metapackage 2016-05-20 15:46:56 +02:00
Andras Timar
7983031827 loleaflet: typo: seperator->separator 2016-05-20 11:06:41 +02:00
Andras Timar
baedc87858 add LibreOfficeKit.hpp to tarball 2016-05-19 17:24:11 +02:00
Miklos Vajna
b0b9648e28 Remove unused 'using' decls
Change-Id: Ibdcf0a0fe2390712059e6e70c47bd60f6416c6be
2016-05-19 16:42:41 +02:00
Jan Holesovsky
6f868ed74d loleaflet: Pack the toolbars a bit to take less space. 2016-05-19 10:13:46 +02:00
Jan Holesovsky
3b6cdcb790 loleaflet: Don't check the 'Take edit' button, only enable/disable. 2016-05-19 08:48:40 +02:00
Jan Holesovsky
58e7bfd971 loleaflet: Adjust various css values to the large icons. 2016-05-19 00:50:17 +02:00
Jan Holesovsky
4d539a5cd3 loleaflet: Switch to using large icons.
Kept the small icons around for the case we'd like to implement switching
between these two (?) - OTOH not sure it makes sense, as the toolbars will not
get smaller by just using the smaller icons...  But always can remove them in
a separate commit.
2016-05-19 00:43:51 +02:00
Jan Holesovsky
b5eee85e20 loleaflet: Rename the icons to what is directly in LibreOffice.
So that it is easier to update to new version etc.
2016-05-19 00:43:51 +02:00
Jan Holesovsky
e3b0d00240 Kill the rest of document_simple_example.html + related controls.
[Those that are not used in the loleaflet.html.]
2016-05-19 00:43:51 +02:00
Jan Holesovsky
1e57be7094 Fix some broken icons, remove the unused ones. 2016-05-19 00:43:51 +02:00
Jan Holesovsky
30f34cff39 document_simple_example: Kill Control.Presentation.js. 2016-05-19 00:43:50 +02:00
Jan Holesovsky
0f3cf72724 document_simple_example: Kill Control.Buttons.js.
We don't need the document_simple_example.html any more, remove the stuff that
is needed only for that.
2016-05-19 00:43:50 +02:00
Henry Castro
5a455e0d0a loleaflet: fix slide show focus 2016-05-18 18:29:02 -04:00
Ashod Nakashian
312b9ee6cb loolwsd: less naked pointers
Change-Id: I5f352a80a181f410c002d60b9ec5c61fb88d0cf0
Reviewed-on: https://gerrit.libreoffice.org/25095
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-18 11:32:16 +00:00
Ashod Nakashian
5a8b3c8169 loolwsd: LibreOfficeKitDocument* -> shared_ptr<lok::Document>
Change-Id: Ie94882482729e4d6bb69c9f92badd375231fece2
Reviewed-on: https://gerrit.libreoffice.org/25094
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-18 11:31:10 +00:00
Ashod Nakashian
35ecc2b8d0 loolwsd: LibreOfficeKit* -> shared_ptr<lok::Office>
Change-Id: I55cbd600a7000dbb356304c8f5493195c7778149
Reviewed-on: https://gerrit.libreoffice.org/25093
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-18 11:30:30 +00:00
Ashod Nakashian
a21bcc2341 loolwsd: LibreOfficeKitDocument* -> shared_ptr<lok::Document>
Change-Id: Iafc48317c225f93b7d58708dd26f04d6bb13988e
Reviewed-on: https://gerrit.libreoffice.org/25092
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-18 11:29:05 +00:00
Ashod Nakashian
8d24d5dbf2 loolwsd: new wrapper classes of LibreOfficeKit and LibreOfficeKitDocument
Heavily built on LibreOfficeKit's own class, this adds
logging and thread-safety (when lock is held).

Change-Id: If0f4b1f44b1982468c0d1e002b92e189b9d68a62
Reviewed-on: https://gerrit.libreoffice.org/25091
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-18 11:27:46 +00:00
Andras Timar
d4178e2988 loleaflet: typo: Resuls -> Results 2016-05-18 12:58:10 +02:00
Pranav Kant
a0b7a7eaf6 Revert "loleaflet: remove unnecessary duplicate message"
This message is required to update row/column headers when client
changes its part, otherwise we won't see new row/column headers
in new part.

This reverts commit d8f6aa7146.

Change-Id: Iabafdf27b45d174abd7bbd6ba79e7badc52b9985
2016-05-18 16:00:59 +05:30
Henry Castro
eb8350afd4 loolwsd: log info, rename to PrisonerSession 2016-05-17 18:38:56 -04:00
Henry Castro
6c31bd8bca loolwsd: log, rename to ClientSession 2016-05-17 18:33:37 -04:00
Henry Castro
c511cc9fca loleaflet: fix "Maximum call stack size exceeded" 2016-05-17 12:27:56 -04:00
Ashod Nakashian
76991dd325 loolwsd: disable editlock in multiview
Change-Id: I4df2d8a321e160ce226c2e22aa754cd6e5b2c755
Reviewed-on: https://gerrit.libreoffice.org/25063
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-17 13:57:36 +00:00
Ashod Nakashian
b41f0a6ea3 loolwsd: ChildProcessSession -> ChildSession
Change-Id: I24f001cb4d17d1ddc5cbd4f48134ec4eb8777afb
Reviewed-on: https://gerrit.libreoffice.org/25062
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-17 13:56:45 +00:00
Ashod Nakashian
7ce6e67731 loolwsd: ChildProcessSession.{cpp,hpp} -> ChildSession.{cpp,hpp}
Change-Id: Ic0c7f0992c9024d8fb8478b41205394372094af8
Reviewed-on: https://gerrit.libreoffice.org/25061
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-17 13:56:21 +00:00
Ashod Nakashian
7f767e7cf6 loolwsd: MasterProcessSession splitting: removed MasterProcessSession
Change-Id: If132e8787f6ed7fa21d235cc355d7a29395b3c4d
Reviewed-on: https://gerrit.libreoffice.org/25049
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-17 03:23:07 +00:00
Ashod Nakashian
d1d5cff3e3 loolwsd: MasterProcessSession splitting: moved forwarding and shutdown
Change-Id: I3c84d9be328e58263cac9c3b1b501ef91ea30170
Reviewed-on: https://gerrit.libreoffice.org/25048
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
2016-05-17 03:22:41 +00:00