summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-04oox smartart: add support for <dgm:layoutNode ... chOrder="t">Miklos Vajna
This changes the order of children, which matters when they have no explicit ZOrder. With this, the text shapes on the arrow shape are on top of the arrow, not behind it. The trick is that nominally chOrder can be "t"(op) or "b"(ottom), defaulting to bottom, but there is a difference between an explicit "b" and not setting it. When not setting it, the layout node is expected to inherit it from its parent layout node, recursively. This would probably make sense for other algorithms as well, but set it only for the linear algorithm for now, as that's where we have a bug document showing the PowerPoint behavior. Change-Id: I433f92c620149ef5590aebc8cbf43110e1d2fb85 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100047 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-08-04Remove dead codeStephan Bergmann
As discussed at <https://gerrit.libreoffice.org/c/core/+/99724> "fix shutdown crash in basic" the code was added in error, and at least clang-cl with latest MSVC standard library and C++20 mode gives a helpful > basic/source/sbx/sbxbase.cxx(53,5): error: ignoring return value of function declared with 'nodiscard' attribute [-Werror,-Wunused-result] > std::move(m_Factories); > ^~~~~~~~~ ~~~~~~~~~~~ now. Change-Id: I052efe51d4415838b50de06bb308692fa937b7b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100076 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-04notebookbar: control early init per viewSzymon Kłos
Change-Id: I9b743bc6d62256289549cd8002b76bcb918222b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99986 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit fddfeb653dfd5dd73cbccb4433678d397f092df9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99921 Tested-by: Jenkins
2020-08-04fix leak in CppunitTest_sc_ucalcNoel Grandin
Change-Id: Iee5f4bfcd8ad90d37e787d225928a5ae7b269f2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100048 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-04fix more leaks in CppunitTest_sc_cache_testNoel Grandin
To be honest, I don't know why this fixes the leak, but it's generally good practice anyway to use unique_ptr. Change-Id: Ic5aa2a0c6ab092450e9eae96616a998c08e2e723 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100045 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-04Adapt compilerplugins/clang/test/makeshared.cxx to MSVC standard libraryStephan Bergmann
> error: 'error' diagnostics seen but not expected: > File compilerplugins/clang/test/makeshared.cxx Line 47: rather use make_shared than constructing from 'unique_ptr<int>' [loplugin:makeshared] > File compilerplugins/clang/test/makeshared.cxx Line 49: rather use make_shared than constructing from 'unique_ptr<int>' [loplugin:makeshared] > File compilerplugins/clang/test/makeshared.cxx Line 53: rather use make_shared than constructing from 'unique_ptr<int>' [loplugin:makeshared] Change-Id: I5d2d1b129c9d0fee496eceb4e2cf14f5853ba00b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100074 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-04Adapt compilerplugins/clang/test/getstr.cxx to latest MSVC standard libraryStephan Bergmann
...that now defines the wide-character-to-narrow-stream inserters as deleted too, at least in C++20 mode. Change-Id: I554f2530d5905e46343bf0d8bf12a6feb3d63075 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100073 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-04Silence -Werror,-Wdeprecated-enum-enum-conversion (clang-cl)Stephan Bergmann
"bitwise operation between different enumeration types ('CommandTypeEnum' and 'ExecuteOptionEnum')", but where <https://docs.microsoft.com/en-us/sql/ado/ reference/ado-api/execute-method-ado-connection?view=sql-server-ver15> documents parameter Options as "A Long [...] Can be a bitmask of one or more CommandTypeEnum or ExecuteOptionEnum values." Change-Id: If000490127e7215863ea750a3f9f30e69916978e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100070 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-04mobile: fix calc chart wizard properties is not shownMert Tumer
Change-Id: I2fd98ddbdb529c3f224299c6824b4743797925be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93747 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97061 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98248 Tested-by: Jenkins Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
2020-08-04added ability to switch sidebar deck on init.cxx for mobilewizardMert Tumer
Change-Id: I532398bc41e1c984c24b1d39e4844315a0a69847 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93162 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97062 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98247 Tested-by: Jenkins Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
2020-08-04Fix .uno:SidebarHide command works for onlineMert Tumer
Signed-off-by: Mert Tumer <mert.tumer@collabora.com> Change-Id: I03743d15300687b1da947d3c44be6a42aab83107 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96513 Tested-by: Jenkins
2020-08-04tdf#135216 sw MSexport: save LeftPageDesc as left page styleJustin Luth
GetMaster() is for right pages. I assume this was a copy/paste mistake which came in already at initial import. And since left/right are alternating, they always use the first version of the header/footer. Although the UI doesn't allow changing these, they still COULD be different, as is the case with the unit test. No existing unit tests even touch this code, so not a common situation at all. Change-Id: I9e3720ddf34a8f7e08ce196780fbe16e8c88940b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99628 Tested-by: Justin Luth <justin_luth@sil.org> Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Justin Luth <justin_luth@sil.org>
2020-08-04tdf#135427 Make pstoedit delegate letter placement to usSamuel Thibault
As pstoedit documents itself, its wmf/emf driver uses a very approximate interletter spacing, making the text look really awful. But it provides a -nfw option that delegates the letter placement to the emf reader, and we happen to be doing a proper job, thus getting a proper vectorized output. This is not a concern on Windows (and the option is ignored there). The option is available since version 3.40 (~2005). So we can just always pass it on. Change-Id: I8ffd3fbf046b5a80e8011651eeaf060a8f5107e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100035 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-08-04loplugin:simplifybool a little more aggressiveNoel Grandin
with expressions like !(a && b) Change-Id: Id2acec2a8d0eaaa8e5e37dbd2cae7281be36572e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100040 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-04loplugin:flatten in vclNoel Grandin
Change-Id: I271cc67ecf34acbf0edbda960e33315fb6a1f9dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100041 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-04simplify svx::frame::StyleNoel Grandin
no need to use shared_ptr here, this class is not doing copy-on-write. Change-Id: I4e921bfc789cc5989d98b5f9ab7074eb7d5ac33e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100022 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-04tdf#130707 xmloff: survive <text:database-display> in editeng textMiklos Vajna
Regression from commit 28d67b792724a23015dec32fb0278b729f676736 (tdf#107776 sw ODF shape import: make is-textbox check more strict, 2019-08-26), now that we correctly identify what shape text to import as "textbox" (Writer TextFrame) and what to import as editeng text, there are documents out there that try to import mailmerge fields into editeng-based shape text. Fix missing error handling there. Note that the error is not just silently ignored, we do insert the field result into the shape text, existing code provides this already. Change-Id: Ibe631ac5d94c1c7795dd00bad05fdcca0e6741a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100028 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-08-04loplugin:flatten in vcl/gdiNoel Grandin
Change-Id: Ief1736264e62acfac3a9a83c54dc564c03d6fba9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100034 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-04loplugin:flatten in vcl/windowNoel Grandin
Change-Id: I94e69e988f038e85b1fb78985211d478bb5ed9b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100033 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-04loplugin:flatten in vcl/unxNoel Grandin
Change-Id: Ib9df009a51db1ed96c6eea7bda68e288755e7a56 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100032 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-04loplugin:flatten in toolkitNoel Grandin
Change-Id: I8f4b29620134566f256f05bbab677e83baf20ec7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100031 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-04fix some DocShell leaks in unit testsNoel Grandin
need to call DoClose() to unwind the internal ref-counting Change-Id: Ibfd13e2300f3542e5e86363facd5b41dbfafdf6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100001 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-03Revert "Adapt to changed clang::ASTContext::getParents behavior on Clang 11 ↵Stephan Bergmann
trunk" This reverts commit 09aa5a9be8b9b3c88cf25b85e0eda28c5ef19aa4, now that <https://github.com/llvm/llvm-project/commit/ 551092bc3dfb86f1e11a55f3bee0c8ee1be6fdd6> "Revert AST Matchers default to AsIs mode" reverted the Clang commit that prompted this compilerplugins change. Change-Id: I75c8b4cb2894cd67a791db460f2886a783856c73 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100026 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-03tdf#133687 Fix the placeholders priority order.Gülşah Köse
When we don't have type attribute on slide but have on slidelayout we have to use it instead of default type. Change-Id: Ibb874b5ee39c48641484fe1a8686f66c31695f76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99904 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-08-03Fix typoAndrea Gelmini
Change-Id: Ia2ab8c92bf28bae5a70f1e768e91093695dd3dbc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100021 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-08-03tdf#133747 add missing character to make the sort feature work correctlyTomoyuki Kubota
Change-Id: Icea2dac6e4ef6493c2a7fe5f7def0f1708caf6d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95684 Tested-by: Jenkins Reviewed-by: Tomoyuki Kubota <himajin100000@gmail.com> Reviewed-by: Eike Rathke <erack@redhat.com>
2020-08-03loplugin:flatten in ucbNoel Grandin
Change-Id: Ica7e5d3b5a5cec065f35f99d62b3b6604323601a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100009 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-03loplugin:flatten in ucbhelperNoel Grandin
Change-Id: Ic5a8ce908671bd492395bff01aa211b8bdd74ca7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100008 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-03loplugin:flatten in sdNoel Grandin
Change-Id: I57cf26d800d8d414014b88c250ee1cbd47551bc4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100007 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-03fix leak in ScCacheTestNoel Grandin
and put the init/destruct in constructor/destructor instead of setup(), we want this to run once, not for every test method. Change-Id: I7d5fcdd2974677f1509048c16fb40d03dff289c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100004 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-03ofz#24648 fix slkfuzzerCaolán McNamara
Change-Id: I3dce445038a29a622ceea2415e7736768a95206d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100029 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-03correctly mark the "New menu" dialog as modalMarkus Mohrhard
The dialog is called from a modal dialog which means a modeless dialog does not make sense. Some of our internal dialog tracking code is confused by that case which confused the UI tests. Change-Id: I705877e8a751c55bfbd00ddeaf18ab86c95321c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99944 Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2020-08-03tdf#134560 tdf#135107 make inspector contents human readableShivam Kumar Singh
This patch adds a dedicated hrc file for RID's of all the properties that can be displayed in the Inspector Change-Id: I258ca060508e28b7b66e96393fcef4fd104bb781 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99983 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-08-03-Werror=redundant-moveStephan Bergmann
...now that GCC 11 trunk implements P1155R3 since <https://gcc.gnu.org/git/ ?p=gcc.git;a=commit;h=1722e2013f05f1f1f99379dbaa0c0df356da731f> "c++: Implement C++20 implicit move changes. [PR91427]", at least in -std=c++20 mode Change-Id: Ie3c8f391fe4a6a99144ab35b2b29214ac5413fc8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99999 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-03Validate SELECT rangeStephan Bergmann
63049e98a659290229d3356e76d49cea44575011 "Reliably set up controls of hyperlink dialog in constructor" fixed an issue that could cause Python UITest code to issue a bogus SELECT request that would fire an assert in rtl_uString_newFromSubString. Even if that issue is fixed now, it is probably a good idea to validate the requested range here. (An alternative would be to validate it in the underlying shell's SelectText, but that function is also called from internal code (which presumably already ensures that it is passing valid arguments), so it is probably better to stay with that function's narrow interface.) It would probably be nice if this function reported failure (by throwing a css::lang::IllegalArgumentException, say) instead of silently (modulo SAL_WARN) clamping the range, but it is called from Scheduler::ProcessTaskScheduling (vcl/source/app/scheduler.cxx) in a try/catch block that prohibits all exceptions. Change-Id: I5b7b4255861766a81a81501e391b1ff4e09b7db6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99933 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-03Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' to 8b7b468cfcb1591972ee2e47a295ee4cf86a46e8 - Fix tag contents Found you finally... Change-Id: I71e11b570e31ad1cc470dfea3e54935e000d80f0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100011 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-08-03Missing include (std::max; Windows --disable-pch)Stephan Bergmann
Change-Id: I31d44c0a1791c58c0fc348fb2ec42fe2e2ec4323 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100003 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-03Make test operate on copy of .odb fileStephan Bergmann
For whatever reason, CppunitTest_dbaccess_hsqldb_test had recently started to modify binary dbaccess/qa/unit/data/hsqldb_empty.odb in-place. Change-Id: I07b5185ddf4b809ef1e1f977c5ab1c34e2e7f18a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100002 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-03loplugin:flatten in sfx2Noel Grandin
Change-Id: I2ff95614c82a6ed79e5ac593c85473a78ee41a62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99969 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-03Update git submodulesAlain Romedenne
* Update helpcontent2 from branch 'master' to f0fc51ab506034db25dd325a3b3b0e123af62e98 - tdf131416 Basic syntax diagrams - Close, Get, Put and Open statements Change-Id: I09a89ededbf65c41a65e3d347111c9dac10cfdde Reviewed-on: https://gerrit.libreoffice.org/c/help/+/99601 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-08-03oox smartart, linear layout: limit height of children to parent sizeMiklos Vajna
Constraints are OK to request more, but it seems PowerPoint doesn't allow leaving the parent, which simplifies the layout as well. Change-Id: Id67a8740f1eff506e4beae0c797ad50e0218dfe6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99993 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-08-03Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' to dc36eea48b4a2120911d0f99322ff4a35ea39eb6 - Update version 7.0 New features video Change-Id: I35fff323f6ccb6a035d87abcd8b08189276054e6 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/100000 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-08-03use more explicit types in xmloffNoel Grandin
instead of declaring them as a base-type, and then static-casting everwhere Change-Id: I53b901c5353bb39ca9a0357aa442f50d2f475e7d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99995 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-03rename Clear() to dispose() in SvXMLStylesContextNoel Grandin
to make it "clearer" this is part of the memory cleanup on destruction process Change-Id: I789bdfa0323cf759ed4db2e2a657e73e581d9eed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99990 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-03fix leak in SvXMLImportNoel Grandin
caused by a ref-counting cycle. to reproduce the leak do make CppunitTest_editeng_core \ VALGRIND='memcheck --leak-check=full \ --suppressions=$$BUILDDIR/solenv/sanitizers/valgrind-suppressions' \ CPPUNIT_TEST_NAME="testBoldItalicCopyPaste" Change-Id: I94dca092a75db8ddfaae4a210e1158fa066ed609 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99989 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-03avoid ref-counting cycleNoel Grandin
this doesn't fix the leak, just reduces the number of cycles involved here Change-Id: I31eda167864dc8b5cea2448f598e01f3a807481a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99988 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-03sw: SwFlyInContentFrame, SwHTMLTableLayoutCnts, SwHTMLTableLayoutColumn ...Miklos Vajna
... and SwTextFly See tdf#94879 for motivation. Change-Id: I833b563a03824ae14014cdd418dcfd3b832a9a94 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99984 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-08-03BASIC : no need to initialize manually std::unique_ptrArnaud Versini
Change-Id: I7e4780d41dd43383820cc3ae4ce5cfba24a53b7f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99942 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-08-03oox smartart, linear layout: fix scaling of spacing without rulesMiklos Vajna
With this, finally the arrow shape has the correct horizontal position and width, even if the markup is as complex as the PowerPoint UI generates it (the previous version was a more minimal version). Change-Id: I59f237c582053067e890180a1ae40471e5f46dea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99894 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-08-03loplugin:flatten in configmgr..i18nutilNoel Grandin
Change-Id: Idaeed33df4f1dd1b2acbdaf8a895c5d56c3ca14c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99980 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>