summaryrefslogtreecommitdiff
path: root/svx
AgeCommit message (Collapse)Author
2021-05-12fix some VirtualDevice leaksNoel Grandin
Change-Id: I645543fa27ca8b75b36ed7798f0af7b81fd09f49 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115477 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-11Resolves tdf#127406 - Font name and style name not readableHeiko Tietze
Font name dropdown made 5 chars larger, style name +3 Change-Id: Ia37af6742cf7b754b25b9af18d7b29858634e5a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115234 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
2021-05-11Fix style previews widget with multiple languagesSzymon Kłos
Broadcast also universal name (English identifier) for styles on change. This allows to select correct style without knowledge about all languages that other users use in other views. Fixes style previews widget in online with multiple sessions in different languages Change-Id: I9b9bcc92d96b5a5482a97a5947f148a638f257d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115093 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115298 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2021-05-10reduce frequency of dynamic_castNoel Grandin
by checking cheaper things first Change-Id: I0c93021966ee09967f0ce2e265adafb279b669bd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115356 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-10svx: fix crash with active text edit vs slide deleteMiklos Vajna
The problem is that SdrObjEditView::HideSdrPage() may delete SdrPaintView::mpPageView when it calls SdrGlueEditView::HideSdrPage(). But SdrObjEditView::pTextEditPV is a non-owning reference to that. GetTextEditBackgroundColor() in svx/ calls SdrObjEditView::GetTextEditPageView(), so in case SdrObjEditView::pTextEditPV is not cleared, we would access a deleted SdrPageView. Change-Id: I948bae8e0e8d557e38aa8f243e9eea522b21a043 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115324 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2021-05-10do not leak SdrObject global pool on shutdownNoel Grandin
Change-Id: Id2948f044edc7a4c9497ece5fe7d497e826bc04b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115237 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-08ref-count SfxItemPoolNoel Grandin
so we can remove SfxItemPoolUser, which is a right performance hog when we have large calc spreadsheets Change-Id: I344002f536f6eead5cf98c6647dd1667fd9c8874 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115247 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-07use a single global item pool for chart2 draw modelNoel Grandin
which exposed a bug in SvxUnoNameItemTable::replaceByName Change-Id: If3207df6d46a2185b78ea5c3e1c145527b42d7cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115126 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-07add utility method to get last pool in chainNoel Grandin
Change-Id: If21defdf1b59219e3b81d803423713972412da7a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115244 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-06Limit scopes of some variablesMike Kaganski
Change-Id: Ia8b2aae8953e2543b5c49a2cd7ddc4e84ba46f4c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115197 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-05-06add SfxItemPoolDeleter utilityNoel Grandin
add use so we can hold the pool with std::unique_ptr Change-Id: I685fbc37c0ae145a5b48a66a88eab9fb29a0fc0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115174 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-06use Widget::get_clipboardCaolán McNamara
there's no different from GetSystemClipboard except potentially for the libreofficekit case where per-frame clipboards are possible Change-Id: I3173e39f81a03a7cbe114ebca6020d5ed36a659a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115179 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-05-05loplugin:constmethodNoel Grandin
Change-Id: I7913fd8144d521b8293ac43036d0fad82e457cd1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115145 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-05Don't initialize variables only to reset laterMike Kaganski
Change-Id: I38d618216099e218827d205e8acaab3aef0c744c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115082 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-05-05tdf#141935 svx cui: apply line cap setting of line stylesLászló Németh
Only line dash pattern of the selected line style was applied on the selected line or shape using the 1) Line Style popup menu of Drawing toolbar and sidebar pane Properties and 2) Style popup menu of Line pane of Line setting dialog window. Now both line dash and line cap settings are applied, supporting the usage of the new "rounded" preset styles and the old not "rounded" versions. Follow-up to commit b9b2c6a98fec798fc0ec76ec3cd407724f19dcac "tdf#141933 add preset dash styles with round cap". Change-Id: Ib3f64afcdcb50545166d40476a03a4b45f7d0b8a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114461 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-05-05tdf#141934 svx dialog: fix missing dots in line style previewLászló Németh
Line styles with dot-like dots (e.g the new "rounded" preset line styles) got bad preview with missing dots in the line style popup menus. Follow-up to commit b9b2c6a98fec798fc0ec76ec3cd407724f19dcac "tdf#141933 add preset dash styles with round cap". Change-Id: I0d18feb2772a47588b41dea2138cdcb14332c8b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114460 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-05-05inline SdrModel::ImpCtorNoel Grandin
since it is only called from one spot Change-Id: Ib94bc364c57ed0d36dc99f56f026cd44f27258ae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115123 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-04tdf#139500 svx: fix crash on changing table properties during active text editMiklos Vajna
Regression from commit fdeb04f7c59cf8032fe17072ed779e70505cc6ab (tdf#129961 svx: finish UI for table shadow as direct format, 2020-12-15), the problem was that the BegUndo() / EndUndo() pair can be only used if we know that the text edit of a cell of a table shape is not started or ended in-between. The bugreport scenario was an active text edit, where setting attributes on the shape ends the text edit: #9 0x7f6dbb417121 in SdrEditView::EndTextEditAllViews() const /svx/source/svdraw/svdedtv.cxx:1079:20 #10 0x7f6dbb466798 in SdrEditView::SetAttrToMarked(SfxItemSet const&, bool) /svx/source/svdraw/svdedtv1.cxx:1095:9 #11 0x7f6dbc34b0af in sdr::table::SvxTableController::SetAttrToSelectedShape(SfxItemSet const&) /svx/source/table/tablecontroller.cxx:2738:12 Which also means that the underlying edit engine is deleted. But then undo/redo would still reference that edit engine: ==31830==ERROR: AddressSanitizer: heap-use-after-free on address 0x60c0001fc300 at pc 0x7f6dd73a9cb9 bp 0x7fff788db4b0 sp 0x7fff788db4a8 READ of size 8 at 0x60c0001fc300 thread T0 #0 0x7f6dd73a9cb8 in EditUndo::GetComment() const /editeng/source/editeng/editundo.cxx:147:34 Fix the problem by not grouping in case there is an active text edit, that's not something I considered when I added the original grouping. Change-Id: I4f3583e21a27f8380c35b3f4563ce496819bcb81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115049 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-05-03There's no longer a purpose to the math horizontal scrollbarCaolán McNamara
since... commit f89860807baaa901629ce2a814b7a6c994318fe5 Date: Sat Feb 13 16:43:01 2021 +0100 Resolves tdf#140221 auto-adjust Formula Editor width so remove that. And merge the starmath Resize logic into the baseclass, and emit EditViewScrollStateChange from there. The goal is that resizing the starmath window does not visually horizontally scroll content negatively outside the widget Change-Id: I1a79a0d5a194e8cfb0d2d2cb07b0b80172f1f66c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115012 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-05-03loplugin:unnecessaryparen small improvementNoel Grandin
when calling a function, and passing only one arg, but the function has defaulted args, we were ignoring this case. Change-Id: I86517f18e30531127664088ddc09ef96dbd8bdf5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115033 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-05-03tdf#141995 Remove uno:Flash command from Customize dialogGabor Kelemen
Change-Id: Ie94e24a3f8ba518dde509c3cfa6d98e542074e3f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114988 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-05-03lok: Edit the click selected cell on table selectionmerttumer
for LOK case, it should start editing when table is selected from the cell that is under the cursor instead of selecting the table object. Change-Id: Ibb3fa41377b76edcdcc2be7419838a151ff765fe Signed-off-by: merttumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114386 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114646 Tested-by: Jenkins
2021-05-03Fix Row size change is not updatedmerttumer
Row size is not taken into account when there is a change Only if column size/position changes, it starts updating Change-Id: I99f3aa9fe0e7f3428234062a2520ca8a61984067 Signed-off-by: merttumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114130 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114645 Tested-by: Jenkins
2021-05-03Implemented CTRL + A selects all the cellsmerttumer
When the table is selected, ctrl + a should select all the cells unless text editing is enabled. The previous behavior was deselecting the table and marking all the objects. However, for table it should select all the cells instead. Change-Id: I9fb512618a61a96ff21daa74c5a4ae9b31e3906e Signed-off-by: merttumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114129 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114644 Tested-by: Jenkins
2021-05-03Fix ESC key selects all the cells of the table objectmerttumer
Selecting the table should not necessarily mean selecting all the cells. If all the cells are selected which ESC key does the same thing, it is impossible to delete the table with the delete key, only after an input following by an ESC deleselects them and deleting becomes possible. Change-Id: I33f182d330f1cbc411d47b86098a4aea544a90ae Signed-off-by: merttumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114128 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114643 Tested-by: Jenkins
2021-05-02drop unneeded temporaryCaolán McNamara
Change-Id: If9c774ccee4855e16e985332d9f2574403497ff2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114978 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-05-02throw() -> noexcept, part 2/3: Automatic loplugin:noexcept rewriteStephan Bergmann
Change-Id: I076f16d0536b534abf0ced4d76051eadb4c0e033 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114949 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-05-02tdf#79049 speed up OOXML workbook load (4)Noel Grandin
Optimise LocaleDataWrapper for reads by initialising the data we in the constructor, so we don't need any kind of locking Reduces load time from 34s to 28s. Change-Id: I4bd3bddb30b70ba015fe5b1372534f9507762b74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114960 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-30Related: tdf#138281 move grab_focus to ActivateFindCaolán McNamara
and remove the explicit KeyInput callback handling of "KEY_RETURN" in favor of the ActivateHdl callback which Entry emits from its built-in KeyInput handler Change-Id: Ie6ddc8d73345400586418f2495958b14ab61c7d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114907 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-30allow dnd into weldeditviewCaolán McNamara
Change-Id: I42fafed01a3884279781642154656f0ee32ad431 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114846 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-30extend the selection range so adjacent lines are considered one blockCaolán McNamara
and so we get one border around multiple lines of an editview selection Change-Id: Ic641035da1c7d2b891cd6e6193b524e6b581e76f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114895 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-29loplugin:stringadd simplify some *StringBuffer operationsNoel Grandin
pulled from a larger patch which I created with a more permissive variant of this plugin Change-Id: I7abf1f3f09e84703b6e0e52fe9587dff691b2187 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114875 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-29tdf#141967 bail early in Activate if disposingCaolán McNamara
because focus bounces around the dialog as its being torn down widget by widget Change-Id: I2afd094bb13929c25268168175c142ca8e0074e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114880 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-29do not apply line dashing in drawinglayer (tdf#136957)Luboš Luňák
basegfx::utils::applyLineDashing() is not as good as the actual VCL backend dashing, and there are some rounding errors because of all the canvas transformation matrices or whatever, which leads to the drawing problem. So use LineInfo to carry the dashing information. As a part of this change, also make LineInfo use doubles instead of ints. The use of transformation matrices means that the values may be fractional and less than one. Change-Id: Ia5ac7d266cab344b7137052c81fbd96c1ce28003 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114710 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-04-29can stack-allocate thisNoel Grandin
Change-Id: I53de9926bb3eb662ab6f9065bf1d9190df76c0c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114879 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-29use unique_ptr in TextEditOverlayObjectNoel Grandin
Change-Id: I0deb52ee36a16aad91a5f945a6d92c1aa18a58a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114878 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-29rename ECKEN -> CORNERNoel Grandin
Change-Id: I24438213431bd2866e2bcefc8a054a03bc975ef4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114841 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-29remove support for BITMASK in vcl backendsNoel Grandin
Rather use a proper alpha channel if we need transparency. This is another small step towards merged alpha in our vcl layer. I suspect the intent in a lot of this code was to save memory. Which have been a thing way back then, but these days our backends mostly end up doing a copy-and-convert to a real alpha channel anyway, so the existing code is actually now a pessimisation. Change-Id: I4a2bcbb2f76b841f05bc00580f364492829c69de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114808 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-28createPixelProcessor2DFromOutputDevice won't return nullCaolán McNamara
nor will createProcessor2DFromOutputDevice Change-Id: I1e0359ef2f94eeaf2da9a89d9e9dfb615587d3da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114814 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-28replace old-school RasterOp::Invert selection in weldeditviewCaolán McNamara
with the prettier semi-transparent selection used elsewhere affects e.g. math command window, writer comments, calc input bar, calc Headers/Footers dialog. Change-Id: I35f8211f6e86c4278db84a6b6aa5306d5b1df468 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114804 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-28use string_view in INetURLObject::encodeNoel Grandin
Change-Id: Ib686c6872388b02c8939d3b65f6bd25cda348bc8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114754 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-27loplugin:moveoptNoel Grandin
An attempt that did not find anything convincing enough to finish it up and make it permanently active. So just leave it in /store for now. Change-Id: I1750e177655a4a510da100f880ba81bf762be277 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114742 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-27use more string_view in tools/streamNoel Grandin
Change-Id: I2a957cd72d71fea717734488cdb3670e0bcdd6f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114657 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-26drop mask from BitmapExNoel Grandin
So that we have fewer cases to deal with when we transition to 32-bit bitmaps. (*) rename maMask to maAlphaMask, since now it is only being used for alpha duties. (*) drop mbAlpha and mbTransparent to simplify state management, the only thing we need to check for alpha is if maAlphaMask is non-empty. Change-Id: I06252e38e950e846a94b4c2ba8ea763be17801fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111679 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-24tdf#139699: remove stray image that is not used anywhereKatarina Behrens
Tool button using the image was removed by 5da3ae08596c2465532e662537f5292454a84a3e and with no other tool button using it, it accounts for blue 'decoration' at the top of 3D effects dialog Change-Id: Id5705832614315316433e38e0c8635e1b4a3d906 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114569 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-04-23use get_accessible_location_on_screen to get positionCaolán McNamara
instead of digging into parent a11y via getAccessibleParent which isn't there when hosted in a gtk widget Change-Id: I417737ae568c823b550bc259c3b3047124a411ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114552 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-23undo blocking emitting focus events during grab_focusCaolán McNamara
revert... commit f97dbac73fe149e8fed0932890d0c1d6be4869a3 Author: Caolán McNamara <caolanm@redhat.com> Date: Wed Jun 26 21:00:02 2019 +0100 infinite focus changing in toc biblio page which blocked calling focus-changed callbacks when grab_focus is called explicitly analogous to how we block value-changed callbacks setting values through code but don't block them when the value is changed by user interaction. In retrospect that was a poor choice, so revert that and subsequent workarounds in favour of just not calling gtk_grab_focus if the widget already has focus. checked: a) tdf#138427 focus set to wrong input box b) tdf#138078 only call GetFocus if we gained focus from an unfocused state c) tdf#137993 ensure the toplevel vcl::Window is activated d) tdf#136941 call focus in handler explicitly Change-Id: I411480e2d627aa9995fb41b0aa17e9fb6d34d73f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114524 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-04-23std::move optimisationNoel Grandin
Change-Id: I626ae2fc3e8be7cb7770adfff2f99f0a7e130e93 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114516 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-22no need to create temporaries when appending number to O[U]StringBufferNoel Grandin
Change-Id: I36d82423b5f75010552696a66cec7e53ee265ce4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114395 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-04-22remove caching in ViewObjectContactOfE3dNoel Grandin
we are re-creating it every time, so caching makes no sense Change-Id: I8a175c7ebd83c369c644d5936004167906539ad7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114517 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>