summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-01-12introduce docmodel comp., model::ThemeColor, use it in SvxColorItemTomaž Vajngerl
Added a new component docmodel, that has the document model types, which only depend on other basic components. This is needed so the types can be used in every relevant component - xmloff, oox, svx, editeng,... Introduces model::ThemeColor, which is a class used to store the theme color data, including transformations (svx::Transformation). For UNO use XThemeColor is added, and the implementation UnoThemeColor which wraps svx::ThemeColor, so it can be tranported around. Reactor all the code and tests to accomodate for this change. Change-Id: I7ce6752cdfaf5e4d3b8e4d90314afa469dd65cfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144847 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2023-01-12Don't let OSingleFactoryHelper delegate to derived classes' virtual overridesStephan Bergmann
...as it doesn't make sense that e.g. OFactoryComponentHelper::createInstance checked for bOneInstance, called OSingleFactoryHelper::createInstance, which called [OFactoryComponentHelper::]createInstanceWithContext, which checked for bOneInstance again Change-Id: I53f54079a2ac1af18a6e95f0cb9d7b75c1e46ceb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145418 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12Fix aggregating OFactoryComponentHelper::queryInterfaceStephan Bergmann
4bfc00aca2441082842f91dfba15886258674227 "#67468# factories support XUnloadingPreference now" had added the check for XUnloadingPreference there, but that's already covered by OFactoryComponentHelper::queryAggregation delegating to OSingleFactoryHelper::queryInterface. (And as OFactoryComponentHelper is inheriting XAggregation via OComponentHelper, the only thing that OFactoryComponentHelper::queryInterface shall do is delegate to OComponentHelper::queryInterface.) Change-Id: Iebe507e88791d1e2390d042a8a9c152512ce212a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145420 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12CppunitTest_sc_uicalc: remove leftoverXisco Fauli
from commit 3756e3145c39ace4454d2569709c2c0d64ad389a "CppunitTest_sc_uicalc: combine external reference tests" Change-Id: I0c34ae8bd1668aa6ecc02d420aa767f7d631bef4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145404 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2023-01-12SwNavigator: Improve mouse move handler for bringing objects toJim Raykowski
attention in the document view Fixes crash that happens in SalInstanceTreeView iter_compare when the mouse enters the content tree at a point that has no tree entry and is then moved over an entry. Moves code to bring entry content to attention in the document view from the mouse move handler to it's own function. Renames the overlay timer handler function and moves it to the area of the code having related functions. Checks added for visible content and if the type has any content to bring to attention. Change-Id: I381eed6ffcf7ddb095c4c09650578a7f7fd874b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145168 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2023-01-12tdf#152994 only query dark mode in Windows >= 10.0.18362Caolán McNamara
Change-Id: I8d8bd368d9d1ee38dac96dd369484ec74ce4835a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145414 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12draw selection bounds without using RasterOp::InvertCaolán McNamara
Change-Id: I65fa68bbd8ff40c0e324851376dd8a8a1614ac99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145396 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12mbDragDrawn is always false when queriedCaolán McNamara
Change-Id: Ie8eda3465381eeed62d3271040c1697ef8f6559a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145395 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12ofz#55034 Stack-buffer-overflow in vcl::bitmap::CreateFromDataCaolán McNamara
since: commit 21734247d58a6e915b058d8fa55ece949d049613 Date: Tue Jan 10 12:56:58 2023 +0200 drop internal support for 1-bit images the input data is still 1 bit here, even if the output will be 8 bit Change-Id: Ib7eb301b2e62ebc61ee61ebb99e6de92c1f4931b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145410 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12tdf#152921 Fix sidebar tabbar tab highlightingJim Raykowski
Makes the highlight state of the tabbar tab behave as expected when the sidebar is in the collapsed or expanded state. When collapsed, the tabbar should never have a highlighted tab. When expanded, the tab in the tabbar corrosponding to the open deck should be highlighted. Change-Id: I0e6c54aff95b1f1e417f147070742e900fd51513 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145251 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2023-01-12Fix VclTextTest with colorized antialiasingStephan Bergmann
The Flathub build for <https://github.com/flathub/org.libreoffice.LibreOffice/commit/d5ac1d2bd680970ba992c8c6836683262f067592> "Merge pull request #206 from flathub/lo-7.4.4" on 2023-01-12 at <https://buildbot.flathub.org/#/builders/6/builds/16778> consistently failed for both aarch64 and x86_64 builds with > text.cxx:260:Assertion > Test name: VclTextTest::testSimpleText > double equality assertion failed > - Expected: 28 > - Actual : -1 > - Delta : 2 during CppunitTest_vcl_text. The reason (as seen with a temporary build setting mbExportBitmap = true and looking at the resulting workdir/CppunitTest/vcl_text.test.core/simple-text-36-50pct.png) is that the stem of the "L" doesn't contain any COL_BLACK pixels, so getCharacterLeftSideHeight returns early with -1. The stem is drawn as three vertical lines of pixels, a yellow (RGB 255/195/111), a black-ish (RGB 23/0/0), and a blue (RGB 31/155/199) one. In comparison, when running the same test on Fedora 37, the three vertical lines use gray-scale instead of colors, RGB 195/195/195, then true black (RGB 0/0/0), and RGB 115/115/115. An earlier test build of <https://github.com/flathub/org.libreoffice.LibreOffice/pull/206> "Update to LibreOffice 7.4.4" for the same libreoffice-7.4.4.2 tag on 2023-01-02 at <https://buildbot.flathub.org/#/builders/6/builds/14712> succeeded, so I assume that it must be some change in the meantime to the underlying org.fedoraproject.sdk//22.08 that started to cause colorized antialiasing here. Change-Id: I7059268eabcfe8e501d0be4f38746707def7bb35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145411 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12sw HTML export: fix invalid HTML when all cells of a row have the same rowspanMiklos Vajna
The bugdoc has a table with 2 columns and 2 rows, but both the A1 and the A2 cell has rowspan=2, so there are only covered cells in the second row. It seems there is no valid HTML markup to express this Writer doc model. What HTML seems to suggest instead is to simply decrease the amount of rowspan attribute values and then the empty <tr> elements can be simply skipped. This fixes the Row 2 of a row group established by a tbody element has no cells beginning on it. from the w3c HTML validator. Note that you can't create such problematic tables on the UI: the UI will delete the row only containing covered cells for you when the last cell gets merged. Such documents can be created by importers, though. Change-Id: Ice4fa3636e8b780d374f3d319b198aaaada9f5e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145402 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2023-01-12Adapt to newer Emscripten SDKTor Lillqvist
The check for platform in raptor's sort_r.h no longer worked with Emscripten 3.1.30. Looking for __EMSCRIPTEN__ explicitly helps. Change-Id: Ieccf723d809b4e90d44a8a510f71e12bd1d2e529 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145408 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2023-01-12Adapt to newer Emscripten SDKTor Lillqvist
The __EMSCRIPTEN_major__, minor, and tiny macros are no longer predefined but only defined in <emscripten/version.h>. So grep that instead of running emcc -dM -E. Change-Id: I2383a906f9c746784449cd4606f653ab722b54de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145407 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2023-01-12vcl: handle VCL_DUMP_BMP_PATH in BitmapEx::DumpAsPng()Miklos Vajna
As requested at <https://gerrit.libreoffice.org/c/core/+/145361/2#message-e00b755a1a0cdc5cec9b8e2213226e56ec87c038>. Change-Id: I8868969a2061f0447b101d978acc5027d1bdd545 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145400 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-01-12Update git submodulesChristian Lohmaier
* Update translations from branch 'master' to 31b3190fb111c82e95e8322e860c4371407c4bd9 - update translations for 7.5.0 rc2/master and force-fix errors using pocheck Change-Id: I47591b005b12917245c4be7214d6bd986780044d
2023-01-12loplugin:passparamsbyref (clang-cl)Stephan Bergmann
Change-Id: I6d1cdd3f420e146ecad38bd3b1181eb654481440 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145394 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' to b23e481175ae62e827075f333d303fa393fd65e0 - tdf#152589 Add warning on experimental mode Change-Id: Ia3e85594b88ec9e38c1e3efb84cf02dbd69fba42 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/145406 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2023-01-12tdf#152774 Fix incorrect result with MATCH.Winfried Donkers
Use case now complies with ODF 6.9.14 (MATCH). Added use case to unit test. Change-Id: I749a979135fbc01a3bb1583092fb6d6a100e2d2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144883 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
2023-01-12override GetModel in ScDocShellNoel Grandin
so we can avoid dynamic_cast and XUnoTunnel in various places Change-Id: I1f524270a8030106a2058691c3d89b90d46ed26f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145391 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-12use concrete class in SubmissionNoel Grandin
the code already relies on the underlying type of mxModel being Model rather than XModel Change-Id: I5b78482d37024a5bc274b0208fa56e4328f3f5f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145390 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2023-01-12add a warning that this enum is streamed to the svm file formatCaolán McNamara
Change-Id: I5a16b5ac64189ade77f6378d8cc88eee41ee188b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145357 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12document that LineJoint_MIDDLE is treated the same as MITERCaolán McNamara
Change-Id: I3d82d1dd3b5f66d76622103ec7b9b76acd857f36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145356 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12move drawTransformedBitmap to CairoCommon and reuse for X11CairoSalGraphicsImplCaolán McNamara
Change-Id: I9b03d2ec973e2dab28358d7e8041b9d26705e700 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145352 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12rely on support for NET_WM_ICONCaolán McNamara
I can't find anything where that doesn't work, so can drop IconPixmapHint/IconMaskHint. Change-Id: Ifa9f6a548a92006450335037836fbb7dd3039ecd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145339 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12drop some unneeded includesCaolán McNamara
Change-Id: Ibde845b19bc5993251fb2118b3daeafb63871aef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145338 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12Simplify a bitMike Kaganski
Change-Id: I8e86aa5a43f7c0bc234331def1b4440dbe2cefa4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145389 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-01-12make SupportsCairo always return true nowCaolán McNamara
Change-Id: I818c63aadd23256c183b89a69b77ac8cdcc081f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144968 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12remove newly unused X11SalGraphicsImplCaolán McNamara
Change-Id: I91d5c75f38a6798e6c4a3ce10d21fede558d27db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145337 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12drop X11SalGraphicsImpl middleman nowCaolán McNamara
Change-Id: Ifccf6016403503a5abe34d0c1796ee43d14143de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145336 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12reuse CairoCommon GetGraphicsWidth from X11CairoSalGraphicsImplCaolán McNamara
Change-Id: I925f67469b2821b85b86260be22bc111cd97d452 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145333 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12move X11SalGraphicsImpl::GetBitCount to X11CairoSalGraphicsImplCaolán McNamara
Change-Id: I7ccd95539ee8e9368deb42f6c72f2ef0efe49d76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145329 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12X11SalGraphicsImpl::GetGraphicsHeight is newly unusedCaolán McNamara
Change-Id: Iab08e42aa7c734072faab5b5b48eb77f646b0eef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145328 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12mpClipRegion is newly unusedCaolán McNamara
Change-Id: I52d1848faf7821385bb0d87f9bb512e51365c4f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145327 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12X11SalGraphics::SetClipRegion is newly unusedCaolán McNamara
Change-Id: I920294975905c3ff3f3cc3d89411b4d0349d746d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145326 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12merge duplicate CairoTextRender implsCaolán McNamara
drop getSurfaceOffset because both impls just set these to 0, so its a no opt Change-Id: Ie4f28d57fb8a170c7a46d3cafceef3e049c26e2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145325 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12no more X11SalBitmapCaolán McNamara
Change-Id: I2c721c6058ab17717350742dd4390db0ad74b1f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145293 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2023-01-12sw: lok: use redline author for saved author fieldsDennis Francis
Without the fix author fields will expand to "Unknown author" when loading files which have author fields in them. But only update the fields when the first view joins and not for later view joins. Change-Id: I4ac3b25349b8057812c45dc8148f8b3fc3b7ca1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145317 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2023-01-12loplugin:fakebool (clang-cl)Stephan Bergmann
Change-Id: I8b1aa39ef008e1865e3fd529a49b10b95db1f046 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145383 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' to f1c42932246dacd75345a130baee7fb6f07d9f07 - tdf#152589 Add Transtate command & settings Help page + Also add Help page for LanguageTool options + Note: DeepL service not available in Southern Hemisphere, therefore I've not tested it. Change-Id: I8a4bb01462e40113b40210b10024c59db0da293c Reviewed-on: https://gerrit.libreoffice.org/c/help/+/145366 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2023-01-12Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'master' to 6b6ed464e1709685a0c20a7254d169c5553aa13a - tdf#129726 Insert Index and Edit Index Help pages + Merged Insert and Edit Index help pages + Deletd Edit Index help page + Refactor + Adjust links Change-Id: I01eab63177e0a2f9962878398c86ee5ec2418dcd Reviewed-on: https://gerrit.libreoffice.org/c/help/+/145269 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2023-01-12tdf#129726 Add extended tips to Index Entry dialogOlivier Hallot
Change-Id: I2fe583ccac6aef7ef024b6a31cfb2cc892b8af88 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145282 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2023-01-12Add Help button to Translate dialogOlivier Hallot
Change-Id: If7dbbd2fa58094a0b58250887a00dba364940ce6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145367 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2023-01-12Curl:CURLOPT_REDIR_PROTOCOLS(_STR): use only "https", not "http"Julien Nabet
Change-Id: If615503b598f6823d7978f12e666832c82b63ece Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145334 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-01-12tdf#152961 sw: fix layout loop on removing fly from pageMiklos Vajna
Loading the document resulted in a layout loop. This is a problem since commit cf2c070de2bafeec3b476c6bff7bb4ac87ba46db (sw layout: invalidate margins of body content when moving a fly from page, 2022-12-09), which started invalidating the content of an old page in case we remove a fly from it, because some frames calculate their margins based on the flys of the page. Fix the problem by invalidating only the table frames of those page lowers: the direct need for this invalidation comes from SwTabFrame::CalcFlyOffsets(), which is not relevant for other frames. Also, in case non-table lowers are not invalidated, then the new bugdoc loads fine, which means this fixes the new problem while keeping the old problem fixed. This assumes that non-table frames have their equivalent of SwTabFrame::CalcFlyOffsets(), which do their own invalidation, so SwPageFrame::MoveFly() doesn't have to do it. Change-Id: I807d55d077bb0e023beb66775ab68bbca2680eb5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145384 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2023-01-12loplugin:external (clang-cl)Stephan Bergmann
Change-Id: I09e30d3e250bad9c328688b78cf387fcdb12c2a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145382 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12loplugin:unnecessaryoverride (clang-cl)Stephan Bergmann
Change-Id: Ib0f721cb0bb7ebfd3b422cfb9e93804a70e1270b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145381 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12loplugin:crosscast (clang-cl)Stephan Bergmann
> winaccessibility/source/service/AccTopWindowListener.cxx(47,36): error: suspicious dynamic cross cast from 'css::accessibility::XAccessible *' to 'VCLXAccessibleComponent *' [loplugin:crosscast] > else if (auto pvclxcomponent = dynamic_cast<VCLXAccessibleComponent*>(pAccessible)) > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Change-Id: Iee7585dd2fa0d92af3be6b89d7d08326de3d1e7b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145380 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12loplugin:reservedid (clang-cl)Stephan Bergmann
...after ef533553559fe09b4afab651fc692885d1acf4ed "Rudimentary support for dynamic_cast on UNO proxy objects" added those > extern "C" IMAGE_DOS_HEADER const __ImageBase; Change-Id: I4d9cf2b7617180d66a8527e0e36631f81e0fb18d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145379 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2023-01-12this is never a X11SalBitmap anymoreCaolán McNamara
Change-Id: I9f645128709bce93be1c8548614b5e72e6667844 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145292 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>