summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-01-15Bump version to 5.0-18cp-5.0-18Andras Timar
Change-Id: Ie74ded5f7d891ad7bf20180b61537d7f161b0111
2016-01-15Expose metadata to deploy LibreOffice artifacts on Maven CentralDavid Ostrovsky
As outlined in the requirements to deploy the artifacts on Maven Central, the metdata must be provided: * Project Name, Description and URL * License Information * Developer Information * SCM Information [1] http://central.sonatype.org/pages/requirements.html Change-Id: I0bcd19a22d0e1a48f0faec0b414f816f7da5b318 Reviewed-on: https://gerrit.libreoffice.org/20315 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 9ca2de8c5995657973665189903aa2eebe0ef69a) Reviewed-on: https://gerrit.libreoffice.org/20813 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 708eab71f4d099a3887d32e59ef817db50324698)
2016-01-15Bump copyright year to 2016Adolfo Jayme Barrientos
(cherry picked from commit 8085555f6de5905028fdc0761c9e5b2fd4a3609a) Change-Id: Ifbd88aa55d5aa32a7b8dc11d7ac0310d0ef1e5d1 (cherry picked from commit 2a8f10162deb89aebc7ed625b4072ed6af818a88)
2016-01-15svg export: fall back to crossfade for not supported transitionsMarco Cecchetti
If we do not support the requested transition type we fall back to crossfade transition. If we do not provide an alternative transition and we set the state of the animation node to 'invalid' the animation engine stops itself. Change-Id: Ie476dd579248e9d776e27797dca2ea867f3e5e54
2016-01-15sc tiled rendering: it's pointless to send selection changes during search allMiklos Vajna
(cherry picked from commit 61161254ab880f02a7a26822d45ff96ec7ca76c3) Change-Id: I787cd1760bca0bf7fbc3132579b569882ec25ae2
2016-01-15sw tiled rendering: it's pointless to send selection changes during search allMiklos Vajna
(cherry picked from commit 07054b050eb24442be92c1733aee27fe0a80ef69) Change-Id: Iad3436c74d0ff95c84b5da870124b1e335241ca2
2016-01-14sd lok: More places where we need to force the transparent color for bg.Jan Holesovsky
Change-Id: Ic6e0ed45b118b27a86f8657671ae877ce494c5d4
2016-01-14sd: use ScopeGuard in Outliner::SearchAndReplaceAll()Miklos Vajna
So the flag will be reset on early return as well. (cherry picked from commit 6372080cd396a7e8608806a35a1be68d288b8fda) Conflicts: sd/source/ui/view/Outliner.cxx Change-Id: Ib086ec4a02dda291a0291a8ac40660c16de0fbf6
2016-01-14svx: loplugin:overrideMiklos Vajna
Change-Id: I532525fa12af2a0afbc1277b9a918c4d563f3b4f (cherry picked from commit d8551a79d2dcdad3bad5c437427b25b5131534ae)
2016-01-14editeng: handle SdrModel::isTiledSearching()Miklos Vajna
Given that the edit/outliner views can come and go, avoid the lifecycle problems with just passing a pointer to the sdr model to editeng, and then it'll always have the up to date "are we searching" information. editeng can't depend on svx, so provide an interface class SdrModel can implement. (cherry picked from commit 7b5d20983dfbfb458898eeab54828ba5fef5841f) Conflicts: editeng/source/editeng/editview.cxx editeng/source/editeng/impedit.cxx include/editeng/outliner.hxx sd/qa/unit/tiledrendering/tiledrendering.cxx svx/source/svdraw/svdedxv.cxx sw/inc/PostItMgr.hxx sw/source/uibase/docvw/PostItMgr.cxx sw/source/uibase/docvw/SidebarWin.cxx Change-Id: I3b98011593b00ac0fab05b6b9c591dd20d94c579
2016-01-14sd tiled rendering: it's pointless to send selection changes during search allMiklos Vajna
But they do cause annoying flashing. (cherry picked from commit b9565ef0a73c235cd1e14fce9031db6e9237c524) Conflicts: include/svx/svdmodel.hxx svx/source/svdraw/svdmodel.cxx Change-Id: Ic313a15429c5db98c5660a5274aa49e95dd217e5
2016-01-14sfx2: Convert the exception to one that we actually announce.Jan Holesovsky
Otherwise saving to a non-existing http:// URL leads to a crash. Change-Id: Ia4b49e2872616545dcedb2fc5553cf5a20a1f97d
2016-01-13svg export: simultaneous move and zoom issue - fixedcp-5.0-17Marco Cecchetti
Simultaneaous move and zoom of shapes did not work properly. Fixed. Change-Id: I445733c5ad3734966f6f5c08a5e5c798852cf74e
2016-01-13svg export: added support for anim:formula attributeMarco Cecchetti
Added support for formula attribute used from some effect such as spiral in. Better support for parsing value list. Change-Id: Ibf25482eba359acb279d9b212d7a829b3dc668b6
2016-01-13svg export - group shape + indefinite duration - fixedMarco Cecchetti
Fixed two issues: - group shapes were not animated - when smil:dur=indefinite final state of shapes was not frozen Now when an audio or command node is hit a log message is printed informing that such a type of animation nodes are not implemented. Change-Id: I81853c982e6a2b68c3644b2ebc09e2d565d706af
2016-01-13Bump version to 5.0-17Andras Timar
Change-Id: I36e7094375cb6e6f30127cd50e3db06d50587f08
2016-01-13sc: Fix the unit tests.Jan Holesovsky
Change-Id: I1d5ea5835115bca3c8d24dc1f2e43c14d5d7b47a
2016-01-13sc: Further .uno:Insert (inserting a new sheet) tweak.Jan Holesovsky
Change-Id: I5437e173009be2b21594abfa133c1b48e53a2ff3
2016-01-13sc: Make .uno:Insert (inserting a new sheet) always succeed.Jan Holesovsky
Also, when provided with '0' as the sheet number, treat it as adding at the end - which I think is the usual use case one wants to target. Change-Id: I9e1a1733c2310b8c6bb7ff239351e88bbef09ac7
2016-01-12sc lokit: refactor setPartHenry Castro
Change-Id: I01786551aef0274ae11fe673cc5b0c250e8817cc Reviewed-on: https://gerrit.libreoffice.org/21403 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Henry Castro <hcastro@collabora.com>
2016-01-11lool - search all - unit test failure - solvedMarco Cecchetti
Change-Id: I5a74dd60f61fc0fdb88f08383d579b14222aa55d Reviewed-on: https://gerrit.libreoffice.org/21366 Reviewed-by: Marco Cecchetti <mrcekets@gmail.com> Tested-by: Marco Cecchetti <mrcekets@gmail.com>
2016-01-08Bump version to 5.0-16cp-5.0-16Andras Timar
Change-Id: Ic807e62738bb420b67e6d26588ad674eaeae559e
2016-01-08tdf#96961 sw Hide Whitespace: still show whitespace on the last pageMiklos Vajna
Mainly to match Word's hide whitespace behavior. (cherry picked from commit 49b67cdc36b599f865d4a6de214d901861f27196) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx sw/source/core/layout/calcmove.cxx Change-Id: Ica09bca5004adbfa14d1c9aca04079129f8a1a68
2016-01-08CppunitTest_sw_uiwriter: don't assert the size of the last pageMiklos Vajna
The size of the last page will change in a bit in Hide Whitespace mode, the intention of the test is to check the behavior of the normal (non-last) pages. Change-Id: I69b9072c59b6ca4dc5d93062c21726a0f5c03c05 (cherry picked from commit cd51e0153a25f3950be54dd7fd58a0de6e148ae2)
2016-01-08CppunitTest_sw_uiwriter: tolerate lower than 276 in testTdf96536()Miklos Vajna
Seen on an OS X tinderbox from time to time, but not always. Change-Id: Ie6796de5095a6d3b583fa8494444f4d662db8b12 (cherry picked from commit af47b54d49355a003deda722b5d0112a7b746485)
2016-01-08tdf#89236: Don't deflate encrypted document in parallelMatúš Kukan
I see "warn:legacy.osl:22439:1:package/source/zipapi/ZipFile.cxx:583: Can't detect password correctness without digest!" when opening file saved with password. Obviously css::xml::crypto::XDigestContext used in ZipOutputEntry does not work properly when encrypting files in parallel, so don't do that. Change-Id: I4b354535240a4f31a6bc6855cf7f9af527634e7e Reviewed-on: https://gerrit.libreoffice.org/21238 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Matúš Kukan <matus@libreoffice.org> (cherry picked from commit eaed822c9cf6b3762f727f1281003dafd300df6d) Reviewed-on: https://gerrit.libreoffice.org/21242 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit fe7d69565866b4b02cde5aebdab4cbc11d00af2b)
2016-01-08tdf#96713 OdfFlatXml: Seek to 0 before readingMaxim Monastirsky
Similar to tdf#45418. The problem is that sfx2 DocumentInserter code calls SfxMedium::IsStorage, which reads the stream but doesn't correctly seek back to 0. Actually SfxMedium_Impl has 2 members for the input stream, one of SvStream type and another one as Reference<XInputStream>. Turns out that reading with SvStream::Read changes the position in the object referenced by Reference<XInputStream>, but SvStream::Seek doesn't, so Seek(0) doesn't do the desired effect. My current solution is to ensure that we're reading from 0 inside the filter. I think it's a good thing to do anyway, and should be sufficient, given that other filters doesn't seem to be affected by this bug. Change-Id: I49b41077032d3e395c675e4f7824cc778c075473 (cherry picked from commit 5e4124396cafc2b0a435f17a66b33e36303ae4e4) Reviewed-on: https://gerrit.libreoffice.org/20983 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 47f6e49e2a204a00ac631f9fa021d6320752d039)
2016-01-08Resolves: tdf#94208 broadcast fill undo (for deleted cells)Eike Rathke
Change-Id: I0fb54956bffc77dad4236b326eee3af836017623 (cherry picked from commit ece5cc21aa7814be79016e0d285981c6ced4d9ee) Reviewed-on: https://gerrit.libreoffice.org/21207 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 81dad223dbfac9352bbfd9333d1ba101d245a15a)
2016-01-08tdf#94715 - ensure we remove ourselves from the same event source.Michael Meeks
Seemingly event removal was not occuring; also clean up historic duplication of UNO and C++ references using rtl::Reference. Reviewed-on: https://gerrit.libreoffice.org/21088 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Conflicts: include/toolkit/awt/vclxaccessiblecomponent.hxx toolkit/source/awt/vclxaccessiblecomponent.cxx Change-Id: I56dfb76501929886f70495804670f8c4f70e796b Reviewed-on: https://gerrit.libreoffice.org/21110 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 9a22f9f5fe528c7c0f45813a025b377f79c8372e)
2016-01-08tdf#92203 OReportDefinition should implement XDocumentEventListener interfaceMaxim Monastirsky
... since 252b0c4364690e00b45175693d35eb64a07324b4 Change-Id: I4101dac0078df7cb06f4d33da2a722cfbafb5608 Reviewed-on: https://gerrit.libreoffice.org/20875 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit d48370043b3759c79340c162048c5f2b4da394b9)
2016-01-08guard against infinite recursion in MarginsSameAsParentCaolán McNamara
(cherry picked from commit e8dc85c2b3fd197aa5d484be3fc2cb25f7bd2412) (cherry picked from commit 54fe17fabaa258a48e18c4a19c29da2d2cf634ca) Change-Id: I09c1ccb850f0cb2365e52ee6ffd293ccf34ad00e Reviewed-on: https://gerrit.libreoffice.org/21033 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit a586293844de4d9c0e36dd20b7c157f19ca60a9e)
2016-01-08tdf#96855: Put back assignment of xHierAccessStephan Bergmann
...that had inadvertently been removed as part of a larger code removal in 6948c546fdc00dddec7d58e03150dcc87921d6b2 "tdf#75637: Resolve help images via a vnd.libreoffice.image UCP" Change-Id: Ic2d5e1a5fa5a10b240bb9e511e6dcb8097e58081 (cherry picked from commit 549e900b4b0047b8cb6c236ea50a3fc046e5fb51) Reviewed-on: https://gerrit.libreoffice.org/21082 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit e4a154790397428f2e2f5bcdf26de407d6b0e2da)
2016-01-08lool - page border shadow can be disabledMarco Cecchetti
Support for text documents and presentations. Added a command line option for gtktiledviewer: --hide-page-shadow. Reviewed on: https://gerrit.libreoffice.org/21210 (cherry picked from commit 6b7d41094d06bbb4c248927d02318cf1b5faba0a) Conflicts: include/svx/svdpntv.hxx libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx svx/source/svdraw/svdpntv.cxx Change-Id: I1e427693d7af40cb5731d1730ac5b7c486d45c29
2016-01-07Related: tdf#96943 sw Hide Whitespace: add HandleWhitespaceHiddenDiff()Miklos Vajna
To have the "we want the difference vs the nominal size, not the actual size" code at a single place. (cherry picked from commit 59ae2d11d5884ffdf77dec95d8cd2566943fd789) Conflicts: sw/source/core/layout/calcmove.cxx sw/source/core/layout/pagechg.cxx sw/source/core/text/widorp.cxx Change-Id: I9b4b9a33d5d2da825c5da93e69790277eba8d0b3
2016-01-07tdf#96943 sw Hide Whitespace: don't create pages for widow / orphan ...Miklos Vajna
... paragraphs that would otherwise fit nominal size of the page frame (cherry picked from commit 6d8da2b2deb4be2182ca1852cec7eb38a4c654eb) Conflicts: sw/source/core/text/widorp.cxx Change-Id: I90c3de9150b17c951e1ac4158babb7a71afee9ee
2016-01-07Disabled the test for a moment.Jan Holesovsky
Change-Id: I251d079d6362cf09d014623663cf9355a9c79a2e (cherry picked from commit be343661b076f3f57e7eb9ca1a5a4d3529752b58)
2016-01-07lool - search all - 2nd search does not work - fixedMarco Cecchetti
warning: now table are skipped because current implementation is not able to iterate through table cells and when a match occurs on the first cell the text object iterator stops working; Change-Id: I36ca4dabe88b0eb8fd89d3fe3dcc6951e5c03d0e Reviewed-on: https://gerrit.libreoffice.org/21166 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2016-01-07gradle based apk packing doesn't have .so limitation anymoreChristian Lohmaier
and even if it had, everything ends up in liblo-native-code.so now Change-Id: I5d62cf619867d6d0f7c5d4f91acf529706ebdc75 (cherry picked from commit e6ca4cf597d9fd1d2d34058adc70d22f2d7ec508)
2016-01-05tdf#96127 Android: No UI visibleAlexF
Duplicate <include layout="@layout/toolbar"/> statement found. Problem could be caused by either 1) a differing xml reading mechanism across android versions 2) toolbar being accessed in a different way across android versions Duplicate element removed, and linearlayout shifted below first toolbar. Change-Id: I084b6498745bc72988f3a8eed12f7a72d261e267 Reviewed-on: https://gerrit.libreoffice.org/20422 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
2016-01-05tdf#88391 android document browser: draw and impress icon is the sameAlexF
Added missing code to set icon for draw in grid mode. Change-Id: I9ee356d5ab1a296a90e5ece11f5f4c50e7600f13 Reviewed-on: https://gerrit.libreoffice.org/19921 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org> Tested-by: Jenkins <ci@libreoffice.org>
2016-01-04return early if Container invalidatedCaolán McNamara
Change-Id: I3983070f1fe447e4b75b956cf95d3b3c5266b3f9 (cherry picked from commit 78c6be9cf3c9c3c87d2f41981bdc61047171eafe) (cherry picked from commit 312ae095c17812f40d08997acc058a1314675af5) Reviewed-on: https://gerrit.libreoffice.org/21001 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 7fd61a5e182597ddf41bb957dcaef11fe0eef816)
2016-01-04guard against infinite recursion in GetGeometryCaolán McNamara
(cherry picked from commit 9ec011f6874cf663db54d0420c41d9299e4ed882) (cherry picked from commit 02c113a3ab57d7880bb1f794e192fb42aea078e1) Change-Id: I901f77f5846512cb528f2e14bbc50409fa29bef2 Reviewed-on: https://gerrit.libreoffice.org/20988 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit ab8c84b1b1d14adc0cabbc063ba8a5132a540201)
2016-01-04guard against missing FoundryCaolán McNamara
Change-Id: I5ba66ff020b8226ac01af985f68c3ef67057c01a (cherry picked from commit 7f9b57bda4d88262ecbe45188888c744913b9770) (cherry picked from commit 5ae038d2341e4a7f8dedb77be75efd557d01bcc9) Reviewed-on: https://gerrit.libreoffice.org/20967 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 934e28385b5e7462a36780a04a08013d00924fb5)
2016-01-04guard against missing Container LayoutCaolán McNamara
Change-Id: Ie43b13448a6cacd3af4822b85f06ed84a2d38ff9 (cherry picked from commit 932c74e38ca397d82d609831e79ceaef2183cf64) (cherry picked from commit 1b2015281ee34f187fdb747db5f6223e8de63df4) Reviewed-on: https://gerrit.libreoffice.org/20968 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 7f4fcdbda41753c7923974c0af58271e38cdabe3)
2016-01-04tdf#96572 firebird correctly transmit request for NULLLionel Elie Mamane
even if column is not nullable Conflicts: connectivity/source/drivers/firebird/Util.cxx Change-Id: I72ceda68e983125aef26c8f0aacc06320bd16b77 Reviewed-on: https://gerrit.libreoffice.org/20793 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 93c15f226cfd424682178883b0a525707d5303ea)
2016-01-04guard against missing DropcapMgr and FoundryCaolán McNamara
Change-Id: I1007d4fac2514bc165941c70109cd8e3d57153cd (cherry picked from commit 330127baf96c417e0eeaef9808d124788b547cf3) (cherry picked from commit e616ff7e29ee10d0c3ea2dc6a8fc135b87b572b7) Reviewed-on: https://gerrit.libreoffice.org/20910 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit ec066b44392f8ed1015540220b6b4620facd873e)
2016-01-04guard against missing ContentContainerCaolán McNamara
Change-Id: I4f2c5d53148deb02d990edc42140c23f02409cea (cherry picked from commit 8a05b74eeb8d5e0955fbe3cefd945cdc9bffa3f5) (cherry picked from commit e439aebde0f60e7fe9bb19e96964eb3d26e50e3c) Reviewed-on: https://gerrit.libreoffice.org/20884 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 3968eec7145d20b398a196bf72ce51f16cebae9e)
2016-01-04coverity#1343623 Logically dead codeCaolán McNamara
(cherry picked from commit 8f3c796ecf926f81f6229fbb040095286c8adbfe) coverity#1343624 Unchecked dynamic_cast (cherry picked from commit 26fddc3196c7ab932ada544b84b74da06fa2596d) coverity#1343625 Unchecked dynamic_cast (cherry picked from commit 9e83e31019cdc68e5324a10ef76417b46720cfe9) coverity#1343626 Unchecked dynamic_cast (cherry picked from commit c2f1731685014b9df386dfb59900783c3ca3acb7) coverity#1343627 Unchecked dynamic_cast (cherry picked from commit 1276f6daf28f61d911da9885e0cac738931e4de4) coverity#1343629 Unchecked dynamic_cast (cherry picked from commit 274d265e42ab89be29af21ef5cc1cbf20b3d35a2) 1343630 Dereference after null check (cherry picked from commit 960cfb7e3ba56fe06f45c523e086ee6d4b95e685) (cherry picked from commit 7e6e8aa8c51e13b016118720fc28f39a572bb8e4) Change-Id: Ibcf05263f7bea50f70d55f4d8944d0a41d54851d a303a5dc97fb5e491e86a3484040e657f1b480d4 b534e4e8ecf50a9159c5e98e2c899bf13f44c654 52e6d6c9cb48880185293fb9825d7a6530ee767d 83c0febcbbf0f19a05818e0575921d1d6254935f 93b7298d785e57a4ef854cea3e9cd5c2c0f35849 81223b868f069755e8a46c57bfe0282021f26de7 Reviewed-on: https://gerrit.libreoffice.org/20832 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit b8b7669d2e48f491cd9d8e6a32f61a121ae8034f)
2016-01-04tdf#96368: Address book wizard with no selection returns EvolutionJulien Nabet
Don't select an option which is not even visible Change-Id: I003c835d7d623e559d67098de48efdf057a64422 Reviewed-on: https://gerrit.libreoffice.org/20552 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 7b69dd64be71d1420158a553fb5ec861039cb017) Reviewed-on: https://gerrit.libreoffice.org/20558 Tested-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 6158def661f8281c4fc3493c7e2a1753d3891437) Reviewed-on: https://gerrit.libreoffice.org/20559 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit dc66e55c53d55a91fffa7591fec96cb9578e71e3)
2016-01-04tdf#93009 SwViewShell: fix printing of comments on the marginMiklos Vajna
Clipping was set not only in case of VCL-level double buffering, but also during printing, which means comments were excluded from the output. (cherry picked from commit d6913850585eae90ea9179129fe7b60a2a4305ad) Change-Id: Iffb7d91ca78c09e2b43133f5049d52bd7dc4e730 Reviewed-on: https://gerrit.libreoffice.org/20872 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit be005a7a4ec5934372d4b13b96b22d2c8659ed95)