- 29 Kas, 2015 4 kayıt (commit)
-
-
Marco Cecchetti yazdı
Slide transition didn't work anymore since the attribute parsing did not take into account the smil namespace prefix. Change-Id: I779f6408b1eac964f934019d219dc4111debe592 Reviewed-on: https://gerrit.libreoffice.org/20237Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Andras Timar <andras.timar@collabora.com> (cherry picked from commit 23f5c03d)
-
Marco Cecchetti yazdı
Animation sequence was wrong due to the priority queue and related compare functions implementation. Change-Id: I359abd087e922ffa0aa4f7770fcc0c9bdb029843 Reviewed-on: https://gerrit.libreoffice.org/20236Reviewed-by:
Andras Timar <andras.timar@collabora.com> Tested-by:
Andras Timar <andras.timar@collabora.com> (cherry picked from commit 1ed6d142)
-
Marco Cecchetti yazdı
For debug build an assertion failed because of presentation, smil and anim namespaces were not registered before exporting. The JavaScript engine has been modified in order to handle qualified animation elements and attributes. Change-Id: I2415fd59c2d1afddb1c68b708feb62e446ea5252
-
Marco Cecchetti yazdı
- issue: text fields were not displayed; this happened for debug build only: the problem was due to 2 facts: 1) the last fix for text decoration which changes the order in which tspan and desc elements are exported; 2) a workaround implemented for fixing the fact that date/time fields were not exported correctly when positioned chars are used (see commit c0a08eab). - issue: text fields were no more aligned correctly: this was due to the fact that the rect element representing the bounding box of the exported shape is not exported any more: I suspect that the rectangle was present in the generated GDIMetaFile representation of the exported shape. Change-Id: I3cd7b0d3a7f2bde8bfd8b933297cbdd7b90e6567
-
- 28 Kas, 2015 36 kayıt (commit)
-
-
Marco Cecchetti yazdı
1) Fixed the trailing space issue in text decoration attribute value. 2) Changed the SVG export suite in order to make it more reusable for other tests. 3) Added a unit test for testing that text decorations are exported correctly. Reviewed-on: https://gerrit.libreoffice.org/19870Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Andras Timar <andras.timar@collabora.com> (cherry picked from commit 50506421) Conflicts: sd/qa/unit/SVGExportTests.cxx Change-Id: I2bd71974242a0007726fbdd5ef5637a9ec62fd47
-
Andras Timar yazdı
Change-Id: I1e218a429b509fda35accc832d01fc1f12e8dddd
-
Christian Lohmaier yazdı
Change-Id: I723122069541bc5752164554e693268267969b1a Reviewed-on: https://gerrit.libreoffice.org/20240Reviewed-by:
Norbert Thiebaud <nthiebaud@gmail.com> Tested-by:
Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit 8375e386)
-
Christian Lohmaier yazdı
Change-Id: I6f999f36d6ef57dadddd774e6ef60ceb9cb8033c (cherry picked from commit 9affe65c) (cherry picked from commit 3cf3b0e5)
-
Christian Lohmaier yazdı
Change-Id: I58d60ee1121fcd1bf84ef998ed9116386dc3c70f (cherry picked from commit 4043ad46)
-
Miklos Vajna yazdı
Regression from commit 2b78f2cd (rhbz#988516: DOCX import: fix context stack when importing header/footer, 2014-03-05), though that just made an existing Writer layout problem visible. RTF/WW8/newer (drawingML) DOCX import doesn't have this problem, as those import pictures as sw graphics, not draw ones. <w10:wrap type="through"/> is normally mapped to our page wrap (as it uses "through" in the "not only wrap around, but also in the holes of the shape, if it has any" context, not in our "text should go through it, so no wrapping" one), but for some reason in this case (most probably due to the extreme large negative margins) Word handles the situation as our through, i.e. the text should not go to the second page, as it would normally happen with a "Word through" wrapping. Work around the strange situation by ignoring the wrapping request for extreme top margin values. (cherry picked from commit 37b5f1ed) Conflicts: oox/source/vml/vmlshape.cxx sw/qa/extras/ooxmlimport/ooxmlimport.cxx Change-Id: I20555b1fa7a769e20c40a3a5ff3873807403e937 Reviewed-on: https://gerrit.libreoffice.org/20212Reviewed-by:
Caolán McNamara <caolanm@redhat.com> Tested-by:
Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d66df3d3)
-
Eike Rathke yazdı
"(abc)|(def)" matches "def" with result offset sequences {0,-1,0},{3,-1,3} And thus the assert() calls introduced with 4cf1d290 and ce91f3c1 were hit. Change-Id: I571b6c7d47349a2cc7b1d1e34193b2865012a49f (cherry picked from commit 4dd2d406) Reviewed-on: https://gerrit.libreoffice.org/20174Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Mike Kaganski <mikekaganski@hotmail.com> (cherry picked from commit a38963a4)
-
Caolán McNamara yazdı
modeled on the quartz impl (cherry picked from commit 742da70e) Change-Id: I2f6776c14c7350954932df2bffcca36172f13473 Reviewed-on: https://gerrit.libreoffice.org/20083Reviewed-by:
Miklos Vajna <vmiklos@collabora.co.uk> Tested-by:
Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 7eb8f82a)
-
Caolán McNamara yazdı
instead of assuming they are in their final position when the top level dialog resizes. Cause there's a timer/idle involved so the final position isn't known yet (cherry picked from commit d4d4e00a) Change-Id: I713e938b0e275f181514315cb4ce4531f36191ca loplugin:vclwidgets (cherry picked from commit 4882664e) Change-Id: I3e5d88bdc2ecae6164c75da8ddf1b8cfe0ed325f Reviewed-on: https://gerrit.libreoffice.org/19796Reviewed-by:
Miklos Vajna <vmiklos@collabora.co.uk> Tested-by:
Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 6213ce4a)
-
Michael Stahl yazdı
CppunitTest_writerperfect_writer file libmwaw/pass/Acta_1.0.hqx uses the font "Courier", and for unknown reasons we can't properly load that font, because the PhysicalFontFamily::mpFirst for "courier" is null. This causes OutputDevice::GetTextArray() to fail to create a SalLayout and return early before initializing the passed pDXAry, which then generates lots of DrMemory warnings. Let's hope the callers are happy about an all-0 pDXAry. Change-Id: I07b29a59660cf5cd060fd77da5d96021f9d8f9f5 (cherry picked from commit e6e409b6) Reviewed-on: https://gerrit.libreoffice.org/20206Reviewed-by:
Miklos Vajna <vmiklos@collabora.co.uk> Tested-by:
Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 273be431)
-
Caolán McNamara yazdı
Needs a bit more work, so lets play it safer and default off for windows for now and leave it on for 5.1 This partially reverts... commit 1bc91425 tdf#93662 - allow GL by default only on recent drivers on recent windows. Feature for triple review for 5.0.2 - enables GL by default for some subset of very recent GL drivers, on Windows 7+. Change-Id: I7a12540afd9f1889db15810db448db466b35241d Reviewed-on: https://gerrit.libreoffice.org/19950Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 65bdad52)
-
Julien Nabet yazdı
Unknown names make the formula fail PythonTest_sw_python, especially set_expression is ok Variables are taken into account Thanks to Mike Kaganski for his help on this patch. Change-Id: Ia6f9c54d90ce88138fd9c9df9422b34ce8223ca2 Reviewed-on: https://gerrit.libreoffice.org/20122Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Mike Kaganski <mikekaganski@hotmail.com> (cherry picked from commit d667e321) Reviewed-on: https://gerrit.libreoffice.org/20159Reviewed-by:
Caolán McNamara <caolanm@redhat.com> Tested-by:
Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 238a02cb)
-
Tor Lillqvist yazdı
As far as I see, the surfaces created in the DX canvas are of D3DFMT_A8R8G8B8 or D3DFMT_X8R8G8B8 format, which means that the bytes (in memory order, on little-endian Windows) are B,G,R,A/X. So if the desired destination wants R,G,B,A, we need to swap the blue and red bytes. Let's hope this doesn't break anything else... Change-Id: I1b90d2cf95418f6557cac633ec6fce27599e8a61 Reviewed-on: https://gerrit.libreoffice.org/20161Reviewed-by:
Caolán McNamara <caolanm@redhat.com> Tested-by:
Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f7d1ea37)
-
Tor Lillqvist yazdı
The old code in MultiSalLayout::GetTextBreak() only makes sense if the base level character width is zero where a fallback level has a non-zero character width, and vice versa. But this is not the case for Windows, at least not any more now when using UniscribeLayout and not SimpleWinLayout. This simple change fixes that: Only use the width from a fallback level if the width at the base level is zero. Hopefully it does not cause regressions for other documents or on other platforms. (But, I repeat, I find it hard to believe that the intent of the code could really have been to ever add two or more non-zero widths for the same character from different levels of fallback and use that.) Change-Id: Ic66c55db4b7463f9e04fcedec76f1c44f5e62e03 (cherry picked from commit a0d112a5) Reviewed-on: https://gerrit.libreoffice.org/20172Tested-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 b8711f66)
-
Lionel Elie Mamane yazdı
"errorOccured" is an English spelling mistake, but is the name of the event, which cannot / should not be changed for backwards compatibility reasons. Spelling was boguously "corrected" in: commit 60a9b517 Author: Takeshi Abe <tabe@fixedpoint.jp> Date: Sat Dec 4 12:56:38 2010 +0900 Replace all occured, occurance etc. This was leading to impossibility of assigning a macro to that event, since it was not appearing in this dialog. Change-Id: Ib0373501cba8af8f4abb1c62faddf8d65c926a7e Reviewed-on: https://gerrit.libreoffice.org/20180Reviewed-by:
Caolán McNamara <caolanm@redhat.com> Tested-by:
Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5847c76d)
-
Mark Hung yazdı
Noto fonts correctly. LanguageTag()::getLanguage() would always return "zh" despite traditional Chinese were choose. hb_language_from_string() requires iso639-3 language tag except for Chinese, so we use use Bcp47() language tag for Chinese to differ zh-CN and the others. Change-Id: I6700a79a9c49a97d840b430def77741912935f72 Reviewed-on: https://gerrit.libreoffice.org/20027Tested-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 4424daa2) Reviewed-on: https://gerrit.libreoffice.org/20204 (cherry picked from commit 48cf2d9f)
-
Mark Hung yazdı
1) Write endParaRPr so that PowerPoint display them properly. 2) Original design forbid properites with default value to be exprted, now fixed. 3) Automatic colors are written as white or black based on whether background is dark. Note that tdf#77881,tdf#80520,tdf#89525 depend on this. Change-Id: I255c16f35149b738be2daf2800b1c90389f2c7cf Reviewed-on: https://gerrit.libreoffice.org/17472Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Norbert Thiebaud <nthiebaud@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/19862Reviewed-by:
Katarina Behrens <Katarina.Behrens@cib.de> Tested-by:
Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 0b5e3885)
-
Michael Stahl yazdı
various uninitialized variables in CppunitTest_sd_filters_test hang-8.ppt Change-Id: Id0b9f146a7ab8b5bb2b36a5c2a39d65ee52e122d (cherry picked from commit 78407eea) Reviewed-on: https://gerrit.libreoffice.org/20157Reviewed-by:
Caolán McNamara <caolanm@redhat.com> Tested-by:
Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d130afe6)
-
David Tardon yazdı
(cherry picked from commit b1e5983f) Change-Id: I493b79e70fb8003ce215e602f9b4ce92afa50150 Reviewed-on: https://gerrit.libreoffice.org/20156Reviewed-by:
Michael Stahl <mstahl@redhat.com> Tested-by:
Jenkins <ci@libreoffice.org> (cherry picked from commit 2dab392c)
-
Mike Kaganski yazdı
With simple transliteration, TextSearch::searchForward used to use whole string to perform the search, then started to create substring to search. But it left the precautions from commit c00601da by Eike Rathke: searching for $ may actually return a result set pointing behind the search string which it does with the ICU regex engine. The precaution made it to skip reverse mapping if index was 0. Commit 9aae521b by Michael Stahl didn't consider the case when nStop is 0, and startPos > 0. Then it tried to get offset[-1]. Anyway, using value of startPos in those conditions seems illogical. Removed those precautions (and made assertions for that). Fixed handling zero indexes. Reviewed-on: https://gerrit.libreoffice.org/19840Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Eike Rathke <erack@redhat.com> Tested-by:
Eike Rathke <erack@redhat.com> (cherry picked from commit 4cf1d290) remove comment that makes no sense, tdf#94810 follow-up nStart should not become <0, not even when searching for $ end. (cherry picked from commit 67ab2ce3) similar to searchForward() use the correct offsets, tdf#94810 related (cherry picked from commit ce91f3c1) Change-Id: I2066abc51fff7fb7323bc7f6198bdea06439d4f3 79586471f1a7908372fa3ee044a6f66499b1790f cb5a45acaad9029e0998594de8b3dc2e9211866e Reviewed-on: https://gerrit.libreoffice.org/20136Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Mike Kaganski <mikekaganski@hotmail.com> (cherry picked from commit 028d7d84)
-
Miklos Vajna yazdı
On one hand, neither our binary DOC import, nor Word maps the "TOC Heading" style to something special, and that's how the DOCX import added that property to some paragraphs in the document, moving the as-char picture from the first to the second page. OTOH, the DOCX export filter has a lcl_guessQFormat() function that explicitly assumes that such a style name exists in Writer document models, so again it doesn't make sense to handle this style name with special care. Change-Id: I3af548930f9683695fc3ad56b486e013f107d61a (cherry picked from commit 70f3c595) Reviewed-on: https://gerrit.libreoffice.org/20037Tested-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 0750162d)
-
Eike Rathke yazdı
Change-Id: I479a3083f56631135a7f6d94e2864583a9b30a30 (cherry picked from commit 660e37ad) Reviewed-on: https://gerrit.libreoffice.org/20101Reviewed-by:
Caolán McNamara <caolanm@redhat.com> Tested-by:
Caolán McNamara <caolanm@redhat.com> (cherry picked from commit afa3f711)
-
Laurent Balland-Poirier yazdı
Change-Id: I7896d1d064cd92fd45a6b32ac64f534f68213169 Reviewed-on: https://gerrit.libreoffice.org/20064Reviewed-by:
Eike Rathke <erack@redhat.com> Tested-by:
Eike Rathke <erack@redhat.com> (cherry picked from commit 96ff6372) Reviewed-on: https://gerrit.libreoffice.org/20126 (cherry picked from commit bad71e69)
-
Niklas Johansson yazdı
It seems that number recognition in tables are not working properly enter 10-10-10 and it should be converted to a date but it is not. I tracked it down to the fix of bug fdo#32082. It looks like bSetNumFmt was changed to false by mistake. Since then it has changed name to bSetNumFormat. From what I can tell fdo#32082 still works after this patch, but I might have missed some nuance of that bug report. Added two tests, one for the bug mentioned above and one to check that number recognition is working. At least with a simple date. Reviewed-on: https://gerrit.libreoffice.org/19563Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Jan Holesovsky <kendy@collabora.com> (cherry picked from commit aa334d55) Change-Id: Id58849a223eb602054c66c7379cd56a68a93dea2 Reviewed-on: https://gerrit.libreoffice.org/20082Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit d65ba563)
-
Katarina Behrens yazdı
this fixes a11y issue, where widgets inside VclScrolledWindow weren't accessible by keyboard as Tab, Alt-Tab events respectively, never reacheed those Change-Id: Ic73e24f8036b0f6129c3a4f5efb160f9089cb0b8 Reviewed-on: https://gerrit.libreoffice.org/19982Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 377381e2)
-
Andras Timar yazdı
ODF export in xmloff does the same Reviewed-on: https://gerrit.libreoffice.org/20051Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Andras Timar <andras.timar@collabora.com> (cherry picked from commit 11b7a2c8) Change-Id: I78ddbef3ac96f10f334c45a467dafb95bb9e3453 Reviewed-on: https://gerrit.libreoffice.org/20066Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 7cb41280)
-
Michael Stahl yazdı
- drop libxml2-freebsd.patch.1 (upstream libtool 2.4.6 does the same) - drop libxml2-vc15.patch (fixed upstream) Change-Id: Ia2f194f39efebd3d2ea924d23a5543ac53e93116 Reviewed-on: https://gerrit.libreoffice.org/20084Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Michael Stahl <mstahl@redhat.com> (cherry picked from commit 391bcf34) Reviewed-on: https://gerrit.libreoffice.org/20095Reviewed-by:
Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit c8c41401)
-
Michael Stahl yazdı
(cherry picked from commit 45d1abef) Change-Id: I733cd21f6d8c7ea1e01f594d1483ad9c2043c188 Reviewed-on: https://gerrit.libreoffice.org/20094Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 5211c705)
-
Winfried Donkers yazdı
Reviewed-on: https://gerrit.libreoffice.org/18792Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Eike Rathke <erack@redhat.com> Tested-by:
Eike Rathke <erack@redhat.com> (cherry picked from commit 5ba0f79e) Backported to 5-0 replacing the interim forward compatibility of 4a334351 Change-Id: Ic053342fde436a7053c15e32683e09b9e91f5308 Signed-off-by:
Eike Rathke <erack@redhat.com> (cherry picked from commit 656667ae)
-
Christian Lohmaier yazdı
Change-Id: I411a7e26f536a1e4924f566a2ecba097fc134db2 (cherry picked from commit 24271e34) (cherry picked from commit 10b190ee)
-
Caolán McNamara yazdı
it looks like draw:name values are supposed to be unique in ODF, even if it's not spelled out explicitly, since it exists so the frame can be referenced, which sort of implies that it has to be unique, so a document where the values aren't unique can be considered invalid 19.197.10 <draw:frame> The draw:name attribute specifies a name by which a <draw:frame> element can be referenced. So reject duplicate frames but limit this to document generated with 4.4.X which we believe is the version that created these bogus docs (cherry picked from commit de0432a9) Change-Id: I83f6d72fd969f667f0a8c2c85d2ffeeed672387a Reviewed-on: https://gerrit.libreoffice.org/20054Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Michael Stahl <mstahl@redhat.com> (cherry picked from commit df58e602)
-
Michael Stahl yazdı
XAccessibleEventBroadcaster::addAccessibleEventListener test calls the fireEvent() and the problem is that the event is triggered not on the print preview itself, but some toolbar button. This then causes an accessible event to be broadcast from the print preview too, but only after doAccessibleAction() returns, some time later from VCL main-loop. If the test checks the flag in the listener before the main thread sends the event, the test fails; try to fix that with XToolkit::processEventsToIdle(). (cherry picked from commit 1d87c245) qadevOOo: sadly XToolkit::processEventsToIdle doesn't fix... ... the ScAccessiblePreviewTable test, somehow the event still doesn't fire in time, let's add an arbitrary sleep too. (cherry picked from commit c94cf0cf) Change-Id: Ia52bdf99cdc349ffb0a03536fba271b792caae0f Reviewed-on: https://gerrit.libreoffice.org/20018Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e3ee6df3)
-
Laurent Balland-Poirier yazdı
Modify styles.xml to not use japanese language specification in style for date Change-Id: I0e418c06d5c8d6b04eeaa3e6f6c33c194ee2ef3f Reviewed-on: https://gerrit.libreoffice.org/20063Reviewed-by:
Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by:
Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit ec544c4b) Reviewed-on: https://gerrit.libreoffice.org/20071Reviewed-by:
Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by:
Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 7ff72979)
-
Eike Rathke yazdı
Regression of b5cd11b4 It was always wrong to propagate ForceArray already if a function had a ForceArray parameter *somewhere*, we need to do this per parameter instead. (cherry picked from commit 49257e1d) Conflicts: formula/source/core/api/FormulaCompiler.cxx prevent ForceArray propagation on the same token, tdf#95670 follow-up This may happen if the last RPN token is put and the function has a ForceArray parameter but now again would be wrong if not all parameters are ForceArray. (cherry picked from commit b31b17e5) 890fb6b5b88337033cfcf2e8189371ee39461205 -Werror,-Winconsistent-missing-override (cherry picked from commit 6edc492e) Backported to SAL_OVERRIDE 3bb2764b625d44f6e0cecbdde3363440faef63b5 Change-Id: If188d45366279d9a7bf641edc7e4dd7095d6d035 Reviewed-on: https://gerrit.libreoffice.org/19993Reviewed-by:
Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by:
Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 29adff38)
-
Eike Rathke yazdı
Change-Id: I2ae5a06f9ffe29de0b1cc5875615010da75f4ae9 (cherry picked from commit d1225d60) Reviewed-on: https://gerrit.libreoffice.org/20020Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by:
Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit d9b6f836)
-
Michael Stahl yazdı
Change-Id: I1d962ad637f19b02855616edebcedbad719689c5 (cherry picked from commit ee655627) Reviewed-on: https://gerrit.libreoffice.org/20053Tested-by:
Jenkins <ci@libreoffice.org> Reviewed-by:
Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 22f51321)
-