summaryrefslogtreecommitdiffstats
path: root/basctl
Commit message (Collapse)AuthorAgeFilesLines
* use Image(OUString) instead of Image(Bitmap(OUString))Noel Grandin2019-09-305-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | which benefits LOOL since we can delay creating the image until we know the dpi setting of the display we are going to write to. Achieved by perl -pi -w -e "s/\bImage\s*\(\s*BitmapEx\s*\((\w+)\s*\)\s*\)/Image\(\1\)/g" $( git grep -lw "BitmapEx" ) followed by git grep -nP '\bImage\s*\(\s*BitmapEx\s*\(' followed by commenting out the BitmapEx(OUString) constructor and seeing what needed adjusting. Reviewed-on: https://gerrit.libreoffice.org/64760 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/64860 Tested-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 89161e4d5835b93f0942e960a116a0d3863cc55c) Change-Id: I3224e11937d720fa484b0d659d25673a9e809267 Reviewed-on: https://gerrit.libreoffice.org/79844 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* Resolves tdf#122707 - Replace listbox for print range by radio buttonsheiko tietze2019-09-262-7/+15
| | | | | | | | | | | | | | Some changes to the ui file (GtkGrid, alignment, radio buttons), setChoiceRadiosControlOpt() instead of *list Labels adjusted accordingly Patch partially reverts I62bd9affc9e065d7afcc60296a72eae4612b0ddd Reviewed-on: https://gerrit.libreoffice.org/68846 Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> (cherry picked from commit 044fa501e95dcac8120767996dfb7ba8f25a703f) Change-Id: Ia06b8f2513d98fbdb1971477cf7b7127595d338c
* Adds print even pages/print odd pages options in print dialogDaniel Silva2019-09-263-4/+38
| | | | | | | | Change-Id: I17733d83cc652be8c5abaf20cd4b5e23d3a577a1 Reviewed-on: https://gerrit.libreoffice.org/57380 Tested-by: Jenkins Reviewed-by: Daniel Silva <danielfaleirosilva@gmail.com> (cherry picked from commit faf2b0f165e9d9e3160e5d54e3d2e9973facf0b8)
* Configures page range in print dialogDaniel2019-09-262-12/+9
| | | | | | | | Change-Id: I62bd9affc9e065d7afcc60296a72eae4612b0ddd Reviewed-on: https://gerrit.libreoffice.org/55840 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 76e22667625ce8d16dfaa8617a199b774e987a70)
* Remove Help - Restart in Safe Mode menu itemAndras Timar2019-06-151-2/+0
| | | | Change-Id: I2a3cdbc73a0a4033b60f0d67b3673bd24e4fce50
* Remove Help - Donate to LibreOffice menu itemAndras Timar2019-06-151-3/+0
| | | | | | ... and remove Help - Get Involved menu item, too Change-Id: I7a701173f596306ee628ae4a12ad81d2d756caca
* Resolves: tdf#124704 need to state the area the tooltip is forCaolán McNamara2019-04-301-7/+12
| | | | | | | | | to make it work under gtk3 Change-Id: I4c895181af233a16292ce16b194f0a60994446fb Reviewed-on: https://gerrit.libreoffice.org/71479 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
* Resolves: tdf#124984 organize basic macro new added module doesn't show upCaolán McNamara2019-04-291-1/+3
| | | | | | | Change-Id: I422131ab203eba62ed5cf6fb2e19e23325b43f6e Reviewed-on: https://gerrit.libreoffice.org/71434 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
* Resolves: tdf#124028 dangling "completion" entries block responsesCaolán McNamara2019-03-141-1/+0
| | | | | | | | | | | | | | | | | | | | | so e.g. math font dialog doesn't react to button clicks. since... commit ab8e0f5832fa910f8b1abd36d7cb3929cbac2395 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Jan 18 17:08:58 2019 +0000 Resolves: tdf#122484 replace gtk autocomplete with vcl-alike autoselect remove the entrycompletions but left the reference to them Change-Id: Ia02d0e657fc114692f69f88890192c470a1cab22 Reviewed-on: https://gerrit.libreoffice.org/69209 Tested-by: Jenkins Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Resolves: tdf#122484 replace gtk autocomplete with vcl-alike autoselectCaolán McNamara2019-01-221-8/+0
| | | | | | | | | Change-Id: I941e32a973cdd1bc79e3739b24fdf834aa52cb11 Reviewed-on: https://gerrit.libreoffice.org/66688 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Resolves: tdf#122598 avoid crash on macro recording endCaolán McNamara2019-01-111-12/+8
| | | | | | | | | Change-Id: Ie9f9fc8b4a4a7852a5da37c7d190ca020391012e Reviewed-on: https://gerrit.libreoffice.org/66029 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* weld OfaSwAutoFmtOptionsPageCaolán McNamara2018-12-041-1/+1
| | | | | | | | Change-Id: Ia88fe2562dd87b33fdec0081a3adf27c8d10f407 Reviewed-on: https://gerrit.libreoffice.org/64474 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* allow collapsing rowsCaolán McNamara2018-11-251-1/+4
| | | | | | | | Change-Id: I6b137e4fbb860a1d40acc961dae413bcdb27575a Reviewed-on: https://gerrit.libreoffice.org/63941 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* weld SwCondCollPageCaolán McNamara2018-11-223-18/+10
| | | | | | | | | | | | and put back original SvTreeListBox a11y factory use Change-Id: I4ad8ce29d8fed6ec5d44e9a1d641919a89226b79 Reviewed-on: https://gerrit.libreoffice.org/63501 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 47897fdd936d9b6e9ac8cb6110c79352ab080df7) Reviewed-on: https://gerrit.libreoffice.org/63770
* tdf#42949 Fix IWYU warnings in include/vcl/[ab]*Gabor Kelemen2018-11-221-0/+1
| | | | | | | | | | | | | | Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: If18c80fc64e55d797953e24e40e5d5e62bd9c625 Reviewed-on: https://gerrit.libreoffice.org/63453 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 492ea7e08571e466e37f870b7642a79df55c2e92) Reviewed-on: https://gerrit.libreoffice.org/63768 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* processing treeview entries in the wrong orderCaolán McNamara2018-11-211-2/+1
| | | | | | | | Change-Id: Ica2240750273996a84ebcf0b8c089aedbbc6c913 Reviewed-on: https://gerrit.libreoffice.org/63712 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* weld TreeViewCaolán McNamara2018-11-1915-371/+1793
| | | | | | | | | | | | | a) use GtkTreeStores for GtkTreeViews b) ironically can't store GtkTreeStore contents in .ui apparently c) set show_expanders for all non-trees and unconverted cases d) on-demand subtrees Change-Id: I3c1036a222daba2c129b1a22ffeb3fe35005ae31 Reviewed-on: https://gerrit.libreoffice.org/63558 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Adapt to C++2a char_tStephan Bergmann2018-11-171-1/+1
| | | | | | | | | | u8 literals incompatibly change their type (as implemented by recent Clang trunk) Change-Id: Ia4f7b91f5d86656a056303d2754981ab2093a739 Reviewed-on: https://gerrit.libreoffice.org/63494 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* tdf#42949 Fix IWYU warnings in include/svl/*Gabor Kelemen2018-11-142-0/+2
| | | | | | | | | | Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ide75232858599c275e023c2300201090acd22307 Reviewed-on: https://gerrit.libreoffice.org/63237 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
* tdf#39593 deduplicate code in TreeListBoxtagezi2018-11-142-57/+33
| | | | | | | | | Separates filling treelist for macros and dialogs to function Change-Id: I5803b94617ed6136f97be922c9da9d705f30b9b0 Reviewed-on: https://gerrit.libreoffice.org/63346 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
* loplugin:singlevalfields in accessibility..extensionsNoel Grandin2018-11-122-13/+0
| | | | | | | Change-Id: Id3a3241af83f769fc60f67e01c9129d6f4b5c2af Reviewed-on: https://gerrit.libreoffice.org/63274 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* move SvTreeListBox to vclCaolán McNamara2018-11-078-13/+13
| | | | | | | | Change-Id: I04a146d3d8a428ac1678827dc883525c40240a44 Reviewed-on: https://gerrit.libreoffice.org/62787 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* loplugin:collapseif in accessibility..cuiNoel Grandin2018-11-061-5/+2
| | | | | | | Change-Id: I1437b493f3289b4ac97d061bd71973580571e792 Reviewed-on: https://gerrit.libreoffice.org/62933 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* tdf#120703 PVS: this fix was wrongMike Kaganski2018-11-051-4/+7
| | | | | | | | | | This partially reverts commit 2a3f5d11522cd69f0ce221cde3a63b7e85e94b53 to reimplement the proper index check. Thanks to Svyatoslav Razmyslov. Change-Id: If0928eed8ff137efbb2d7605135375d147e9accf Reviewed-on: https://gerrit.libreoffice.org/62862 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
* tdf#120703 PVS: V547 Expression is always true/falseMike Kaganski2018-11-032-30/+18
| | | | | | | Change-Id: I856345576ff5c10a41509a97ad4539272bd55568 Reviewed-on: https://gerrit.libreoffice.org/62803 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
* fix signatures of deleted copy/assign operatorsNoel Grandin2018-11-021-1/+1
| | | | | | | Change-Id: Id1a0749b78a7021be3564487fb974d7084705129 Reviewed-on: https://gerrit.libreoffice.org/62718 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* loplugin:returnconstantNoel Grandin2018-10-304-13/+9
| | | | | | | Change-Id: I5b859de6ccd908eee4356acbe1f12b441ab36df3 Reviewed-on: https://gerrit.libreoffice.org/62539 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* tdf#42949 Fix IWYU warnings in include/unotools/*Gabor Kelemen2018-10-261-0/+1
| | | | | | | | | | Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I444c43b9d549977039f25bec2b5bf666c3e15e0e Reviewed-on: https://gerrit.libreoffice.org/62041 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
* weld AdvancedSettingsDialogCaolán McNamara2018-10-241-1/+1
| | | | | | | | | | | | make run virtual and fold executes into it, so GenericUnoDialog can call run on tabdialogs to do the right thing, and allows Start_Impl to be private again Change-Id: Ic457edfbdc7457f4c49d4e8ad679903f38ad9b42 Reviewed-on: https://gerrit.libreoffice.org/62227 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* clang-tidy performance-unnecessary-copy-initialization inNoel Grandin2018-10-2312-65/+64
| | | | | | | | | basctl..basic Change-Id: I4009282869cd8a2f269093564bd4fafccab80ec3 Reviewed-on: https://gerrit.libreoffice.org/62212 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* tdf#120674 set DlgEdForm early in DlgEdObj::EndCreateArmin Le Grand2018-10-221-3/+16
| | | | | | | Change-Id: I5ba0504265f5692614a8db0117883528bd4bfc0b Reviewed-on: https://gerrit.libreoffice.org/62000 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
* clang-tidy readability-container-size-emptyNoel Grandin2018-10-191-1/+1
| | | | | | | Change-Id: I1df70b7dff5ebb6048f7fc618789faa15ca5d422 Reviewed-on: https://gerrit.libreoffice.org/61967 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* clang-tidy readability-redundant-smartptr-getNoel Grandin2018-10-172-3/+3
| | | | | | | | | redundant get() call on smart pointer Change-Id: Icb5a03bbc15e79a30d3d135a507d22914d15c2bd Reviewed-on: https://gerrit.libreoffice.org/61837 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* loplugin:staticvar in avmedia..connectivityNoel Grandin2018-10-171-1/+1
| | | | | | | Change-Id: I5dcac79131c810787e8fa49df75e55cc78147860 Reviewed-on: https://gerrit.libreoffice.org/61834 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* Related: tdf#120612 help response missing from other help buttonsCaolán McNamara2018-10-163-0/+3
| | | | | | | | Change-Id: I982b4190f5af2715f797ecd9bf798e4b4af0ecda Reviewed-on: https://gerrit.libreoffice.org/61828 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* tdf#120264 - Access to "Get Involved"heiko tietze2018-10-091-0/+1
| | | | | | | | | | | UNO command SID_GETINVOLVED added with access to the website from all main menus under Help Dispensable ellipsis removed from other UNO commands around Help Change-Id: I79536be3de31f55a7b208bcdd5a243e05b3d3668 Reviewed-on: https://gerrit.libreoffice.org/61238 Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
* cppcheck: knownConditionTrueFalseJochen Nitschke2018-10-081-5/+2
| | | | | | | Change-Id: I245a353b69af7dcedf4c0f3f1271f1fdf86fd09c Reviewed-on: https://gerrit.libreoffice.org/61523 Tested-by: Jenkins Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
* tdf#42949 Fix IWYU warnings in include/comphelper/[m-z]*Gabor Kelemen2018-10-081-0/+1
| | | | | | | | | | Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I04c5ba277d5b3398c07de6ae66713d977636088d Reviewed-on: https://gerrit.libreoffice.org/61347 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
* drop some now unnecessary includesCaolán McNamara2018-10-061-6/+0
| | | | | | | | Change-Id: Idb41ddc0ff01333bac6cfce8bdd5e80c3c101de9 Reviewed-on: https://gerrit.libreoffice.org/61478 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Silence new Clang trunk -Wdefaulted-function-deletedStephan Bergmann2018-10-021-2/+2
| | | | | | | | | | | | | | This mostly affects explicitly defaulted functions that had recently been user- declared to silence new GCC trunk -Wdeprecated-copy. It is not entirely clear to me what the best approach is overall, see my mail <http://lists.llvm.org/pipermail/cfe-commits/Week-of-Mon-20181001/245321.html> "Re: r343285 - [cxx2a] P0641R2: (Some) type mismatches on defaulted functions only", but lets just explicitly delete those functions for now. Change-Id: If8c72f612f67a8feb8b03c2fb988c807e704ef03 Reviewed-on: https://gerrit.libreoffice.org/61259 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* make all notebooks scrollable and enable_popupCaolán McNamara2018-10-021-0/+2
| | | | | | | | Change-Id: I16a6d556ca4c6b3f876dc0c8380d01fe3022209e Reviewed-on: https://gerrit.libreoffice.org/61195 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* loplugin:useuniqueptr in SvImpLBoxNoel Grandin2018-09-251-1/+1
| | | | | | | Change-Id: I59aa026217ed250fab68afc4aa0086d4d1300eac Reviewed-on: https://gerrit.libreoffice.org/60627 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
* Resolves: tdf#119624 stray image_position bottom for some icons in buttonsCaolán McNamara2018-09-241-1/+0
| | | | | | | | | icons are off by default so not usually seen Change-Id: I6076fd87250fc4595d279c830e14779147b7857a Reviewed-on: https://gerrit.libreoffice.org/60935 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* weld BreakPointDialogCaolán McNamara2018-09-205-131/+180
| | | | | | | | Change-Id: Icecef8b0b939c5d87bdf1bb781731df8fc4419b5 Reviewed-on: https://gerrit.libreoffice.org/60756 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* New loplugin:externalStephan Bergmann2018-09-175-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...warning about (for now only) functions and variables with external linkage that likely don't need it. The problems with moving entities into unnamed namespacs and breaking ADL (as alluded to in comments in compilerplugins/clang/external.cxx) are illustrated by the fact that while struct S1 { int f() { return 0; } }; int f(S1 s) { return s.f(); } namespace N { struct S2: S1 { int f() { return 1; } }; int f(S2 s) { return s.f(); } } int main() { return f(N::S2()); } returns 1, both moving just the struct S2 into an nunnamed namespace, struct S1 { int f() { return 0; } }; int f(S1 s) { return s.f(); } namespace N { namespace { struct S2: S1 { int f() { return 1; } }; } int f(S2 s) { return s.f(); } } int main() { return f(N::S2()); } as well as moving just the function f overload into an unnamed namespace, struct S1 { int f() { return 0; } }; int f(S1 s) { return s.f(); } namespace N { struct S2: S1 { int f() { return 1; } }; namespace { int f(S2 s) { return s.f(); } } } int main() { return f(N::S2()); } would each change the program to return 0 instead. Change-Id: I4d09f7ac5e8f9bcd6e6bde4712608444b642265c Reviewed-on: https://gerrit.libreoffice.org/60539 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* tdf#42949 Fix IWYU warnings in include/ucbhelper/*Gabor Kelemen2018-09-131-0/+1
| | | | | | | | | | Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I7bfeef47abaf94cfb355db95c0fdb928ce36c0a6 Reviewed-on: https://gerrit.libreoffice.org/60232 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
* Revert "clang bugprone-unused-return-value"Noel Grandin2018-09-111-1/+2
| | | | | | | | | | | | | | | | | comment from sberg: aren't these changes broken in general, when the called function may throw an exception before it takes ownership of the passed-in pointer? So revert, except for (a) PlainTextFilterDetect::detect, which was definitely a leak (b) SwCursor::FindAll, where unique_ptr was being unnecessarily used This reverts commit 7764ae70b04058a64a3999529e98d1115ba59d1c. Change-Id: I555e651b44e245b031729013d2ce88d26e8a357e Reviewed-on: https://gerrit.libreoffice.org/60301 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
* tdf#42949 Fix IWYU warnings in include/cppuhelper/*Gabor Kelemen2018-09-101-0/+1
| | | | | | | | | | Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ib420e9216b8313f5ed7634ec375e39ceb741fd45 Reviewed-on: https://gerrit.libreoffice.org/59297 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
* clang bugprone-unused-return-valueNoel Grandin2018-09-081-2/+1
| | | | | | | | | | | most of these changes just make the change of ownership when using std::unique_ptr clearer, but there is one definite leak fix in PlainTextFilterDetect::detect Change-Id: I8282a68007222a4fee84004f394bde0cca8569e9 Reviewed-on: https://gerrit.libreoffice.org/60159 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
* loplugin:simplifyconstruct in accessibility..bridgesNoel Grandin2018-09-052-2/+0
| | | | | | | Change-Id: I08f6a64b50f03d1b08027a2ac9e51442255d64bc Reviewed-on: https://gerrit.libreoffice.org/59976 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>