summaryrefslogtreecommitdiff
path: root/desktop
AgeCommit message (Collapse)Author
2020-09-15Online: selection highlight in Calc should follow font size changes.Marco Cecchetti
When user changes font size of selected text, markers and highlight rectangle should be updated. impedit3.cxx: Line had no effect, removed. Lokitsearchtest.cxx: Test had bug. Other changes: LOKit code is separated. Now callback_text_selection is fired when font size is changed (Calc). On Writer it already behaves that way. Change-Id: I9b7e3224ad162bfb7d8f0853b6cb17b4feafa0cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101193 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Marco Cecchetti <marco.cecchetti@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102465 Tested-by: Jenkins
2020-09-13tdf#124176 Use #pragma once in desktopGeorge Bateman
This commit was carried out by a Python script, source of which is at https://bugs.documentfoundation.org/show_bug.cgi?id=124176#c97. Change-Id: I26f01467d2a572a51c7ace76628d4a8f96f249a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102553 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-12replace sal_IntPtr with simple integer typeCaolán McNamara
Change-Id: I5aaf606b684b69641a872b3405b4d4d378289ad4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102466 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-09-09improve loplugin:unusedvarsglobalNoel Grandin
to find any global variable, was checking the wrong property of VarDecl Change-Id: I454b4e0c1701bb0771768a1ee10cd738c4ab0726 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102278 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-09-02move Edit into toolkit only headersCaolán McNamara
Change-Id: If51bf7143116721e8f16272cf8aff797651d5ed1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101880 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-09-02lok: send state updates for shape editing commandsSzymon Kłos
Change-Id: I0fcb8ef76df89723ee74aa96a003e0d49d558872 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100081 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101520 Tested-by: Jenkins
2020-09-01Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: Ide85943961b6f5102294356ff623c6be8d7bc790 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101813 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-09-01Fix typo in codeAndrea Gelmini
It passed "make check" on Linux Change-Id: I8be2457de5018e1e764e378e609c3a41c3cb9d11 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101802 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-08-28Simply use aStr as-isStephan Bergmann
...instead of creating a copy via the OUString(sal_Unicode const *) ctor. (This might be a leftover from a time when dp_misc::writeConsole would have taken a raw pointer.) Change-Id: I53192de8fe8ade25d30c4b22a18390db79194d20 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101571 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-28Change OUStringLiteral from char[] to char16_t[]Stephan Bergmann
This is a prerequisite for making conversion from OUStringLiteral to OUString more efficient at least for C++20 (by replacing its internals with a constexpr- generated sal_uString-compatible layout with a SAL_STRING_STATIC_FLAG refCount, conditionally for C++20 for now). For a configure-wise bare-bones build on Linux, size reported by `du -bs instdir` grew by 118792 bytes from 1155636636 to 1155755428. In most places just a u"..." string literal prefix had to be added. In some places char const a[] = "..."; variables have been changed to char16_t, and a few places required even further changes to code (which prompted the addition of include/o3tl/string_view.hxx helper function o3tl::equalsIgnoreAsciiCase and the additional OUString::createFromAscii overload). For all uses of macros expanding to string literals, the relevant uses have been rewritten as u"" MACRO instead of changing the macro definitions. It should be possible to change at least some of those macro definitions (and drop the u"" from their call sites) in follow-up commits. Change-Id: Iec4ef1a057d412d22443312d40c6a8a290dc6144 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101483 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-28LOK: send status of the sidebarPranam Lashkari
sidebar button did not show status initially similarly view->sidebar did not show checked/unchecked initially and same problem can be seen in notebookbar Change-Id: Ie5fdf298d343435514954efaaebfdc628d4a90fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101182 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101509 Tested-by: Jenkins Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
2020-08-27remove some unused includes and update pchesCaolán McNamara
Change-Id: I786548bef39fa711aabcff32b592b3fdc4a6f9fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101486 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-27LOK: send state of FreezePanesPranam Lashkari
Change-Id: I817117d05f7f0f75f65c8e6dbf6105d120ab275d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101031 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101372 Tested-by: Jenkins Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
2020-08-26lok: send cell border state updatesSzymon Kłos
Change-Id: I400ee3cb9f0a98804d98e25d0164fa5148b79191 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100424 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101385 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2020-08-24tdf#118148 Extended tips from HC2/shared/Olivier Hallot
These extended tips are extracted from <ahelp> in Help files Only for ui files, where dialogs/widget pair could be determined. Other forms of <ahelp hid=".."> such as .uno:.. and *HID* ... will be addressed elswhere. Change#1 Removed extended tips from GtkMenu of svx/.../acceptrejectchangesdialog.ui Change#2 Some empty ET's slipped in cui/macroselectdialog.ui Change-Id: Ic8dc62734143f621fcd3c4156fc004f585630277 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101186 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-20loplugin:constantparamNoel Grandin
Change-Id: I59a37e1d37fa749cba5159daa23fe663bcc55435 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101045 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-19update pchesCaolán McNamara
Change-Id: I6a300169d33bdc36e4c7e720a7afc336a86eea68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100962 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-19Fix typosAndrea Gelmini
Change-Id: I58c510121a9f535b2a31854f10b5f6535554d379 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100988 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2020-08-18Fix hyperlink popup does not show upMert Tumer
The popup does not show up when double clicking same cell after first one when the cell has a hyperlink. This is because LOK_CALLBACK_INVALIDATE _VISIBLE_CURSOR message is filtered out when it is duplicate and hyperlink is inside this callback. Selecting different cell after editing one does not make calc to send another invalidate cursor message because it is only sent if the selected cell is being edited. This confuses the ui experience, so this patch prevents the callback from being filtered out if only it contains a hyperlink. If there is not a hyperlink on the cursor position the duplicate callbacks will still be filtered out. Signed-off-by: Mert Tumer <mert.tumer@collabora.com> Change-Id: Ibca0887b7d49633e476bc63d08bc0b7cc309d710 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100851 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-08-18loplugin:unusedvarsglobalNoel Grandin
tackle some read-only vars. Mark some of them const to make it obvious they are not really used, and to make the constantparam plugin see more data. Change-Id: Ia25927745866746aa1aa9d5affd5857ad9f9ee24 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100895 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-18new loplugin:unusedvarsglobalNoel Grandin
I copied and modified the unusedfields plugin to find unused variables. Change-Id: I18ed6daa202da70a2e564e4fe4760aed7ce070ba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100891 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-17[API CHANGE] remove OSL_SIGNAL_USER_RESOURCEFAILURENoel Grandin
which is unused since commit 00657aef09d854c74fb426a935a3e8b1fc390bb0 Date: Sun Jun 11 20:56:30 2017 +0100 migrate to boost::gettext Change-Id: Ia66a3a729dc4999c95b96ae1754b07c372121370 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100810 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-14loplugin:simplifybool moreNoel Grandin
look for expressions like !(a && !b) which can be expanded out Change-Id: I72515a9638762b050f9a258c08da39ebfa2ef8e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100579 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-14add comments and log some exceptionsNoel Grandin
Change-Id: I8fab74e92a932fd284a63357e7a20f208af2d20d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100728 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-14dont catch&abort Desktop::OpenClients_ImplNoel Grandin
rather just let the debugger or crashpad handle it Change-Id: I44e0dd06f2c84a7bf0099093a53032d759c18dea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100729 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-14avoid catch&abort in Desktop::MainNoel Grandin
It is better to let the exception be uncaught and then catch that in the debugger, or let our crashpad handler capture a full stack-trace and report it. Change-Id: If5a4259c22c9f47d788e01725c802eeeb46162e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94596 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-13Add "All supported files" filter to extension add dialogSamuel Mehrbrodt
Did you know you can install xcu files directly via extension manager? Now it should be easier to discover... Change-Id: I9a96708fd13f762b20916540e6fa9b87bb582677 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100176 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2020-08-13loplugin:stringstatic also look for local staticsNoel Grandin
Add some API to O*StringLiteral, to make it easier to use in some places that were using O*String Change-Id: I1fb93bd47ac2065c9220d509aad3f4320326d99e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100270 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-12SvTreeListBox can move into toolkit headers nowCaolán McNamara
Change-Id: I6b3b6ef1530a192f4b6bf87aa9688687063683ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100591 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-08-12lok: update track changes status for calcSzymon Kłos
Change-Id: Ifb5ac3739ff19154b97ea1258c77739bde0cfb80 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100075 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100460 Tested-by: Jenkins
2020-08-11lok: state updates for vertical alignmentSzymon Kłos
Change-Id: I6767904e3d3366e1316c932555b979a26e77b8c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99998 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100459 Tested-by: Jenkins
2020-08-11lok: state updates for commands in WriterSzymon Kłos
Change-Id: Id3d429ff4788abce03e9d7c5522655f362d6c249 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99996 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100458 Tested-by: Jenkins
2020-08-06unotest: one Resetter is enoughMiklos Vajna
It seems all 3 places derive from unotest::MacrosTest, so extract the common code there. Change-Id: I71a2474a7d6b1623f50575f9e9c43580ba076330 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100185 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-08-04Remove seemingly unused #includesStephan Bergmann
...that caused > desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx(81,10): error: macro is not used [-Werror,-Wunused-macros] > # define WIN32_LEAN_AND_MEAN > ^ with clang-cl Change-Id: I129f659aa196e0e713d7bd9065c637d65ee2ac10 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100118 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-04Improved loplugin:staticanonymous -> redundantstatic redux, clang-clStephan Bergmann
Change-Id: Ie6dc22edbcfdf05ab8d7d668cb7cc33b5b747995 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100100 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-08-04mobile: fix calc chart wizard properties is not shownMert Tumer
Change-Id: I2fd98ddbdb529c3f224299c6824b4743797925be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93747 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97061 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98248 Tested-by: Jenkins Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
2020-08-04added ability to switch sidebar deck on init.cxx for mobilewizardMert Tumer
Change-Id: I532398bc41e1c984c24b1d39e4844315a0a69847 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93162 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97062 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98247 Tested-by: Jenkins Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
2020-08-04Fix .uno:SidebarHide command works for onlineMert Tumer
Signed-off-by: Mert Tumer <mert.tumer@collabora.com> Change-Id: I03743d15300687b1da947d3c44be6a42aab83107 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96513 Tested-by: Jenkins
2020-08-04loplugin:simplifybool a little more aggressiveNoel Grandin
with expressions like !(a && b) Change-Id: Id2acec2a8d0eaaa8e5e37dbd2cae7281be36572e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100040 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-08-03loplugin:flatten in configmgr..i18nutilNoel Grandin
Change-Id: Idaeed33df4f1dd1b2acbdaf8a895c5d56c3ca14c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99980 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-07-29LOK: send state of ShowResolvedAnnotationsPranam Lashkari
Change-Id: Icd8756719bc75bbd780cbf25d21f7834a1d7fc8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99252 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99256 Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2020-07-27allow to .uno:Save a PDF doc - divert to SaveAs to the doc. fileTomaž Vajngerl
To save PDF annotations, we need to allow a .uno:Save if the document was opened from a PDF file. When we get a .uno:Save command, we need to divert that to SaveAs into the same file as the current document was opened with. Change-Id: I0c511c4e5501de03ea8b0efb5aaf37cd09936e6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99463 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2020-07-24lok-freezepanes: Generalize FreezePanes* uno-commands...Dennis Francis
to allow an integer parameter as the row/column index of the freeze and use them to set/get freeze indices (row/column) from the lok clients. The behaviour of the exisiting freeze/split-panes controls in desktop Calc is not affected, but new menu/notebookbar options can be added for freezing on a specific row/column in a follow-up commit. For now, the freeze-panes are shared between all views for each tab of the spreadsheet. "Private" freeze-panes support can also be added without much difficulty (for this we need another uno command for the private/shared flag, but that can be in a separate commit). Notes regarding compatibility: Since Online-Calc has support only for the freeze-panes functionality presently, any pre-exisiting 'real splits' in the spreadsheet (created using the native-desktop Calc or alternatives) are converted to equivalent 'freezes' on import, but on export, such 'freezes' are re-converted and written as 'real splits'. In case the spreadsheet has 'freezes' on import, they are used/exported as such. In short, the type of sheet-window splits in the document are preserved. Change-Id: Ia990616f5cedfb2b5db820770c17ec7e209f0e48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99347 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-by: Dennis Francis <dennis.francis@collabora.com> Tested-by: Jenkins
2020-07-16compact namespace: dbaccess,desktopNoel Grandin
Change-Id: I648ec763e6e2a3022f9b6cc35f536742b59d35fc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98909 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-07-16jsdialog: optimization, use latest state, ignore previousSzymon Kłos
Change-Id: Id637accc4f006ae6206b4e87a44b30d1a8340723 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97849 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98827 Tested-by: Jenkins
2020-07-15jsdialog: move executor code to vclSzymon Kłos
Change-Id: I9247a652707fe3239dc488a605a2c506d8eec95c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97736 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98819 Tested-by: Jenkins
2020-07-14CppunitTest_desktop_lib: handle SignatureState::OK after loadingMiklos Vajna
The purpose of DesktopLOKTest::testGetSignatureState_Signed() is to make sure that in case we don't trust a cert and we add the necessary CAs, then we trust the cert. So just return early when we trust the cert already, it's not an interesting failure. Change-Id: I32f24b5464a0e14156292de2acda562025ded73f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98673 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
2020-07-13desktop: separate executable shortcut for safe-modeVasily Melenchuk
In situations when no command line params are available (for example in Windows Store msix packages they are still missing) let's try to use another executable shortcut for soffice Change-Id: I6d083912dbed1166d2d68efa5eb0096b73cb58c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98382 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-12update pchesCaolán McNamara
Change-Id: I75602277a5a26b012a12f2c4f4b7ff5bb663b0b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98474 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-07-12add test for editing of annotations (using .uno:EditAnnotation)Tomaž Vajngerl
Change-Id: Ic798ab94bb63a3ae80882e77cf1582d875e27d4b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98583 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>