New branch 'feature/lok_sofficemain' available with the following commits: commit 45bc5d5eeca0b54e0954b659c514993c241ad71d Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Jul 25 21:03:19 2014 +0200
Make sure LOK is actually headless. This prevents e.g. the document recovery dialog from trying to be shown. Change-Id: I253720f7fa1abd1c053670434f8394473517b670 commit 701383b17e4ad0aebd3c55d69ac1b169e6628b1f Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Jul 25 20:56:18 2014 +0200 Don't fail on --protector. If we have any "unknown" command line arguments Desktop init will fail, however our LOK Tiled Rendering test uses Desktop (via soffice_main). (Other unit tests don't use soffice_main hence this check never comes into play.) It looks like it's most reliable simply to ignore --protector here, rather than try to filter it out elsewhere (which is difficult as it is passed to osl via SAL_IMPLEMENT_MAIN). Change-Id: I95d047892851ba2cf9edd2e26bacc6efa0320f71 commit 226de15e06136d3ab01c4662754d67b74b83fded Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Mon Jul 21 21:16:09 2014 +0200 Don't start Impress Remote server in headless mode. Change-Id: Ibafe57413a60745e949dc3146fbc843c52c029d6 commit 7b7a8f5fdecb5c9363f3c2aca562a131e2970c7b Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Mon Jul 21 19:36:11 2014 +0200 Use gb_CppunitTest_use_confpreinit for LOK tiled rendering. Now that we use the event loop for LOK we need to make sure that it is able to run successfully first time, as unit tests start with a completely clean config. Change-Id: If9ddcb75fe8286381d71ecdc76ac7eb3697960d0 commit 9eb4338b2e79e0f0e28eb719c07dd5ade3592504 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Mon Jul 21 19:35:13 2014 +0200 Add gb_CppunitTest_use_confpreinit: For unit tests that use the VCL event loop we can use this to avoid the otherwise required restart. Change-Id: I48265d7e7188a4efaa6f87432c762320331c0c78 commit 373e15e8b32b12e09ed8323cd71adeaf94210c81 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Mon Jul 21 19:34:09 2014 +0200 Implement lokconf_init. This is a simple executable which can be used to ensure there is a pe-pared configuration for unit-tests to avoid the usually required re-start on the first run. Change-Id: I49b706e8daa93bc34db508a24615b63b9babddba commit 64c1c9efdc4da6af58e5b753e16f1ff452e6d79f Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Jul 18 13:12:25 2014 +0200 Fail LOK initialisation if restart is required. Change-Id: Ia13a3523666147f002b5a5177fd6962d55556f56 commit 33f2c3a0e5b64c2542a84d81955f89846d9c2a69 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Jul 18 13:10:14 2014 +0200 Add OfficeIPCThread::IsEnabled. This lets us easily check whether Desktop::Main has shut down, i.e. which happens on the first restart-requiring initialisation. Change-Id: I7fe5699a4bf59e2c3b891ac73abd9b147773d22e commit 14277ea063cf91e09eba2dd306101b8ea005209d Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Jul 18 10:02:48 2014 +0200 Use OfficeIPCThread::WaitForReady rather than sleeping. This way we actually continue when we're ready to, rather than dumbly hoping we wait for long enough. This isn't entirely unproblematic though -- if we have no config pre-prepared (i.e. first-run), then we just end up hanging on this since soffice_main exits without doing anything to the OfficeIPCThread. (Which is especially problematic for unit tests which specifically run on an empty config.) Change-Id: I064fb500a224cfe37a0d3ba24b6154ffd72a71a3 commit 114320d1cca5d3c8ee234ad8e161fbf7b79ee870 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Jul 18 10:00:42 2014 +0200 Bin outdated / incorrect comment. Change-Id: I7b8f97377b9606a2228f172f772d8051a64703d2 commit 17b7e635ff2cfa135eff0c74172c80e598406085 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Fri Jul 18 09:48:47 2014 +0200 Add OfficeIPCThread::WaitForReady. For LibreOfficeKit we need to start up the event loop, and can't continue initialisation until all the related (VCL etc.) setup is complete -- the OfficeIPCThread is also enabled as one of the last items, and can be used to indicate whether or not we can start actually working with VCL. Change-Id: I0450b65584ddf6e8d02ce0c6e66e06f47841d1b7 commit 124b6e03707ad47c8662652eb8121375fb4c73d1 Author: Andrzej Hunt <andrzej.h...@collabora.com> Date: Thu Jul 17 16:13:49 2014 +0200 DO NOT MERGE YET: hack soffice_main into LOK. Change-Id: I86e13192ddb5904afabca38d3a201f17f145de09 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits