summaryrefslogtreecommitdiff
path: root/sd
AgeCommit message (Collapse)Author
2023-03-08oox, sd: fix ever-increasing chart IDs when exporting to PPTXMiklos Vajna
Bring the static counter under the control of DrawingML::ResetMlCounters(), so the first chart is always chart1.xml, even if the same process already exported a chart previously. XLSX is a separate codepath, this fix doesn't help with that yet. Change-Id: Idf6e576ba94e254ae9782ef86e85542efd80127f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148457 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-03-08Simplify usage of BinaryDataContainerMike Kaganski
It is always used to store data read from streams Change-Id: I613bc446eaadf98d2b1c012002d38f23d79a40ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148450 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-03-07lok: form controls: rendering and mouse event forwardingMarco Cecchetti
What we got - Most controls rendered on Writer and Impress (on Calc already implemented by Tomaž Vajngerl) - Text labels rendered correctly - Mouse events forwarded to controls - Control state changed on click for Writer and Calc - Control invalidation for all apps - Fixed broken LOK_CALLBACK_MOUSE_POINTER msg - Correct pointer style when mouse is hovering over a control Need to be improved - in impress click method for a control is not executed even if the mouse event is forwarded correctly - avoid not needed control invalidations (as the one occurring on document autosaving) Change-Id: I4d5012af7f90a2c726b6b6b5b068e2be1ed5568a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146569 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147320 Tested-by: Jenkins Reviewed-by: Marco Cecchetti <marco.cecchetti@collabora.com>
2023-03-07clang-tidy dead-storeNoel Grandin
Change-Id: Iad8dd9081966193090b0929169da199b47f949a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148380 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-03-07no need to allocate these separatelyNoel Grandin
they are all one or two words in size Change-Id: I44d60e9fca03ce6709551a660661dd2a6778fd7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148377 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-03-07no need to allocate these separatelyNoel Grandin
they are all one or two words in size Change-Id: I701be7fd8bd4402af9c7b1473c9f4b3c8a9c0e90 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148339 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-03-06CppunitTest_sd_tiledrendering: use CPPUNIT_TEST_FIXTURE()Xisco Fauli
This suite is large enough so that avoiding the declaration/registration/definition of each test manually saves a lot of space. Change-Id: Icd7b2bfc98a5d27146ff8025d03e4c33a0c3abfe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148306 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-03-03Related: tdf#94319 object pasted in draw/impress is always centeredCaolán McNamara
this is a recent problem since: commit d60722e29a0dde6282915188e5ff7e24890a14d3 Date: Thu Jan 12 16:25:40 2023 +0200 XUnoTunnel->dynamic_cast in TransferableHelper Change-Id: I764b62d7a395d01f8e86174ce8e4d30dfeb80ead Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148171 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-03-03Revert "BaseMutex->std::mutex in AccessibleSlideSorterView"Noel Grandin
This reverts commit 64c19da4c924c45df037c075ef88d1f01a5abbe9, which is causing deadlock when loading https://bugs.documentfoundation.org/attachment.cgi?id=180272 in gtk3 Change-Id: I346fa576cbbb7355e65483ff5aba1f67cf21469a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148156 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-03-02qa: simplify codeXisco Fauli
Change-Id: I79328b4f26eeb01bfda0502657bf0d47f3699fdb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148123 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-03-02BaseMutex->std::mutex in SlideShowListenerProxyNoel Grandin
Change-Id: Iab518e2cb994372b5d601c5cd569f07531499804 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148056 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-03-02BaseMutex->std::mutex in AccessibleSlideSorterViewNoel Grandin
Change-Id: I8aeb0d5ec44a938e58475368a3bf4ae60034042d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148057 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-03-02BaseMutex->std::mutex in DrawSubControllerInterfaceBaseNoel Grandin
Change-Id: Iba2bee0feeea7cd176c178ae20e6dfce1fe4af19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148055 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-03-01create a default theme when SdrPage and SdrModel are createdTomaž Vajngerl
For a document it is expected that it always has a theme available so we need to create a theme with some default attributes set (a default color scheme for now) when we create a SdrModel and SdrPage (only for Writer currently). This also changes some ColorSets, SdrPage, SdrModel methods, to use better return types (cost& instead of raw pointers and vice versa depending on the use case). Change-Id: I874247784b845109e42567e3f45647dda46ccf3b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146816 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2023-02-28tdf#148966: pptx: workaround for multiline fields followed by linebreaksSarper Akdemir
In Impress after fields that span multiple lines, a linebreak is already forced. (PowerPoint doesn't have such behaviour) Therefore if the imported pptx file has a line break after the multiline field - Impress ends up displaying an extra line break. This patch implements ignoring of a linebreak that follows after a multiline field during paint (when not in EditMode), using a compatibility flag. (IgnoreBreakAfterMultilineField) Change-Id: I1e6772424cc0eead06b53d104b06820038a81ea1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147408 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-02-28tdf#153105 PPTX export: fix "Custom position/size" background imageTibor Nagy
Map size and the 9 preset positions of the ODF background image style "Custom position/size" to the OOXML a:stretch/a:fillRect with the appropriate left/top/right/bottom arguments. Note: it seems, applying a:stretch or a:tile was not mandatory, but missing a:stretch resulted non-editable document in Office 365. Note: the import of the PPTX mapping hasn't been implemented, yet. Follow-up to commit e8335bac5690b6beccb5ca9b36281c89fb2f28f5 "tdf#153107 OOXML export: fix scale of tile of shape background". Change-Id: Ie940ebc2610c5b75126da05678a04ed1552cacb3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147337 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2023-02-27return by ref from SdrGlobalDataNoel Grandin
return values are never nullptr Change-Id: Id84fc6c8c63cdb34bdd8c07d8ff5b45f1bff2e48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147873 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-02-24BaseMutex->std::mutex in SdStyleSheetNoel Grandin
Change-Id: I9700622ac805a9e74df1701c4ece97ef960388ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147586 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-02-24CppunitTest_sd_import_tests: use CPPUNIT_TEST_FIXTURE()Xisco Fauli
These suites are large enough so that avoiding the declaration/registration/definition of each test manually saves a lot of space. Change-Id: I95614603e96e8d4132391c7b0e1bd5f0a36a6b30 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147623 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-02-24BaseMutex->std::mutex in sd::tools::PropertySetNoel Grandin
Change-Id: Iab6d9f3cb1c198f9f3ffd8ac556985cafb821787 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147587 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-02-23CppunitTest_sd_export_tests: use CPPUNIT_TEST_FIXTURE()Xisco Fauli
This suite is large enough so that avoiding the declaration/registration/definition of each test manually saves a lot of space. Change-Id: I5b7ef05e16ec0d81acfc7288296849ab3b3973ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147576 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-02-23CppunitTest_sd_export_tests-ooxml1: use CPPUNIT_TEST_FIXTURE()Xisco Fauli
This suite is large enough so that avoiding the declaration/registration/definition of each test manually saves a lot of space. Change-Id: I4b76afd0483957b0061326e584ccbb0d22650c60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147509 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-02-23related tdf#148966: rework sdr compatibility flagsSarper Akdemir
Rework access/set methods for sdr compatibility flags so it is possible to address a compatibility flag without directly interfacing with SdrModel. (preliminary work for exposing compatibility flags to editeng) Change-Id: I2fab219f9e125151916228300be2d9d88156d8a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147407 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-02-23CppunitTest_sd_import_tests2: use CPPUNIT_TEST_FIXTURE()Xisco Fauli
This suite is large enough so that avoiding the declaration/registration/definition of each test manually saves a lot of space. Change-Id: I14d1ace4ffbcb888e30a51b24116ed8c7e90fcba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147479 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-02-23CppunitTest_sd_export_tests-ooxml3: use CPPUNIT_TEST_FIXTURE()Xisco Fauli
This suite is large enough so that avoiding the declaration/registration/definition of each test manually saves a lot of space. Change-Id: I44dd326d2fa9d306bb187148121e5c50718650d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147480 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-02-23CppunitTest_sd_export_tests-ooxml2: use CPPUNIT_TEST_FIXTURE()Xisco Fauli
This suite is large enough so that avoiding the declaration/registration/definition of each test manually saves a lot of space. Change-Id: Icc071e2bd1e6c0867d0e7dd22b7dbb3b7921f12f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147483 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-02-22CppunitTest_sd_import_tests-smartart: use CPPUNIT_TEST_FIXTURE()Xisco Fauli
This suite is large enough so that avoiding the declaration/registration/definition of each test manually saves a lot of space. Change-Id: Ifa52525ffd75328282182f0515fb142c7e1b4918 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147478 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-02-22tdf#134862: sd_export_tests-ooxml1: Add unittestXisco Fauli
Change-Id: I72c293c6d1a5337a6460bfbd8846c6be9a33626a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147465 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-02-21qa: call ProcessEventsToIdle inside dispatchCommandXisco Fauli
Change-Id: I909e6f334f4a659282141a97ccb3ffdea6ecc364 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147397 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-02-21tdf#153352 Use Promote/Demote in Tabbed UI instead of Increase/Decrease indentRafael Lima
As discussed in the ticket, the Tabbed UI of Impress/Draw uses the "Increase/Decrease indent" commands (.uno:DecrementIndent and .uno:IncrementIndent) which is confusing for the user. When the user clicks this command, they want actually to Promote/Demote the list level, so instead we should use the commands .uno:OutlineLeft and .uno:OutlineRight here instead. This patch makes the Tabbed UI more coherent with the sidebar, which uses the correct commands. Change-Id: I070b52e6fb31d348b1dd97c0ba28911f6e73590a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146705 Tested-by: Jenkins Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Rafael Lima <rafael.palma.lima@gmail.com>
2023-02-21osl::Mutex->std::mutex in PresenterTimerNoel Grandin
Change-Id: Icd6b6268792119541761a5e94600d8bc9e183ed8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147400 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-02-21qa: use dispatchCommand from macroTestXisco Fauli
Change-Id: I135bdcf6b93a38d7ee746234462736b0868c9017 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147395 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-02-20osl::Mutex->std::mutex in SdXCustomPresentationNoel Grandin
Change-Id: I114c2b4be39eb9a40871b7f4eb073a548191a876 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147322 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-02-19osl::Mutex->std::mutex in BitmapCacheNoel Grandin
Change-Id: I4ca8ac53e0d37aaf015e96963299acb5eb10f3b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147267 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-02-18osl::Mutex->std::mutex in SdGlobalResourceContainerNoel Grandin
Change-Id: I521ec7397e9ac54547bc82be6579cbb4fb4fc5a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147266 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-02-17tdf#149756 tdf#152545 PPTX import: position of standard connector - part2Tibor Nagy
and add new compatibility option "ConnectorUseSnapRect". Standard connectors (bentConnector3, bentConnector4, bentConnector5) are improved. MSO calculates the edge track differently, so have to add "ConnectorUseSnapRect" compatibility option: - For PPTX file format, it is set to true and use the snap rectangle - For ODP format, it is set to false by default and use the bounding rectangle. Follow-up to commit eec48130271188cab63665acedbabf1ff5e850a2 "tdf#148926 tdf#151678 PPTX import: position of standard connector - part1" (bentConnector2) Change-Id: Icca84708d6e10d44ebf7262415d055ce9cfc157d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146162 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2023-02-17SfxViewFrame* arg of SfxRequest ctor always dereferencedCaolán McNamara
change it to take a reference Change-Id: Ib9349f4c2660d297d93ee81256e7fa9873728ba3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147163 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-02-16SfxViewShell::GetViewFrame never returns null, change to a referenceCaolán McNamara
various null checks can be seen to be redundant and removed Change-Id: Icf49c1de4b0302795d2769a370af3abceaad0221 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147147 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-02-16SfxViewShell never takes a null SfxViewFrame*Caolán McNamara
Change-Id: I36f3a5c77a7fb2d3cf267184e403e6cd24dbd70b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147112 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-02-16Drop 'using namespace ::std' in dirs s*Gabor Kelemen
Change-Id: If3119a1f2274aac0bf70576458e3adb4505a2a45 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147076 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
2023-02-15crashreporter: apparent null dereferenceCaolán McNamara
Change-Id: I83f0765311ffdb34a0c08aaf616fdbde4e5110a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147048 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-02-15tdf#153179 ODP export regression: fix lost shape at missing objectTünde Tóth
If the object is missing, it's still possible to keep its shape by exporting its preview graphic, as before the regression. Regression from commit adc042f95d3dbd65b778260025d59283146916e5 "tdf#124333 PPTX import: fix Z-order of embedded OLE objects". See also commit 907da02bf8b33c080538731864225b3c44251328 "tdf#152436 PPTX export regression: fix lost shape at missing object" Change-Id: I614730435a857c6cdf01d4cdfc525fc452dffa29 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146247 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2023-02-11tdf#45705 Make SID_ZOOM_IN and SID_ZOOM_OUT smoother in ImpressRafael Lima
As reported in the bug ticket, the commands SID_ZOOM_IN and SID_ZOOM_OUT are not smooth and increase/decrease zoom at too big steps. This patch uses basegfx::zoomtools to zoom in and out, making it smoother. Change-Id: I801fa6123bf0696046e5d45c7a6b309e7cc3312e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146825 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2023-02-08editeng: remove SvxLRSpaceItem::nTxtLeftMichael Stahl
Several parts of SvxLRSpaceItem appear to maintain an invariant of the 3 members nTxtLeft/nLeftMargin/nFirstLineOffset: nLeftMargin is either equal to nTxtLeft if nFirstLineOffset is positive, otherwise equal to nTxtLeft + nFirstLineOffset. But not every part maintains it: there are functions SetLeftValue() and SetLeft() which simply write into nLeftMargin regardless, and a constructor that takes 3 separate numbers without any checks. The constructor calls violate the invariant in 2 ways: nTxtLeft is simply set to 0 (many cases), and one case in OutlineView::OutlineView() that sets nTxtLeft to 2000 but the other 2 at 0. Another odd thing is that the UNO services that expose SvxLRSpaceItem either expose a property for MID_L_MARGIN or for MID_TXT_LMARGIN but never both. It looks like there are 2 distinct usages of SvxLRSpaceItem: for anything that's applied to paragraphs, all 3 members are used; for anything else, nTxtLeft is unused. Try to simplify this by removing the nTxtLeft member, instead GetTextLeft() simply calculates it. Also assert in SetLeftValue()/SetLeft() that nFirstLineOffset is 0. Change-Id: Ida900c6ff04ef78e92e8914beda1cc731a695b06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146643 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-02-07cid#1520799 Unchecked dynamic_castCaolán McNamara
and cid#1520801 Unchecked dynamic_cast Change-Id: I03a0fdde1da3a9f10699b35455fa2f79ff00a494 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146635 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-02-07improve readability of VirtualDevice constructorNoel Grandin
(a) It is not obvious what DeviceFormat::DEFAULT means (b) There are two parameters (each with two states), but only really 2 possible overall states So (1) use more useful names (2) combine the two parameters into one enum Change-Id: Ic0595b39e032cc9e019b88326389d055b977da00 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146589 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-02-07GtkPaned properties applied to children not in a GtkPaned anymoreCaolán McNamara
since commit 280e55bf440b32ec87ce79271276c24f55172663 Date: Thu Jun 23 16:25:11 2022 +0200 Remove not necessary container in Animation Panel in Impress Sidebar It was causing layouting issues in LOK. Change-Id: I67bdb0283bd01397f59d9d4b4fbacd0610b606cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146567 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-02-07uitest: reset value when changing the measurement unitXisco Fauli
Otherwise, changing it in one test might affect other tests Use @contextmanager decorator to change it back to default 'Inch' at the end of the test even if the test hits an assert Change-Id: I1e7b35019cd19b490aa619c0a866bb9f93820950 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146583 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-02-05osl::Mutex->std::mutex in sd::framework::FrameworkHelperNoel Grandin
Change-Id: I84d5eb29413b3242386f1ffb1beafa9622985ded Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146558 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-02-02leader of group should default to activeCaolán McNamara
Change-Id: I1c49b227e63f01ffdd1c3b427ef780ea38a6d1ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146476 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>