summaryrefslogtreecommitdiff
path: root/solenv
AgeCommit message (Collapse)AuthorFilesLines
2019-11-21tdf#42949 tdf#119699 Fix IWYU warnings in chart2/Gabor Kelemen1-1/+0
* Recheck after recent refactorings and improvements in f-u-i * Drop now unused TabPageIds.h * The problem noticed in bug #119699 now seems to be gone too so drop those lines from the blacklist. Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I44f26c7370f5328c8f67ac61cd8f0cdb29077f15 Reviewed-on: https://gerrit.libreoffice.org/83182 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-11-20/safeseh valid only on Win32Julien Nabet1-2/+3
On Win10 with master sources updated today + Visual Studio, I had this part: [build CXX] bridges/source/cpp_uno/shared/component.cxx Microsoft (R) Macro Assembler (x64) Version 14.23.28107.0 Copyright (C) Microsoft Corporation. All rights reserved. MASM : warning A4018:invalid command-line option : /safeseh Assembling: C:/BLP/core/bridges/source/cpp_uno/msvc_win32_x86-64/call.asm [build CXX] bridges/source/cpp_uno/shared/types.cxx See this link for rationale: https://docs.microsoft.com/en-us/cpp/build/reference/safeseh-image-has-safe-exception-handlers?view=vs-2019 According to https://bugzilla.mozilla.org/show_bug.cgi?id=581909 (9 years ago) "...For some reason ml64 ignores the -c following -safeseh..." I don't know if recent Visual Studio versions still ignore or not the following parameters but let's fix this Change-Id: I9ae5416f32429597fab35fcce8bf06707af4def5 Reviewed-on: https://gerrit.libreoffice.org/83230 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-11-20tdf#42949 Fix IWYU warnings in framework/*/*cxxGabor Kelemen1-1/+0
Also drop the now unused framework/inc/general.h Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I8e19036a507dbdcd178835b6ac4182719d27a654 Reviewed-on: https://gerrit.libreoffice.org/82744 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-11-16sort itemsStephan Bergmann1-6/+6
Change-Id: Ia55b9ce67b22f9cc012ce02208f501580d9f4634 Reviewed-on: https://gerrit.libreoffice.org/82986 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-16Improve loplugin:redundantpreprocessor performance a bitStephan Bergmann1-0/+1
...and add a minimal test for it Change-Id: Ia6c61e41a7e60fd01c639e893c34bd9d215c1513 Reviewed-on: https://gerrit.libreoffice.org/82983 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-15use icerun also for python/java/ui testsLuboš Luňák3-3/+3
Change-Id: If25c4949b999435e7a444d80a45f3dce9b8184ee Reviewed-on: https://gerrit.libreoffice.org/82715 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-11-15xmloff: create XMLDrawContentExportOasis instances with an uno constructorMiklos Vajna1-0/+1
See tdf#74608 for motivation. Change-Id: I4bb0ef49ef429df053af83ff0dd7d22edc2d907b Reviewed-on: https://gerrit.libreoffice.org/82742 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-11-14New loplugin:consttoboolStephan Bergmann1-0/+1
...to: "Find implicit conversions from non-'bool' constants (e.g., 'sal_False') to 'bool'". Due to how FALSE is defined as just #define FALSE (0) (i.e., a literal of type 'int') but TRUE is defined as #define TRUE (!FALSE) (i.e., an implicit conversion from 'int' to 'bool') in GLib (see the comment in ConstToBool::VisitImplicitCastExpr), we get more warnings about uses of 'TRUE' than of 'FALSE'. For example, in libreofficekit/source/gtk/lokdocview.cxx there is a warning about the 'TRUE' in g_main_context_iteration(nullptr, TRUE); but not about the 'FALSE' in g_main_context_iteration(nullptr, FALSE); (where the parameter of 'g_main_context_iteration' is of type 'gboolean'). Lets live with that asymmetry for now... (Besides the issues addressed directly in this commit, it also found the two bogus asserts at 7e09d08807b5ba2fd8b9831557752a415bdad562 "Fix useless assert(true) (which would never fire)" and 122a0be8ae480473bd1d7f35e197a2529f4621e3 "Fix useless assert(true) (which would never fire)", plus 5f0d6df7f57ae281fe161e61c7f25d67453fddd2 "Use two-argument form of static_assert".) Change-Id: Id77322de9f94b85a7b65608a03e0e9865d14467b Reviewed-on: https://gerrit.libreoffice.org/82667 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-14Adapt solenv/flatpak-manifest.in to a874172b9b048cfc6c4aa73cdf52c54b9b34872aStephan Bergmann1-3/+3
..."Update to language-subtag-registry-2019-09-16" Change-Id: If63e6ac9803f37b957099d7485d5dcd10c3b96cd Reviewed-on: https://gerrit.libreoffice.org/82674 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-13solenv/bin/native-code.py: Use python3Michael Weghorn1-2/+1
Change-Id: Ie09fc0505266a2a89d0b830294b6af370d5b7b61 Reviewed-on: https://gerrit.libreoffice.org/82582 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-11-13Extend loplugin:salbool to loplugin:fakeboolStephan Bergmann2-3/+3
...checking for unnecessary uses of more "fake bool" types. In the past, some of the checks involving the types of variables or data members, or the return types of functions, issued warnings that required surrounding code to be changed too (e.g., when changing the signature of a function whose address was taken). These checks have been tightened now to not warn in such cases (which avoids warnings that require changes to additional code, or changes that might even be impossible to make, at the cost of being less aggressive about removing all unnecessary uses of those "fake bool" types). Change-Id: I70eb75039817cda34ed611387ee27dc5f36a3e2e Reviewed-on: https://gerrit.libreoffice.org/82554 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-13external: update pdfium to 3963Miklos Vajna1-3/+3
Also simplify visibility.patch.1. Change-Id: I8b4ed78b314a1a1f7d31467f782877f056429cc2 Reviewed-on: https://gerrit.libreoffice.org/82548 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-11-13chart2: Separate ChartResourceGroups to reuseMuhammet Kara1-1/+0
Change-Id: I0ca2ea9cd520013250faaba0e17e713da1e6fca3 Reviewed-on: https://gerrit.libreoffice.org/81581 Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Tested-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/82462 Tested-by: Jenkins
2019-11-12chart2: Move some headers to incMuhammet Kara1-3/+0
So that they will be accessible from inside the sidebar dir. Change-Id: Iaf7b1a800a3b35a5c497d8122f68c97c8cdc9eff Reviewed-on: https://gerrit.libreoffice.org/80922 Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com> Tested-by: Muhammet Kara <muhammet.kara@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/82461 Tested-by: Jenkins
2019-11-12Clarify loplugin:external behavior for const(expr) varsStephan Bergmann1-0/+1
Change-Id: I4a649f9c9ed2015ed9b32a153060df9770b20403 Reviewed-on: https://gerrit.libreoffice.org/82493 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-11tdf#42949 Fix IWYU warnings in framework/*/*hxxGabor Kelemen1-1/+0
Also drop unused framework/inc/fwkdllapi.h Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I9e79266f273b778f4a8bd3330b1b0353a2e01a61 Reviewed-on: https://gerrit.libreoffice.org/81927 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-11-11Resolves tdf#128521 - illegal char in a bookmark nameHeiko Tietze1-0/+1
Message box removed and warning label introduced Some alignment and accessibility issues solved too Change-Id: Icc88d489268403fa3da525aadc1c007c589fa019 Reviewed-on: https://gerrit.libreoffice.org/82231 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2019-11-08sw: no reason why SwModelTestBase can be used only by "extras" testsMiklos Vajna1-2/+2
So move it one level up, this way more tests can share code in the future. Change-Id: I35300b3c88ac9a5c39916f53b1b1743aa85869a0 Reviewed-on: https://gerrit.libreoffice.org/82252 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-11-06Add org_apache_openoffice_comp_sw_sidebar_SwPanelFactory_get_implementationTor Lillqvist1-0/+1
That was not enough to make the sidebar show up, though. Change-Id: I5b647e499d5cb06691ad312757836ad6a0cc588e Reviewed-on: https://gerrit.libreoffice.org/82123 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2019-11-05Remove unused devsnapshotbuild codeStephan Bergmann2-7/+0
...which had been introduced, already unused, with 1e4422a4b4c443c286c90853f50b739a67ce5d1f "re-base on ALv2 code. Includes:" Change-Id: I5a26d7365c510e861bd25e0882cfe7292695107c Reviewed-on: https://gerrit.libreoffice.org/82108 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-05tdf#128288: Use DS_Store_Langpack even for --disable-release-buildStephan Bergmann1-2/+2
(cf. ScpAction scp_Copy_Ds_Store in scp2/source/ooo/scpaction_ooo.scp making use of this feature) Dev builds overruling the .DS_Store file for language-/helppacks appears to have been broken ever since dab79744767c05fd5268866937e225b74e658cea "Give Mac master builds a nice background .dmg image, too". Change-Id: I7473d1b0b35fe0b435e7d26c0639e26ed157245d Reviewed-on: https://gerrit.libreoffice.org/82107 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-04ProgressBar now only use in vcl and toolkitCaolán McNamara1-1/+1
Change-Id: I5d56a4df155806e41cafa6f65a3a030e8443b8f7 Reviewed-on: https://gerrit.libreoffice.org/82005 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-04FixedHyperlink now only used in vcl and toolkitCaolán McNamara1-1/+1
Change-Id: Id1eacb01ab7ed985d1495d3949bc185556246e3a Reviewed-on: https://gerrit.libreoffice.org/82003 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-04Merge in Flatpak improvementsStephan Bergmann1-5/+9
...from <https://github.com/flathub/org.libreoffice.LibreOffice/>: commit e31ae281213d5921c3704737a43da864c3e82d8e Author: Erick555 <37542552+Erick555@users.noreply.github.com> Date: Fri Oct 4 17:48:12 2019 +0000 Update to freedesktop 19.08 commit 5b49a9e3ca243910a094f9865e2cdda9e2cda098 Author: Erick555 <37542552+Erick555@users.noreply.github.com> Date: Fri Oct 4 18:36:52 2019 +0000 Add krb5 It's no longer available in runtime commit a0f49157b0774929974f04f8747adf5ff5686287 Author: Stephan Bergmann <sbergman@redhat.com> Date: Fri Oct 11 10:35:44 2019 +0200 gperf 3.1 is available in the Sdk now ...according to <https://gitlab.com/freedesktop-sdk/freedesktop-sdk/commit/ caef17cbb3cdad5c111eda8eb83a140bfacc380a> "NEWS: Update for freedesktop-sdk-18.08.22" Change-Id: Ibb0cd4bbd68bd4180f7f9af3afbf8638dd2be9e8 Reviewed-on: https://gerrit.libreoffice.org/82011 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-11-02New loplugin:conditionalstringStephan Bergmann1-0/+1
Change-Id: I2eab990c15f845b44a3b598571aca361dadf9ff3 Reviewed-on: https://gerrit.libreoffice.org/81946 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-31fix label alignmentCaolán McNamara1-2/+0
Change-Id: Ic2fa0432d5bbba6f1e520e36cada4743dcd8e4af Reviewed-on: https://gerrit.libreoffice.org/81770 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-30imgctrl.hxx only used by vcl and toolkitCaolán McNamara1-1/+1
Change-Id: I77e2efa77d9fbc0830553faed269e1fec2b2a286 Reviewed-on: https://gerrit.libreoffice.org/81713 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-30SpinButton only needed by vcl and toolkitCaolán McNamara1-1/+1
Change-Id: I1a99231a895269bc728ed7730fe277bb8e73a25e Reviewed-on: https://gerrit.libreoffice.org/81711 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-29can move iconviewimpl.hxx beside iconviewimpl.cxxCaolán McNamara1-1/+1
Change-Id: I48d5df7d6ebf8e22a265e163caaf759ac703f616 Reviewed-on: https://gerrit.libreoffice.org/81681 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-29svimpbox.hxx now only included by vclCaolán McNamara1-1/+1
Change-Id: I0dd7691d0be8a3f54a7bcace17a36dce0ed17931 Reviewed-on: https://gerrit.libreoffice.org/81677 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-29SvtURLBox not used in any .ui files anymoreCaolán McNamara1-1/+0
Change-Id: I03802d3345ce29f52d026f2638cb19d6209cd9e2 Reviewed-on: https://gerrit.libreoffice.org/81495 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-29weld fpicker clusterCaolán McNamara2-9/+8
Change-Id: I6566263809ff0032388a0b56571f0cf7428058d7 Reviewed-on: https://gerrit.libreoffice.org/81334 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-25xmloff: create XMLDrawMetaExportOasis instances with an uno constructorMiklos Vajna1-0/+1
See tdf#74608 for motivation. Change-Id: I6dc4fcd75517c137c1bd4de766f67b73eaff1788 Reviewed-on: https://gerrit.libreoffice.org/81480 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-10-23-W4 must come before -Wno-missing-braces for clang-clStephan Bergmann1-1/+1
...or else -W4 would re-enable that and cause lots of warnings/errors. 87608490f205b2fbc2b453ad8ded33050ac29b90 "filter arguments to MSVC to avoid the annoying D9025 warning" had changed the relative order of those options on the command line. Change-Id: I2ff9de93cdc6e3dc63961af61169f0adf44f7c0b Reviewed-on: https://gerrit.libreoffice.org/81403 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-23Enable our gdb pretty-printers when printing backtracesStephan Bergmann1-1/+2
(-iex aka --init-eval-command appears to be supported by gdb since <https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit; h=8320cc4fa3784dc5296745898de5357559f8125a> in 2012, so it is probably safe to assume it is generally available) Change-Id: I65134d62ecd509ab39fa42f3cddbef40b74ab9d0 Reviewed-on: https://gerrit.libreoffice.org/81393 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-21move AutocompleteEdit to fpickerCaolán McNamara1-2/+2
Change-Id: I00b1b4f21ffcb183d098b8af296e1dea64a2a482 Reviewed-on: https://gerrit.libreoffice.org/81177 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-21update remotefilesdialog.uiCaolán McNamara1-2/+0
Change-Id: I23cbd7683e89d53a159a62daa92107051ad838a0 Reviewed-on: https://gerrit.libreoffice.org/81178 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-19drop unused ListControlCaolán McNamara1-2/+0
Change-Id: I19dd8907c36d016b939ed346a4308e5df2ebf93c Reviewed-on: https://gerrit.libreoffice.org/81060 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-19weld ScDataProviderDlgCaolán McNamara2-2/+1
drop changing the button colors, every other button is content not to change its color. fix up some crashes while I'm here. Change-Id: Icec54106441810a5152e7dab3ac7d5a55551ab07 Reviewed-on: https://gerrit.libreoffice.org/80994 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-18Remove useless and wrong mask; it turns signed short into unsignedMike Kaganski1-2/+2
Change-Id: I8d428517cd2e9d3155a4aac513538aeb32065b4d Reviewed-on: https://gerrit.libreoffice.org/81027 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-10-18xmloff: create XMLDrawSettingsExportOasis instances with an uno constructorMiklos Vajna1-0/+1
See tdf#74608 for motivation. Change-Id: I25fbd841a8f91b51787cebd4b94f5a62cb0d9e07 Reviewed-on: https://gerrit.libreoffice.org/80996 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-10-17drop ScCsvTableBoxCaolán McNamara1-1/+0
Change-Id: Id73eb4c941ac9bcf75c518cefba795de587edbd9 Reviewed-on: https://gerrit.libreoffice.org/80957 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-17SvxLanguageBox is now unusedCaolán McNamara1-1/+0
Change-Id: I5aafb53bb9885b8b0b43161f1afc79852b1d89a3 Reviewed-on: https://gerrit.libreoffice.org/80767 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-17SvxTextEncodingBox is now unusedCaolán McNamara1-2/+0
Change-Id: I0276d79cd713357d36d504e8501cd1b979e86c9c Reviewed-on: https://gerrit.libreoffice.org/80766 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-17weld ScImportAsciiDlgCaolán McNamara1-1/+0
notably the csv control is always LTR even in RTL mode, but the surrounding ScrollingWindow follows the environment direction, except the horizontal scrolling widget itself must LTR scroll. Change-Id: I72ee2b9dade73a11bcc4391e755fdb02886a884d Reviewed-on: https://gerrit.libreoffice.org/80765 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-17tdf#108350 writerfilter: restore TimesNewRoman as default fontJustin Luth1-0/+1
Followup for LO 5.4 commit 6f2ad89b33d972f9642bb53eeb91f41df3b6b0e6 which set Calibri/11pt as default. That is true if there is no style.xml file, or more specifically if there is no DocDefaults rPrDefault node. But if that node exists, then the age-old defaults are still valid. Earlier in LO 4.3, the default templates changed to use Liberation fonts by default. But in the same vein as using Calibri (and depending on LO to fallback to Carlito), set Word's default Times New Roman font and depend on LO to fallback to Liberation. That will make it better for MSWord users who share the document and who have less likelihood of knowing about Liberation/Carlito. Note that 10pt fontsize was already added to m_pDefaultCharProps earlier, so that part was already reset long ago. Change-Id: I3ba8a529fe95b05fbe2889cf1ebdbabb25963e8b Reviewed-on: https://gerrit.libreoffice.org/80854 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
2019-10-15handle gracefully PCH reuse when there are no .pdb filesLuboš Luňák1-3/+8
In non-debug builds there are indeed no .pdb files to copy and reuse, and that's fine. Change-Id: I083a33ae81ac63b4e62f3a7cf0f8414996c6a843 Reviewed-on: https://gerrit.libreoffice.org/80812 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-15new loplugin:bufferaddNoel Grandin1-0/+1
look for OUStringBuffer append sequences that can be turned into creating an OUString with + operations Change-Id: Ica840dc096000307b4a105fb4d9ec7588a15ade6 Reviewed-on: https://gerrit.libreoffice.org/80809 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-14use common PCH for more librariesLuboš Luňák1-0/+6
Change-Id: I53164be413426691025a63cfba731cf5f9d1b7f8 Reviewed-on: https://gerrit.libreoffice.org/80790 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-14fix incorrect gb_DISABLE_PCH_REUSE testLuboš Luňák1-2/+2
Change-Id: Ife41ea7ad19c03b8dca6afe8b15d0f3b752b533b Reviewed-on: https://gerrit.libreoffice.org/80789 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>