summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-22move InterimItemWindow to svtoolsCaolán McNamara
Change-Id: I058b1d96a3ddfaa1aa96f66d0ebc6fa68900a48c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92697 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-22tdf#108496: DOCX: redesign of override in listsVasily Melenchuk
List level overrides are not just about numbering, it is about numbering restart. Thus some changes to DOCX import/export were added. Improved support for several lists referring the same abstract list, especially in situation when one list have overrides. In addition some export cleanup is made: less unnecessary list duplications, less level overrides when no properties were changed. Change-Id: Ic7a69bc2e3080b39f5205cb90b46d14247abf305 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92412 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-04-22tdf#130156 add alignment commands to the sidebarandreas kainz
Change-Id: I302acc25b65ef20a0338401e763d400076f6e36d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92634 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2020-04-22tdf#131621: sw: Add unittestXisco Fauli
Change-Id: I3a6f437493caf8b4edde10703b7b7bb67ec1f848 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92684 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-04-22Use default density if rPPI values are too largeStephan Bergmann
`instdir/program/soffice --convert-to pdf caolan/id:001708,src:001481,op:havoc,rep:8.jpg` (with the file from vm138.documentfoundation.org:/srv/crashtestdata/files/) failed with UBSan float-cast-overflow > vcl/source/filter/jpeg/jpegc.cxx:371:23: runtime error: 160000 is outside the range of representable values of type 'unsigned short' > #0 in WriteJPEG(JPEGWriter*, void*, long, long, basegfx::B2DVector const&, bool, long, long, com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator> const&) at vcl/source/filter/jpeg/jpegc.cxx:371:23 > #1 in JPEGWriter::Write(Graphic const&) at vcl/source/filter/jpeg/JpegWriter.cxx:243:16 > #2 in ExportJPEG(SvStream&, Graphic const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const*, bool*) at vcl/source/filter/jpeg/jpeg.cxx:58:32 > #3 in GraphicFilter::ExportGraphic(Graphic const&, rtl::OUString const&, SvStream&, unsigned short, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const*) at vcl/source/filter/graphicfilter.cxx:1991:22 > #4 in (anonymous namespace)::GraphicProvider::storeGraphic(com::sun::star::uno::Reference<com::sun::star::graphic::XGraphic> const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at vcl/source/graphic/UnoGraphicProvider.cxx:818:25 > #5 in vcl::PDFWriterImpl::implWriteBitmapEx(Point const&, Size const&, BitmapEx const&, Graphic const&, VirtualDevice const*, vcl::PDFWriter::PlayMetafileContext const&) at vcl/source/gdi/pdfwriter_impl2.cxx:217:35 > #6 in vcl::PDFWriterImpl::playMetafile(GDIMetaFile const&, vcl::PDFExtOutDevData*, vcl::PDFWriter::PlayMetafileContext const&, VirtualDevice*) at vcl/source/gdi/pdfwriter_impl2.cxx:809:21 > #7 in vcl::PDFWriter::PlayMetafile(GDIMetaFile const&, vcl::PDFWriter::PlayMetafileContext const&, vcl::PDFExtOutDevData*) at vcl/source/gdi/pdfwriter.cxx:464:22 > #8 in PDFExport::ImplExportPage(vcl::PDFWriter&, vcl::PDFExtOutDevData&, GDIMetaFile const&) at filter/source/pdf/pdfexport.cxx:1094:13 > #9 in PDFExport::ExportSelection(vcl::PDFWriter&, com::sun::star::uno::Reference<com::sun::star::view::XRenderable> const&, com::sun::star::uno::Any const&, StringRangeEnumerator const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&, int) at filter/source/pdf/pdfexport.cxx:242:25 > #10 in PDFExport::Export(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at filter/source/pdf/pdfexport.cxx:955:28 > #11 in PDFFilter::implExport(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at filter/source/pdf/pdffilter.cxx:161:24 > #12 in PDFFilter::filter(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) at filter/source/pdf/pdffilter.cxx:224:23 > #13 in SfxObjectShell::ExportTo(SfxMedium&) at sfx2/source/doc/objstor.cxx:2412:25 (instdir/program/libsfxlo.so +0x52260ad) as the values read for that (artificial) jpg in vcl/source/filter/png/pngread.cxx are maOrigSize = 551 x 211 vs. maPhysSize = 19435 x 7442 so Graphic::GetPPI returns 323.232 x 160000. For jpeg_scan_info members density_unit, X_density, and Y_density, workdir/UnpackedTarball/libjpeg-turbo/libjpeg.txt states: "The default values are 0,1,1 indicating square pixels of unknown size." So lets stick to those if the actual values would be too large. (I only check for too large values, not for too small negative ones. I do not know if the code could legitimately be called with such---so should handle them similarly---or not---in which case it should assert that.) Change-Id: I4b93b278e14069c458c20cdd077ab4fa72ed1f2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92696 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-04-22Correct upstream URLEike Rathke
Change-Id: Ice1e559df0614fd34c40890fc798b1ddef492618
2020-04-22Typo kServerDefiniton->kServerDefinition (extensions/ldap)Julien Nabet
Change-Id: I7d6ad76de91243e5f5d278bab5df171a5924d3d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92672 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-04-22writerfilter: document WrapPolygonMiklos Vajna
Change-Id: I39ef69269a3fafa188b44e741274ec770de463a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92657 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-04-22Fix typosAndrea Gelmini
Change-Id: I49d7dc8a2cbcba5413d05d97559321e672ed413a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92655 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-04-22vcl: fix missing includeMiklos Vajna
Mis-merge from commit e12fa18c69cbe1f441e972f3519d33638f15658e (tdf#42949 Simplify use of rtl::math::approxEqual in include/basegfx/, 2020-04-19), probably. Change-Id: Ie47efa7f4f85422b90e631b27502e018a7cc8f60
2020-04-22tdf#42949 Simplify use of rtl::math::approxEqual in include/basegfx/Gabor Kelemen
Turns out we can save about 500Mb of preprocessor input if we use rtl_math_approxEqual from rtl/math.h instead of its C++ wrapper rtl::math::approxEqual from rtl/math.hxx and manage the fallout accordingly. Before: bin/includebloat.awk | head sum total bytes included (excluding system headers): 19017296671 After: $ bin/includebloat.awk | head sum total bytes included (excluding system headers): 18535432672 Change-Id: I1691171f3a309405a7099882ad9989d147f59118 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92508 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-04-22Revert "tdf114724: uitest: make test less time.sleep dependent"Xisco Faulí
This reverts commit 634ce6f2d87a30b8abd2e8c67668e3bb5d87406b. See https://gerrit.libreoffice.org/c/core/+/92616 Change-Id: I642843ab16450d1a6b15d5e955495efbbfa7822a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92539 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-04-22Include <deque>Mike Kaganski
Change-Id: I0d2536038782f0ab6436a6527f24a2e0e737e409 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92677 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-04-22missing separatorCaolán McNamara
Change-Id: Ie0a7b54ef06e7f318f730a151c3dd58f6d2e0a30 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92683 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-22update creditsChristian Lohmaier
Change-Id: Ic21818bfa1b45f06344cbe92c5d57324654a5e04
2020-04-22tdf#42949 Fix IWYU warnings in reportdesign/*/*hxxGabor Kelemen
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: If8549e62de1007fccf9a5becac356f8d1ffc5090 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92513 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-04-22use without-latest-c++ in coverity confCaolán McNamara
Change-Id: Ie72fb05ef0d687c3f442f6372f591f94815cf9d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92674 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-22tdf#132242: add "None" entry for "frac" OpenTypeFeature (vcl)Julien Nabet
Change-Id: I260b37a847887c79645db8015938f8bbbe6772d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92591 Tested-by: Jenkins Tested-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-04-22some of these need to be GtkToggleToolButtonCaolán McNamara
Change-Id: I1ebfac22b006de560c5208906b4d2a1efc011f8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92654 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-22uiobject.hxx only needs forward declaresCaolán McNamara
and update pches accordingly Change-Id: I411712532fd85961bffe6678416fcdc1d9c7f53d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92617 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-22seems a poor idea to increment a vector iter by COMBOBOX_APPENDCaolán McNamara
which is SAL_MAX_INT32, in the (presumably never happens) fallback case Change-Id: If425c6ce1bd9937ba2b26f6c68231640a2f13273 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92626 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-22Make hide lok dialog test reliableSzymon Kłos
On slower machines actions were reported in different order Change-Id: I8effea3a9d114ffb0e9ebed2c18fde046490fe07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92615 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-04-22Add include needed for std::minMike Kaganski
Change-Id: Ia7bb9a99c029d9ad47371b5ae999fd9808c4cbac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92537 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-04-22typeinfo for VclGrid still needed with --enable-mergelibsStephan Bergmann
...for the dynamic_casts in SAL_WARN_IF and assertin VclBuilder::get, > LNK] Library/libbiblo.so > include/vcl/builder.hxx:430: error: undefined reference to 'typeinfo for VclGrid' > include/vcl/builder.hxx:430: error: undefined reference to 'typeinfo for VclGrid' > include/vcl/builder.hxx:433: error: undefined reference to 'typeinfo for VclGrid' > collect2: error: ld returned 1 exit status > make[1]: *** [extensions/Library_bib.mk:12: instdir/program/libbiblo.so] Error 1 (see e.g., <https://ci.libreoffice.org/job/lo_tb_random_config_linux/2358/>). Broken with 01159643623de55f9e1de84d568032ca919dbd8f "make more classes private in mergedlibs mode". Change-Id: Ic20abe22b52026907a5624993008e497b173d14c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92613 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-22Partial revert "make more classes private in mergedlibs"Thorsten Behrens
Turns out x86 linux needs some item vtables in cui, which does not get linked into mergedlib. This reverts bits of commit 01159643623de55f9e1de84d568032ca919dbd8f Change-Id: I442aa2efca9941e9c5bf656c73cc5a5577db8781 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92658 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-04-22Resolves build error from I4c2107b8120797a7cd532b59ca5ccb58ab61a2aeHeiko Tietze
Change-Id: I2791a51104d73daae5f140ee5b396aa2a64857ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92656 Tested-by: Rene Engelhard <rene@debian.org> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-04-21Update git submodulesAndrea Gelmini
* Update helpcontent2 from branch 'master' to 51d027d333bc4e92612f62e55ac2ac22cdedf7b8 - Fix typo Change-Id: I09335c448cb058fec91cb6caf33c503c9a6e971d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/92642 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-04-21tdf#128049: sd: Add unittestXisco Fauli
Change-Id: Ic33aa2c023c9c5e8b5a67273674579ac7673a2b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92637 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-04-21Fix warning when compiling for iOS: unused parameter 'bCreateParentDirs'Tor Lillqvist
Change-Id: I3d27837ea49ad964a40f53083d90f2a287bae8a0
2020-04-21drop unneeded includeCaolán McNamara
Change-Id: I38a3ab4db7f74277074ed87410d14e2e9b3a5ea7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92621 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-21Relates tdf#130778 - Branding for 7.0Heiko Tietze
Better splash screen images Start center image depending on initial size Change-Id: I18823e04537bb217eaa7610c71c8021907dbbb94 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92583 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2020-04-21uitest: no need to use time.sleep hereXisco Fauli
Change-Id: I58b1fa80b6a570f8214255398f3b91f62590fd6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92629 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-04-21tdf114724: uitest: make test less time.sleep dependentXisco Fauli
Instead, check the focus moved to the bottom and back to the first element Execution times goes 17.232 from to 5.521 for me Change-Id: I816c197f44b68a1b9ab8686de191a743cbc78eb2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92616 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-04-21uitest: remove unneeded time.sleepXisco Fauli
Change-Id: I618a17fb8347d1f935caaef54738299863ddbb49 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92612 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-04-21uitest: use while loop instead of time.sleepXisco Fauli
Execution times goes from 3.807 to 2.718 for me Change-Id: I9c93417d2678c64a8d9a90b0a18b4d1210c8fdd2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92624 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-04-21tdf#42949 Fix IWYU warnings in lotuswordpro/source/filter/*hxxGabor Kelemen
Also drop the now unused pass-through header lotuswordpro/inc/lwpheader.hxx Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I3e2b9c4b5d91651dbefb83d13006f72eb54e62bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92498 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-04-21Update git submodulesLibreOfficiant
* Update helpcontent2 from branch 'master' to 1ce06d6f5faef38ef11d937a0a447784aa526c8c - fragment heading insertions Change-Id: Id619066cf1d40ed760ff774003991d0f16343a99 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/92441 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
2020-04-21CLANG_C -> CLANG_CCLuboš Luňák
Change-Id: I50ed05116df3f295af6406f0ee45610d9e1e031e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92619 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-04-21better handling of SSEx,AVX intrinsics for ClangLuboš Luňák
Clang-cl interprets MSVC's -arch option a bit differently (for MSVC -arch:SSE2 seems to mean SSE2+, but SSE2-only for Clang). So use Clang's -mxxx options when using clang-cl as CC/CXX. Also check intrinsics once again if using CLANG_CC/CXX to compile Skia. Change-Id: I64cd368ef4e5f4fcf1dbe877a1129f418d273a47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92618 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-04-21tdf#127109 Writer: fix Undo entry "Delete $1"László Németh
Regression from commit b69c518df68ce673b28d589da6626bd3d860f309 (tdf#54819 keep style & numbering at tracked deletion) Change-Id: I3041cc5a70d00bea14d7be1c275bb7d2a22e768a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92614 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2020-04-21don't try to use -fno-enforce-eh-specs with ClangLuboš Luňák
The use can be triggered when using gb_LinkTarget_use_clang, but Clang unlike GCC doesn't know the option. Change-Id: Idd109a09127061a72940de9229f0dd34b221375d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92611 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2020-04-21uitest: re-enable test using sleepXisco Fauli
and instead of sleep(3) use timeout = time.time() + 3 while condition != True and time.time() < timeout: sleep(0.1) execution time of this particular test goes from 7.785 seconds to 3.343 for me Change-Id: I7c99385ccd858dfbb77cfc6e53a0b3f1a8b57c73 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92588 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-04-21weld sidebar text panelCaolán McNamara
includes weld SvxFontNameToolBoxControl Change-Id: Ie48338243600c07f9f8c609701c137175133f8e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92585 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-21ofz#21701 Fuzzing build failureCaolán McNamara
Change-Id: I4a8042f4f3c117a2268b06789a99cf0ba6dbc3f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92608 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-04-21use better number sof LOK fields in ScTabViewNoel Grandin
LOK is (a)busing tools::Rectangle to calculate coverage, which triggers my new asserts because the existing numbers turn into RECT_EMPTY. Change-Id: Ib3cd6a63ebaad7dc9887567dd2463a0ef5cfc900 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92607 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-21return shared_ptr from createDocumentElementNoel Grandin
which is what the only callsite wants Change-Id: Ica83e7de89ec56c9b4f742f3da19d295a3250a9d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92610 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-21use weak_ptr properlyNoel Grandin
just call lock() instead of manually calling expired() Change-Id: If76826fb62092b00fce25c53cf6be89b72d40c4f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92609 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2020-04-21vcl: cleanup swaths of commented codeThorsten Behrens
Change-Id: I7acff3d136794dcb0f044bb3922fafeb13b6fa5a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92600 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-04-21return shared_ptr from AnyWidget::CloneNoel Grandin
which is what the only call-site wants Change-Id: I74aa7b9ce059890eb1bdd84d7a0a331ecf227be3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92606 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-21don't add maUserItemSize to text width, just use it as-isCaolán McNamara
which means we don't need the reverse calculation in the style dropdown to force that result Change-Id: I3c8421e964af4339abfacb455b75db5ad75456fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92446 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>