summaryrefslogtreecommitdiff
path: root/svx
AgeCommit message (Collapse)Author
2018-10-30Remove now unused mbUserDefinedLayer from SdrLayerRegina Henschel
Commit 'Special methods NewStandardLayer and SetStandardLayer not needed' has removed the last user of mbUserDefinedLayer. Change-Id: Id4d4fbbfa9b1425225181ea6b0750a4205683902 Reviewed-on: https://gerrit.libreoffice.org/62506 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-10-30tdf#120097 Revert "clang-tidy bugprone-virtual-near-miss in RecoveryDialog"Noel Grandin
This reverts commit eb34a6a93fcdebe545ab267d7cc7c5c72bab22c8. Change-Id: Ife0cc2098ab49da97f73c65754b5d6a43bd0eece Reviewed-on: https://gerrit.libreoffice.org/62519 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-29tdf#114700 Single marker files are needed for HiDPI displayRegina Henschel
The method ImpGetBitmapEx in svdhdl.cxx needs special single marker files to generate display dependent markers on the fly. List them in bitmaps.hlst so that they are packed and delivered. Change-Id: I26d86fa31d82ab623016c9ed0bfb6eb9a3e91a14 Reviewed-on: https://gerrit.libreoffice.org/62488 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2018-10-29Avoid SvxSearchController::StateChanged during SvxSearchDialog sub-dialogStephan Bergmann
UITest_findReplace occasionally fails (esp. in slowly-executing builds like the ASan+UBSan one, e.g., <https://ci.libreoffice.org/job/lo_ubsan/1084/>) because the "Find" edit is re-filled with old content while the "Format..." sub-dialog is executing: The SfxBindings::NextJob timer fires from the main thread's Application::Yield, calls SvxSearchController::StateChanged -> SvxSearchDialog::SetItem_Impl -> SvxSearchDialog::Init_Impl, which goes into the > else if (!aSearchStrings.empty()) > { > bool bAttributes = > ( ( pSearchList && pSearchList->Count() ) || > ( pReplaceList && pReplaceList->Count() ) ); > > if ( bSetSearch && !bAttributes ) > m_pSearchLB->SetText(aSearchStrings[0]); code re-filling the "Find" edit (despite it having been cleared programatically), because bAttributes is false because the "Format..." sub- dialog has not yet completed, so pSearchList has not yet been filled (as is done by the handle_format_dlg code in test_find_writer in sw/qa/uitest/findReplace/findReplace.py). (This issue can be triggered rather reliably by adding a sleep > @@ -94,6 +94,7 @@ class findReplace(UITestCase): > xSizeFont.executeAction("BACKSPACE", tuple()) > xSizeFont.executeAction("TYPE", mkPropertyValues({"TEXT":"16"})) #set font size 16 > xOkBtn = dialog.getChild("ok") > + time.sleep(1) > self.ui_test.close_dialog_through_button(xOkBtn) > > self.ui_test.execute_blocking_action(format.executeAction, args=('CLICK', ()), to sw/qa/uitest/findReplace/findReplace.py.) So suppress executing SvxSearchController::StateChanged -> SvxSearchDialog::SetItem_Impl while an SvxSearchDialog sub-dialog is in progress. The open TODO question is whether those state changes should be saved and executed once the sub-dialog has been executed, or whether it is OK to just throw them away (as happens now). Change-Id: I20fb8c8d88c3d3fe8b604718bb289a7421471aa7 Reviewed-on: https://gerrit.libreoffice.org/62489 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-10-28tdf#120782: fix crash when dragging column...Julien Nabet
from datasource to spreadsheet See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=146108 See related bugtrackers. Change-Id: I2343e1468460b4e8036ce16060471763d344630a Reviewed-on: https://gerrit.libreoffice.org/62482 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-10-28drop unnecessary requires lib="LibreOffice"Caolán McNamara
Change-Id: I5444e5076ca69e8f6f8d28e36f4e744721cf43ef Reviewed-on: https://gerrit.libreoffice.org/62445 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-28update old 'interface-requires' comments to <requires> tagCaolán McNamara
Change-Id: If7533650ae543f9d43a3a50fdfc137141fa64586 Reviewed-on: https://gerrit.libreoffice.org/62444 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-28svx: remove newly unused XFillExchangeDataMichael Stahl
Change-Id: I0260504ba108421e82ad50f9680dda9a05710678 Reviewed-on: https://gerrit.libreoffice.org/62456 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-28tdf#119235 svx,sd: fix drag&drop from ColorBarMichael Stahl
This was using the SfxPoolItem serialisation of XATTR_FILL* items, where only XFillColorItem and XFillStyleItem were actually used; the binary serialisation was removed without being aware of this feature. Fix this by using uno::Any instead, rather than reviving the binary serialisation. Also change the clipboard format strings, just to be safe. (regression from 97b889b8b2b2554ce33fd6b3f0359fc18f39832d) Change-Id: I1828621a9aae606a1ca47835eef608062efe64a0 Reviewed-on: https://gerrit.libreoffice.org/62455 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-27tdf#108751 Show currently selected color name in color button tooltipJim Raykowski
Based on Heiko Tietze's work in I26f0500527d2b86049948ca64e636e1ff566f262 Change-Id: I20541dd6ad155a39c0f87361088b44923406064f Reviewed-on: https://gerrit.libreoffice.org/61815 Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> Tested-by: Heiko Tietze <tietze.heiko@gmail.com>
2018-10-27tdf#120703 PVS: variable is assigned values twice successivelyMike Kaganski
V519 The 'mbDesignMode' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 731, 737. Change-Id: I20cb70e050f194e7ab02de92dff4db35cade7386 Reviewed-on: https://gerrit.libreoffice.org/62421 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-10-27tdf#120703 (PVS): V519 The variable is assigned values twice successivelyMike Kaganski
Change-Id: I9265425a215609ef6bf4298ba39c8399f215ce27 Reviewed-on: https://gerrit.libreoffice.org/62406 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-10-26tdf#42949 Fix IWYU warnings in include/unotools/*Gabor Kelemen
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>
2018-10-26use unique_ptr when Clone()'ing PoolItemsNoel Grandin
and fix a handful of small leaks in the process Change-Id: I876e12ff5305f9dda84532d4182fb91657d6fa0c Reviewed-on: https://gerrit.libreoffice.org/62389 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-26loplugin:singlevalfields improvementNoel Grandin
look for any kind of types, not just POD types, helps to find smart pointer fields that are only assigned nullptr Change-Id: I2d887e98db012f03b646e1023985bcc196285abc Reviewed-on: https://gerrit.libreoffice.org/62382 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-25Remove dead commentStephan Bergmann
...that had been introduced in aecda33a2bc46fada51f2cff06887e33adbf05cf "#90370# Attribute Display uses FixedText instead of MultiLineEdit" together with code that is long gone again: + // temporary to avoid incompatibility +#if SUPD < 641 || defined( GT_DEBUG ) + aSearchFormatsED.Hide(); + aReplaceFormatsED.Hide(); + Change-Id: If93425a3815f4946f97657f03bf066ee6ca4e6a4 Reviewed-on: https://gerrit.libreoffice.org/62363 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-10-25Fix typosAndrea Gelmini
Change-Id: I4eda42a11239567c557431017a1fa99cb37298c5 Reviewed-on: https://gerrit.libreoffice.org/62357 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2018-10-25Reorganize FrameBorderPrimitive creation (II)Armin Le Grand
Step5: Move the view-dependent decomposition from BorderLinePrimitive2D to SdrFrameBorderPrimitive2D. It is now possible to use discrete sizes before the line and edge matching is done what will look much better. When it was done at BorderLinePrimitive2D and the matching was already done, that match was 'displaced' with the adapted forced scale to discrete units. The space and size used when zooming out for a single discrete unit (pixel) can heavily vary - it just covers a much larger logical area than the 'real' line/poly would do. All this needs to be handled (also for bound ranges) and can only be in a good way using primitives. Adapted to no longer do view-dependent changes in BorderLinePrimitive2D. Adapted to do these now at SdrFrameBorderPrimitive2D. Currently used to force the existing border partial lines (up to three) to not get taller than one logical unit. Adapted to no longer switch off AntiAliased rendering in VclPixelProcessor2D for processBorderLinePrimitive2D, this is problematic with various renderers on various systems (e.g. vcl still falls back to render multiple one-pixel-lines when taller than 3.5 pixels which looks horrible combined with other parts like filled polygons) All this needs fine balancing on - all systems - all renderers - all apps (which all have their own table implementation) - all render targets (pixel/PDF/print/slideshow/...) Done as thorough as possible, but may need additional finetuning. May also be a motivation to move away from vcl and implement these urgetly needed system-dependent primitive renderers... Adapted UnitTest testDoublePixelProcessing with the needed comments. Change-Id: Ie88bb76c2474b6ab3764d45a9cd1669264492acd Reviewed-on: https://gerrit.libreoffice.org/62344 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
2018-10-25tdf#120830 crash opening Form-Based FiltersNoel Grandin
regression from commit 7469e078dc3a7a891bd7f5c44a693e4421d3bcdd loplugin:useuniqueptr in FmXGridCell Change-Id: Ia74fcb518fe568d702101ff088f30dc8c096528f Reviewed-on: https://gerrit.libreoffice.org/62346 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-25tdf#120713 correctly handle boolean values in filtersLionel Elie Mamane
This commit has two parts: - Hardcode the correct BooleanComparisonMode in the firebird-sdbc driver (this fixes on Firebird databases, among others, the AutoFilter for bools) - Generic to all DBMS, have the "form-based filter" obey the BooleanComparisonMode Change-Id: Ib14e6c3d5cb773ae1f972840f8b53062f0224396 Reviewed-on: https://gerrit.libreoffice.org/62319 Tested-by: Jenkins Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
2018-10-24Fix typosAndrea Gelmini
Change-Id: I64cfe4c24d3abb4a8445fd2e7b832b2bdb0b40d3 Reviewed-on: https://gerrit.libreoffice.org/62310 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-10-24Reorganize FrameBorderPrimitive creationArmin Le Grand
Step1: Basic concept, move stuff to svx and new SdrFrameBorderPrimitive2D Step2: Adapt all creators/usages to use SdrFrameBorderData/SdrFrameBorderPrimitive2D, check functionality Step3: Re-implement mergre of BorderLinePrimitive2D during decomposition of SdrFrameBorderPrimitive2D to keep the number of primitives low from the start, make merge optional (not urgently needed) Step4: Migrate and isolate all helper methods and classes involved in geometry creation of border lines to the implementation (.cxx) of the new primitive Change-Id: I840b6765439bd995f2c57ef36315427b1f0f3e21 Reviewed-on: https://gerrit.libreoffice.org/62247 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
2018-10-24remove more rtl::OUString and OString prefixesNoel Grandin
which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-24Introduce OutputDevice type OUTDEV_PDFJan-Marek Glogowski
Originally I thought mpPDFWriter can be used to create PDF from any OutputDevice, but it's actually just set for the internal VirtualDevice of the PDF writer. So this gets rid of all the special mpPDFWriter and GetPDFWriter() handling and replaces it with checks for OUTDEV_PDF. But since ImplPDFWriter used to be a OUTDEV_VIRDEV, this also introduces OutputDevice::IsVirtual(), which now replaces most of the direct OUTDEV_VIRDEV checks. Change-Id: I11824143b6b8833ecc81119762448cbdf1145dbc Reviewed-on: https://gerrit.libreoffice.org/62257 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2018-10-24weld AdvancedSettingsDialogCaolán McNamara
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>
2018-10-24clang-tidy performance-unnecessary-copy-init in svxNoel Grandin
Change-Id: I27f4dd0cb08f9b62496a1c51eed732a678e1c2e5 Reviewed-on: https://gerrit.libreoffice.org/62252 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-24FmInterfaceItem is deadNoel Grandin
ever since commit a0c7b2bc4511da87c776b92aaa77ba7680542fa1 Date: Tue Nov 16 10:24:21 2004 +0000 INTEGRATION: CWS eforms2 (1.48.52); FILE MERGED Change-Id: Id8568ba19c4b7f1b7e5d8e8ebead0b4b2a1f5e0e Reviewed-on: https://gerrit.libreoffice.org/62231 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-23remove all use_action_appearance linesCaolán McNamara
Change-Id: I031676e939f53a28b1a62654ffe0a91b95dea029 Reviewed-on: https://gerrit.libreoffice.org/62234 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-23Special methods NewStandardLayer and SetStandardLayer not neededRegina Henschel
The method SetStandardLayer() is only used once, in method SdrLayerAdmin::NewStandardLayer(). This method is only used once, in OReportDefinition::init(). The difference between a layer 'Standard' and other layers is only in mbUserDefinedLayer. But this difference is no where evaluated. Therefore an ordinary layer is sufficient. The layer name is neither stored nor used in the UI, thus translation is not needed. A layer name must be set, but in this case it is not used in code, thus handle it same as for layer 'back'. Change-Id: Ifd4400d432d3b4702e950d3a717ed13d4075c279 Reviewed-on: https://gerrit.libreoffice.org/62144 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
2018-10-23tdf#120794 crash while selecting a drawing lineNoel Grandin
regression from commit b4fc996520b47a6212661a9de3a1c72ccfc379a4 loplugin:useuniqueptr in SdrHdlList Change-Id: Ic49c60020b1d86b4c65cc4662393415b96af714e Reviewed-on: https://gerrit.libreoffice.org/62222 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-23Implement IsUnderlineAbove in vcl::FontJan-Marek Glogowski
There was even a duplicate implementation... Change-Id: I192ac2ec8e5b8dd0e6b3ab9b9ddf0bf53df546ab Reviewed-on: https://gerrit.libreoffice.org/62199 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2018-10-22pvs-studio: V794 The assignment operator should be protectedCaolán McNamara
Change-Id: Ia443a0e61a091d877c8da26bf7d45bf4261f8669 Reviewed-on: https://gerrit.libreoffice.org/62166 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-22pvs-studio: V668 no sense testing against null as memory was allocated by newCaolán McNamara
category V668 complete Change-Id: I986d4cb89a7c72d54d71ea01fc598a9958deee24 Reviewed-on: https://gerrit.libreoffice.org/62138 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-22pvs-studio: V728 An excessive check can be simplifiedCaolán McNamara
for... "The '(A && !B) || (!A && B)' expression is equivalent to the 'bool(A) != bool(B)' expression" subcases, where the args are already bool Change-Id: Ica8b5c4974c513f7f7ad8acf17ca931e85ebc8af Reviewed-on: https://gerrit.libreoffice.org/62146 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-22tdf#120703 (PVS): Recurring check.Xisco Fauli
V571 The 'mpView' condition was already verified in line 417. Change-Id: I64d522412f1f627ab04a29f90b33177ef726eb58 Reviewed-on: https://gerrit.libreoffice.org/62157 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-22loplugin:staticvar in soltools..svxNoel Grandin
Change-Id: Ie9f36eb0e00aaee34a27f136ed903f8f87e52dcc Reviewed-on: https://gerrit.libreoffice.org/61916 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-21tdf#120703 (PVS): redundant nullptr checkMike Kaganski
V668 There is no sense in testing the 'pDest' pointer against null, as the memory was allocated using the 'new' operator. The exception will be generated in the case of memory allocation error. Change-Id: I17773f92ed73359e925ad779d171ec99727f7905 Reviewed-on: https://gerrit.libreoffice.org/62133 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-10-21cppcheck: variableScopeMark Dobo
Change-Id: I6826f1352cff7632dc93cc0067dfe4315dc43823 Reviewed-on: https://gerrit.libreoffice.org/62078 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2018-10-20ensure m_aMutex ctor called before m_aMutex usedCaolán McNamara
Change-Id: I3d05831947b955b63f351180193bcf1585589c25 Reviewed-on: https://gerrit.libreoffice.org/62012 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-20return by unique_ptr from CreateFieldControlNoel Grandin
Change-Id: Ic8bf9829c3320aca452fd1a40e9843fdbdbfa219 Reviewed-on: https://gerrit.libreoffice.org/61906 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-20use equal_range instead of lower_bound+upper_boundNoel Grandin
Change-Id: I7cc1c95b3a55630e3571cac5fe22be6c2f3a1bc9 Reviewed-on: https://gerrit.libreoffice.org/62015 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-20when calling std::lower_boundNoel Grandin
it's not enough to compare != end(), you also need to compare the key against the iterator result Change-Id: Ide5f151ba2297a35e5546f47fbc3c53cbe5ab533 Reviewed-on: https://gerrit.libreoffice.org/62014 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-19copy and paste errorCaolán McNamara
Change-Id: Idfb9772912b52fa6cd33546953def4f65ac75e52 Reviewed-on: https://gerrit.libreoffice.org/61983 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-19copy and paste errorCaolán McNamara
Change-Id: I54a1453b561306dd98cd2193f1a21b80b8b7e1d4 Reviewed-on: https://gerrit.libreoffice.org/61973 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-10-19clang-tidy readability-container-size-emptyNoel Grandin
Change-Id: I1df70b7dff5ebb6048f7fc618789faa15ca5d422 Reviewed-on: https://gerrit.libreoffice.org/61967 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-19clang-tidy readability-misleading-indentationNoel Grandin
Change-Id: I4673fc7c694924b41d048a1918ddb8b0e0af1f79 Reviewed-on: https://gerrit.libreoffice.org/61935 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-19clang-tidy modernize-redundant-void-argNoel Grandin
Change-Id: Ia25ac2e40f29e5b766a4c5c013fb53274196f656 Reviewed-on: https://gerrit.libreoffice.org/61934 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-18convert SdrLayer::nType to boolNoel Grandin
since it is being used as a bool. Also rename it to something more readable Change-Id: I89acc47251770c94fa321b742b0fb9327024055f Reviewed-on: https://gerrit.libreoffice.org/61909 Reviewed-by: Regina Henschel <rb.henschel@t-online.de> Tested-by: Jenkins
2018-10-18clang-tidy readability-simplify-boolean-exprNoel Grandin
Change-Id: I78fa01a6c803dec782488490b730af3a11814d64 Reviewed-on: https://gerrit.libreoffice.org/61902 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-17loplugin:unusedmethodsNoel Grandin
Change-Id: I73de303f93b3557881dbb84d6d11d89f193da010 Reviewed-on: https://gerrit.libreoffice.org/61868 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>