summaryrefslogtreecommitdiff
path: root/desktop
AgeCommit message (Collapse)Author
2021-03-21update pchesCaolán McNamara
Change-Id: I60e61133c305673bb305e41957f5414820c7c358 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112790 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-19tdf#122406: only restart when user accepted the license agreementBayram Çiçek
In Tools > Extension Manager, LO requires restart after declining the license agreement on the *first* try. Don't need to restart LO because no change made. - Current location of fireModified() function doesn't respect this decision. - fireModified() has moved to proper location. Change-Id: I24cb7bcf93d1fff3172b6b4110f17aef00ef97a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112468 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-03-18Resolves tdf#66470 - Scaling value in statusbarHeiko Tietze
Changes also the sort order at the options Change-Id: I61c231fb94d4b4c66358a17e7585609e31eb6a70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111947 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2021-03-15Calc: Update selected cell range before calculating the selection area.Gökay Şatır
Change-Id: I7a814be03acb246e1eb9d68425418ee1357510fd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112472 Tested-by: Jenkins Reviewed-by: Dennis Francis <dennis.francis@collabora.com> Reviewed-by: Gökay ŞATIR <gokaysatir@collabora.com>
2021-03-14tdf#139734 Drop redundant asserts after MacrosTest::loadFromDesktopdipanshu124
MacrosTest::loadFromDesktop itself asserts on its return value. Thus, there additional checks in unit tests are redundant. Change-Id: Iec9be2293c6337fa747c78a0963e31aa99b60772 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111810 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-03-13merge the various SetPointFont via DefaultDevice callsCaolán McNamara
Change-Id: I769bb95c588c7222ff0dc6c4b845dfc3f0d7cbc0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112390 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-13update pchesJulien Nabet
Change-Id: Id6dfae9fb97fbe3fc89b9f2e083d7a3d5c1d36d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112411 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-03-12use preferred variant when window arg is nullCaolán McNamara
Change-Id: I8fad194b6f147b40ecee6fff9fbbe947e7faa014 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112345 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-10Drop 'static_cast<cppu::OWeakObject*>' syntactic noiseMike Kaganski
... where the object is created in-place, and its type is known Change-Id: Ifabfcf2f3ad0d60152f14e8d970c1faa42115288 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112256 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-03-09Make sal/config.h the first in pchMike Kaganski
By convention, it should be the first include in C/CXX files; so use of pch should not break that. Change-Id: Ic329c5f39e8f48ad1778724368e262e48972342b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112123 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-03-08Fix build of Extension_test-{active,passive}Stephan Bergmann
Partial reverts of 1553d3787cbe0cdababf31382bf3376a3640d8cf "use for-range on Sequence in d*" and e37e990650694d7d3a44a38a6bf23751bb33da67 "tdf#88205 Adapt uses of css::uno::Sequence to use initializer_list ctor", plus loplugin:redundantstatic. Change-Id: Icf934bd21b0649d8fe9e88a453b6fc4d821ab6d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112156 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-03-06update pchesJulien Nabet
Change-Id: Id892e426343746df2f01f4cdc5f470351bdb6a12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112099 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-03-06update pchesJulien Nabet
I just used ./bin/update_pch.sh Change-Id: I06a7f36eb4c511b8d6c6477fd87e57f0d9702457 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112097 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-03-04Init Notebookbar for Online Drawmert
Signed-off-by: mert <mert.tumer@collabora.com> Change-Id: I85a25820d3968070dd8a05156b4bb4a1ebe59f99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111517
2021-03-03update pchesCaolán McNamara
Change-Id: Ide49c48738ecd537d4eb69390d22807561d3b4e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111828 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-03lok: add batch mode option to load the documentHenry Castro
When the LibreOffice Kit is active by default is set to headless mode, with the flag "DialogCancelMode::Silent", according to the documentation it should close the dialog, but it was changed for dialog tunneling. However the dialog tunneling is being deprecated, and in order to not produce any regression, it will be used temporary a new state "DialogCancelMode::LOKSilent", to disable any dialog interactivity. Change-Id: I3b6cce38c37f75dc1b24dda352f6caec19438ff1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111087 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 5f3fbb019bd79bd57eed94e01bd2202efd9a0c06) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111319 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2021-03-03lok: send paragraph spacing stateSzymon Kłos
Change-Id: Ibb2fcbcb077ad364159ce77ad7d4c6a67443deef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109940 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111839 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2021-02-26move lok FloatingWindow closing code to vclCaolán McNamara
Change-Id: I8e2c29e2c6450f79a7b80262f290b6afd13db7f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111627 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-23update pchesCaolán McNamara
Change-Id: I44424081b7f55710c4db7f10d1829de1ae08be76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111363 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-22loplugin:refcounting in desktopNoel
Change-Id: If62998173edb3961beb32de484eba000bd28f4d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111301 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-02-19update pchesCaolán McNamara
Change-Id: Ic4586057346b6de700c1bb6ff4cd759a11bb3e4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111231 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-19move VclBuilder::preload so desktop doesn't need to include that headerCaolán McNamara
Change-Id: I72f2b21cb9ac0b39995887afcf41189f2e7ad284 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111219 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-17loplugin:referencecasting in desktopNoel
Change-Id: I19da92c3cbf082965f01fd2339f42419f4229aa1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111056 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-02-17Move DXF reader from filter module into VCLTomaž Vajngerl
Change-Id: If1a933256401c1a971f581d1b389ca06fd77eaae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111022 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-02-15tdf#121245: also set ooLocale when language is set by command lineMike Kaganski
ooLocale is re-written in each invocation of langselect::prepareLocale from Desktop::Init; previously an exception was when it was set by command line. This special treatment was from initial '--language' implementation in commit d47dd2bf33b0a2a9a5251a871bb7fe0573724274. The problem here is this setting is the fallback for multiple code paths, so many UI elements got language from old ooLocale data in that case. This setting is re-written every time the program is started, so it should be no harm in writing it also in command line case. Alternatively we could try to fix all places to use configured system UI language from MsLangId instead, or to create a backend layer for ooLocale that itself uses that. Change-Id: Idf7212901620bc158f704ba21747294634e48ae1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110776 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-02-11lok: rework form field button message handling.Tamás Zolnai
To make it work properly with more users editing the same document. Change-Id: I1f3d8ef9fc9c25b440a3dc36a40709723ed342f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110710 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 20335d5ed549af25f02467c7da21df10c8df956a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110759 Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2021-02-08update pchesCaolán McNamara
Change-Id: Icf55ddda055d11b649e7607c2cdd8b6d6ddfefbc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110483 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-08Improve loplugin:cppunitassertequal for CPPUNIT_ASSERT(a && b)Stephan Bergmann
...by re-enabling the code temporarily #if'ed-out in a528392e71bc70136021be4e3d83732fccbb885e "Fixed/improved loplugin:cppunitassertequals" (and which then triggers lots of other lopglugin:cppunitassertequal CPPUNIT_ASSERT -> CPPUNIT_ASSERT_EQUAL warnings). For two css::uno::Reference equality comparisons in cppu/qa/test_any.cxx, it was more straightforward to rewrite them with an explicit call to operator == (which silences loplugin:cppunitassertequal) than to adapt them to CPPUNIT_ASSERT_EQUAL's requirement for arguments of identical types. In sc/qa/unit/ucalc_pivottable.cxx, ScDPItemData needs toString, which has been implemented trivially for now, but might want to combine that with the DEBUG_PIVOT_TABLE-only ScDPItemData::Dump. Change-Id: Iae6d09cf69bd4e52fe4411bba9e50c48e696291c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110546 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-02-06weld annotation windowCaolán McNamara
note the labels in sw/uiconfig/swriter/ui/annotation.ui are deliberately yaligned to 0 to retain the preexisting SwAnnotationWin::PaintTile hack which depends on this for bin/run gtktiledviewer --enable-tiled-annotations to not show clipped author/date/etc labels Change-Id: I53827aa98ed4d71d532a5993d21c6e22190b8063 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107264 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-05Revert "Fix typo in code"Stephan Bergmann
This reverts commit 3ed9bba283a6a67864c0928186e277240be0d9ba. osl_Pos_Absolut (include/osl/file.h) is part of the stable URE interface; it must not be changed. Change-Id: I1f49923a9351e4be5aee39b10720d38b424feb9b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110435 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-02-04Fix typo in codeAndrea Gelmini
Change-Id: Ib8b306a27d25a34e784aeeb72708b0d5d1511f3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110394 Tested-by: Jenkins Reviewed-by: Andrea Gelmini <andrea.gelmini@gelma.net>
2021-01-29loplugin:stringviewparam extend to new..Noel
O[U]StringBuffer methods Change-Id: I0ffbc33d54ae7c98b5652434f3370ee4f819f6f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110090 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-01-28simplify code, use more subView()Noel
Change-Id: I569c7f34acbdf8451cd5c9acf1abd334637072d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110051 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-01-28TopLeft().Y() -> Top() etc.Caolán McNamara
TopLeft().X() -> Left() BottomLeft().X() -> Left() TopRight().X() -> Right() BottomRight().X() -> Right() TopLeft().Y() -> Top() TopRight().Y() -> Top() BottomLeft().Y() -> Bottom() BottomRight().Y() -> Bottom() Change-Id: I5050f619bf92cfc59b6f8dfe7c9f98ef1453c294 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110022 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-01-24-Werror,-Wsign-compare (clang-cl)Stephan Bergmann
Change-Id: I887d8bc4554880ca826259c8f9b30aaa3b41ec1d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109820 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-01-21remove deprecated [x|y]align property for CheckBoxes and RadioButtonsCaolán McNamara
the gtk default is left aligned, change the vcl one to match and drop the deprecated and unnecessary [x|y]align Unfortunately on load glade's inline preview shows centered alignment, though its "true" preview tool shows left alignment and unsetting and resetting draw-indicator will update the preview to show the alignment which will be used: https://gitlab.gnome.org/GNOME/glade/-/issues/502 See https://gitlab.gnome.org/GNOME/glade/-/merge_requests/110 for my stab at making glade do the right thing. Change-Id: If454e9ce8462e6b271d2423fe7e8a55788e01fac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109487 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-01-21Do not skip cursor invalidation if hyperlink in payloadPranam Lashkari
Change-Id: Iba08f9a52a282bdab890eeb4194222d0b576d64b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109664 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit f7b31b02f2fe28f75d2a70c0261897aba4a7b72d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109676 Tested-by: Jenkins Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
2021-01-21lok: unit test incorrect cursor positionHenry Castro
Test to not send client side cursor position (0,0) due to: mpOutlinerView->SetOutputArea( PixelToLogic( tools::Rectangle(0,0,1,1) ) ); Change-Id: Ib5cd7f1c0c45073c5d2039e8b889d3a6fd7ef70c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109417 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 08d45119cfb875fa8a5c03d6e946a47f0f680932) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109733 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2021-01-20make crashreports include info about the system (CPU,memory)Luboš Luňák
This may be useful when we again will be deciding on how well something is or isn't supported (such as when we were making SSE2 required on Windows). Breakpad already kind of provides this information (as CPU family, model and stepping), but that appears to be next to useless in practice (on X86_64 it doesn't even say the CPU vendor). So send as metadata CPU name, flags (SSE etc.) and system RAM, as these may be possibly useful information. Change-Id: I77ed935d78501d49f70e8b9769fab6be79f1db77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109358 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-01-19Fix unoinfo on macOSStephan Bergmann
...after 4b9190fc29aec0f005f08c0269bb9ff081f19fe3 "mac: don't put script files into Contents/MacOS or framework-bin directory" moved it from Contents/MacOS/ to Contents/Resources/ Change-Id: I90da34f73463baa516e81f6d06bd718f08e93af0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109627 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-01-18mac: don't put script files into Contents/MacOS or framework-bin directoryChristian Lohmaier
Signing them as executable code would require external attributes, and those in turn break packaging into hfs+ dmg when building on apfs with Big Sur. It is not a new thing - the old Code Signing in Depth technote https://developer.apple.com/library/archive/technotes/tn2206/_index.html already reads: "Store Python, Perl, shell, and other script files and other non-Mach-O executables in your app's Contents/Resources directory. While it's possible to sign such executables and store them in Contents/MacOS, this is not recommended. […] Put another way, a properly-signed app that has all of its files in the correct places will not contain any signatures stored as extended attributes." The patch does exactly that for LO and the shipped python framework and adds symlinks for the moved files. Same applies for the Language pack applescript and the tarball - those are also moved into Contents/Resources Change-Id: Iab21e77b73f941248ca89c6e80703fdf67a1057c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109537 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-01-17tdf#138122 Add window scaling for retina displays on macOSThorsten Wagner
(1) Remove hack to make application look as if being linked against SDK 10.13 (2) Use quad storage size on virtual devices for displaying on retina displays thereafter (3) Apply workaround to downsample bitmaps from scaled layers (to be implemented) (4) Disable dark mode (to be implemented) (5) Provide new environment variables: VCL_MACOS_FORCE_WINDOW_SCALING: window scaling on non retina displays VCL_MACOS_FORCE_DARK_MODE: enable dark mode (macOS 10.14, iOS 13 and newer) VCL_MACOS_USE_SYSTEM_APPEARANCE: use light mode or dark mode (macOS 10.14, iOS 13 and newer) as configured by system preferences Change-Id: I99877cd62a98cb91bcbf27af62b043c31c5f5fc9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109072 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2021-01-17fix rendershapeselection for drawingMert Tumer
Change-Id: Id4cb37885bf9b442adc679b895d89cd615ffb2ee Signed-off-by: Mert Tumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108681 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109213 Tested-by: Jenkins
2021-01-16make the Color constructors explicitly specify transparencyNoel
to reduce the churn, we leave the existing constructor in place, and add a clang plugin to detect when the value passed to the existing constructor may contain transparency/alpha data. i.e. we leave expressions like Color(0xffffff) alone, but warn about any non-constant expression, and any expression like Color(0xff000000) Change-Id: Id2ce58e08882d9b7bd0b9f88eca97359dcdbcc8c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109362 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-01-15fix location of change tracking boxes in OnlineNoel Grandin
Change-Id: I65fcb52e224dce7df2a5a7baed2b8f23d0d49397 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108849 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2021-01-15replace stock button labelsCaolán McNamara
Change-Id: I726ba7846322863d9f38314b6c6ccc7f71124a0a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109197 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-01-10fix coverity parse errorsCaolán McNamara
Change-Id: I4884bfb67a061b865e8cf38b2fea6de0cb1bc3d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109057 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-01-09fix coverity parse errorsCaolán McNamara
Change-Id: I3a1179947704452e3ffec02be59d0f7bf0b75ab0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109017 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-01-05lok: add interaction handler "macro security" confirmationHenry Castro
When a client side request to load document with macros embedded, it will show the "Macro Security Warning" message dialog. Change-Id: Id848980a4fd3a5138bc98c43e57044f7d5ce3189 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108292 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2021-01-05lok: add missing global notifierHenry Castro
Occurs when server shows the "Macro Security Warning" before load the document if enable/disable macros, but there are no instances for document/view/controller yet. So it is required to use the global notifier so it can be sent messages to the client side using the JSDialog framework. Change-Id: I67f15b21cbaf21906b88145f3c5835cf0e1ff79d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108288 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>