summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2021-07-03tdf#143176 Old Hungarian transliteration: fix AutoCorrect->ApplyLászló Németh
and "Apply and Edit Changes". Transliteration worked only during typing, because AutoCorrect->Apply and "Apply and Edit Changes" remove right-to-left text direction silently, which resulted missing transliteration of text (with Default Paragraph Style and right-to-left direction) to Old Hungarian. Change-Id: I1481d958494828b6dce66f2eeecb44b327c70db4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118346 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org>
2021-07-02no need to allocate return val on heap for GetItemSetForPreviewNoel Grandin
Change-Id: I261182ec2348df045171c5e1beb33579e2c0c766 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118284 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-07-02convert SvSortMode to scoped enumNoel Grandin
Change-Id: Ic137e1918f8fa33fbfe6a622be20aa4001172e2e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118280 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-07-02convert AccessibleBrowseBoxObjType to scoped enumNoel Grandin
Change-Id: Iaf764c905d080e4decabd853bd3847b34cb79cdd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118279 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-07-02tdf#143149 fix crash if app exits while print progress is runningCaolán McNamara
dismiss the dialog if its parent goes away, but leave the print job running Change-Id: Ic29ee0300a7d9476ad27a2594a555312e30c74f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118244 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-07-01sfx2::FileDialogHelper allocate SfxItemSet on stackNoel Grandin
and pass around the explicit sub-type, instead of doing static_cast in various places Change-Id: I28ba8fd6f5c9e2a1ffbf5ec091bcf0ebdd1d18b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118210 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-07-01BmpCombine::And is deadNoel Grandin
ever since commit ddd2639a482befb4a3bf1f75a88e66c21a691b67 Date: Sat Feb 27 15:50:37 2021 +0200 drop mask from BitmapEx Change-Id: I45fae0140067e2bfe5ce1ae2f5014ce733835ef1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118220 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-07-01can pass this SfxItemSet around on the stackNoel Grandin
Change-Id: Ie2e67ec19cfacdfdd0a6dd85c464cfa326b6500d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118209 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-07-01tdf#143028 DOCX: fix corrupt export of shape "bracePair" etc.Attila Bakos (NISZ)
Regression from commit 63cd67e5e18f01aca303131e148c80398a181a41 (tdf#92525 tdf#142398: fix export of simple custom shapes) Missing property in the shape export property list caused an exception. The return value false led to writing the shape transformation again, resulting a corrupt DOCX file. Optional values have been introduced and if one of the required value is unset, writing of the transformation happens only once. Thanks to Regina Henschel for reporting the problem. Change-Id: Ieae69bb1d2629fdbb91a84325cb100f0ad9d3e12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117763 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-07-01loplugin:unusedmethodsNoel Grandin
Change-Id: I3ff5333c1e73ca61b0a7339e4b7dcfce211b88e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118207 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-30reduce cost of allocating and copying SvxNumRuleNoel Grandin
by using std::move to avoid copying unnecessarily Change-Id: I940b57c9a05c8d75b9a16291fc4f05756fdeea12 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118164 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-30tdf#139301 tdf#141933 (related) Translate new preset dash namesGabor Kelemen
Change-Id: I9cd7ad0eca1a6fb471a284fb2828a7ad12816337 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117024 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-06-30Purge out rtl::math::setNanBaiXiaochun
Change-Id: If8794c105e279afd4437517d3e61f2f900eb6490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118123 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-06-29Fix typosAndrea Gelmini
Change-Id: Ic943746614b894690768d0d6109123c1af819c52 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118081 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Andrea Gelmini <andrea.gelmini@gelma.net>
2021-06-29constructing SaveOptions just to read default versionNoel Grandin
can be a little expensive sometimes, since it loads a bunch of other stuff at the same time. So create a custom method that just loads the version Change-Id: Ic480d95c4d64c68e57faf1b52f1d102141b7e246 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118047 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-29Enable flushing accumulated Trace Events when their number reaches a limitTor Lillqvist
Change-Id: I99ecf56b0faa5c444dbe9e22b8cce035f240c35c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118088 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2021-06-29tdf#135316 share themePtr and ShapeFilterBase across all shapesNoel Grandin
.. in a document. Shavves 20% off my load time. Change-Id: I8101b4d229485ebdef0c1f72f856e7cda43559d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118045 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-29tdf#142913 PPTX: slideshow setting “Start from” not importedTibor Nagy
Note: see Slide Show->Slide Show Settings...->Range->From: on the UI, or press Shift-F5 after loading the unit test document sd/qa/unit/data/pptx/tdf142913.pptx. Change-Id: I2e10a4353c26600bf405475cb89990413c81dc1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117705 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-06-29Added a UI dialog box for running the VCL backend testshomeboy445
The UI dialog box will allow the user to run the VCL graphics tests and will allow them to view the results as well. Change-Id: Ice289444ff425496a3e400a4c2bc06c307168c62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117384 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-06-29new ODF numbered list parameter loext:num-list-formatVasily Melenchuk
Instead of style:num-prefix and style:num-suffix new list format is much more flexible for storing list multilevel numberings. Now it is possible to have not just prefix/suffix but any random separators between levels, arbitrary levels order, etc. Internal LO format for list format is changed: instead of placeholders like %1, %2, etc we right now use %1%, %2%... Reason: for ODT documents, having more than 9 levels there is ambiguity in "%10": it is "%1" followed by "0" suffix, or "%10"? Aux changes: * removed zero width space hack: since format string is always defined this hack is interfering with standard list numbers printing (see changes in ooxmlexport14.cxx, ww8export3.cxx tests) * changed cross-references values to lists: they are now including full list label string: previously this was bit self-contradictory (see changes in odfexport.cxx and check_cross_references.py tests) Change-Id: I9696cc4846375c5f6222539aeaadbca5ae58ce27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117156 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-06-28There appears to be no reason for (DBG_UTIL-only) ~VclPtr to be virtualStephan Bergmann
...ever since it was introduced with 3ecb9b4bd7dc70664bbb8d7c957ea8dc5015223f "tdf#99352: assert on stray VclPtrs past DeInit" Change-Id: I4b87a6bacb53f74ff612a4193cee42145ea04fdb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117878 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-06-28[API CHANGE] drop ShapeContextHandler service and interfaceNoel Grandin
There is zero chance an extension is using this, because it is so intimately tired together with the oox and writerfilter interactions. I'm removing this so I can expose the ShapeContextHandler and then override it's implementation in a more fashion without jumping through UNO hoops. Change-Id: I79ef30247f4642303dfdb92bbf8f6e6226234829 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117996 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-27Immediately schedule Tasks on start per defaultJan-Marek Glogowski
While writing a new Task, I was wondering, why it didn't schedule immediatly after calling Start(). Turned out Start() wasn't even calling Task::StartTimer(...) to trigger / wake up the Scheduler. So this changes Task's Start() to call StartTimer(0) to immediatly trigger the Scheduler at the end of Start(), but Tasks can opt out of it, if they aren't ready yet (like Timers). Change-Id: Ia2fdb45f502866c83f432b045e70bf27ccb61012 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117947 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2021-06-27svx: clean-up, init in constructor, rename master pages variableTomaž Vajngerl
- maMaPag to maMasterPages - cleanup the constructor variable initialization - change degree chart from define to const variable Change-Id: Idc607b8b386855b90001ed389df2c7849969ee86 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117887 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-06-26ofz#35597 Null-dereference READCaolán McNamara
add a check for null getTextBody() return unfold it a bit while I'm at it Change-Id: Ib0286048536ad576b520e1adb08fa9b36da9243f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117938 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-24BmpScaleFlag::Super is deadNoel Grandin
ever since commit 2269ac65de127d33d41843ae15f6bece5bc778bc Author: Michael Meeks <michael.meeks@collabora.com> Date: Fri Nov 7 05:42:51 2014 +0000 icontest: remove hand-coded opengl path. Change-Id: Ida030be0e087353e20897a9e961c9ce1134b21e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117782 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-24remove uno::Type move constructorNoel Grandin
not necessary for the optimisation I was going for, and actually less efficient than just using the copy constructor Change-Id: I0f2019a0bf032283fb6c8d5d834603ea7a5ce3c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117762 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-24uno::Type needs a move operatorNoel Grandin
speeds up some operations where Type is stored in a vector Change-Id: Id7112e51d4e4707bc6d261313e994c6ffef54d31 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117693 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-24Delete copy ctors/assignments for DLLEXPORT classMike Kaganski
... instead of including <vcl/window.hxx> where it is not directly used. For details, see commit ee405fb2ef36337851801f1bd34411c606d55988. This reverts commits 6aa6b6c814b0353768fa7276d1f11d69a0ebedba and beeb19b361213d22247e5cb776dc522cbf190ca8. Change-Id: Ia91f3c303e1df0a698d06cdef1d8e64e99d781ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117751 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-06-23tdf#135316 add SvFileStream::SetDontFlushOnCloseNoel Grandin
if we're going to be deleting a temporary file, there is no point flushing it on close, which has a measureable cost This takes my load time from 17s to 16s Change-Id: I2fce7eeaf0ce9fef826b4ce9a1a4d4c8114cac76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117607 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-23The Chrome Trace Event viewer doesn't support nested async eventsTor Lillqvist
Instead of nestable b(egin) and e(nd) events, generate the allegedly deprecated S(tart)' and F(inish) events. Makes the code simpler. (And AsyncEvent is still unused. Unclear whether adding it was based on a misunderstanding.) Change-Id: Ic029b67e0951dda775c0d0af009f2e431ae55e53 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117700 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
2021-06-23tdf#92525 tdf#142398: fix export of simple custom shapesAttila Bakos (NISZ)
Most of the custom shapes were exported with DrawingML custom geometry instead of DOCX preset shapes, losing their preset type, adjust handles and text position. Add a preset exporter class to handle all possible preset shapes later, and fix the export of the following shapes now: "bevel", "blockArc", "bracePair", "bracketPair", "hexagon", "octagon", "parallelogram", "plus", "roundRect" and "triangle". tdf#92525: keep text position in triangles with different adjustments, too. tdf#142398: part 1: export simple shapes as preset shapes. Change-Id: I6aee74f7670bea8c1fe5909cbf307778ea728669 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115606 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-06-22simplify and improve WildcardNoel Grandin
it is faster to just process OUString data, rather than perform expensive conversion to OString and back again. Change-Id: Ie007b872ee507ac5c6e8b55cc0a49ef3ac1f0139 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117608 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-21create SfxHintId::SwLegacyModify idNoel Grandin
to avoid expensive dynamic_casts in writer Change-Id: Ic73ae7d4af985043f8533913b33939e3445ec7de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117586 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-21Delete copy ctors/assignments for DLLEXPORT classMike Kaganski
Their default definitions may create/destroy temporary OutputDevice objects, which requires that the class is defined at the site of instantiation of the implicit definition. The solution is to delete these unused methods. If they would happen to be needed, then move the default definitions to the correct place. This reverts commit 30a17b05fb8a860c1e53cb7cfc405b1cea0a9d15. Change-Id: I43f4e76763ff4409e9527f44cd2d8e227982257c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117574 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-06-21bundle the FolderPicker instantiations behind a single callCaolán McNamara
in prep to add parent support Change-Id: I2aa4b9343f895ae866f600dd3260b7fdc4e1efec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117579 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-21tdf#142590 PPTX import: fix custom slide show use as defaultTibor Nagy
If the PPTX file contains a custom slideshow, which set by default and opening in Impress, this setting wasn't imported. See also commit 312334f8488a668e9b5302959b60292ce151e4fc "tdf#47365 PPTX export: support loop attribute" and commit a4b66458a7b8da2f5580014813e5dabe3fa670b6 "tdf#125071 PPTX: fix missing custom slide show export". Change-Id: I9c2b3773f6883ee795f119df5b8534fcdfa6618f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117172 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
2021-06-21drawinglayer: put BufferedDecompositionPrimitive2D in its own fileTomaž Vajngerl
And fix includes all over the place... Change-Id: I6e2696bbeeac6ab7467cac70545fa7209aa981a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117528 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-06-20Fix typosAndrea Gelmini
Change-Id: I70d723ea2d0cad5a28840e250ae261aab6a08bfc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117514 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-06-20Include the header to workaround MSVC bug (shows with disabled pch)Mike Kaganski
https://developercommunity.visualstudio.com/t/error-c2027-use-of-undefined-type-with-declspecdll/1455069 [build CXX] oox/source/core/filterbase.cxx C:\lo\src\core\include\rtl/ref.hxx(129): error C2027: use of undefined type 'OutputDevice' C:\lo\src\core\include\oox/helper/graphichelper.hxx(50): note: see declaration of 'OutputDevice' C:\lo\src\core\include\rtl/ref.hxx(127): note: while compiling class template member function 'rtl::Reference<reference_type>::~Reference(void)' with [ reference_type=OutputDevice ] C:\lo\src\core\include\vcl/vclptr.hxx(216): note: see reference to function template instantiation 'rtl::Reference<reference_type>::~Reference(void)' being comp iled with [ reference_type=OutputDevice ] C:\lo\src\core\include\vcl/vclptr.hxx(64): note: see reference to class template instantiation 'rtl::Reference<reference_type>' being compiled with [ reference_type=OutputDevice ] C:\lo\src\core\include\oox/helper/graphichelper.hxx(140): note: see reference to class template instantiation 'VclPtr<OutputDevice>' being compiled make[1]: *** [C:/lo/src/core/solenv/gbuild/LinkTarget.mk:301: C:/lo/src/build/workdir/CxxObject/oox/source/core/filterbase.o] Error 2 Change-Id: I50ee1bf97b7075224525525ef074c0ffcc168485 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117507 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-06-20cid#1485150 suppress Uncaught exceptionCaolán McNamara
Change-Id: Ic1b2a44afd15e0720edd48f3502dd2799795551a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117508 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-06-20drawinglayer: remove ImplPrimitive2DIDBlock macroTomaž Vajngerl
We can just implement the simple getPrimitive2DID method in all primitives. The ImplPrimitive2DIDBlock macro doesn't save us anything. Change-Id: I02f44d4891d7b340220890bf52a7ebfc8e41850a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117509 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-06-19SvMemoryStream::GetSize can be more efficientNoel Grandin
Change-Id: I6d60d6549089e049d730c1000ab7ec592924c685 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117499 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-19fix loading calc files with embedded form macrosNoel Grandin
GraphicHelper was trying to use the current frame/ window to convert values, but during initial load there is no current window. Change-Id: I8a79501df1d2e83a13d3cfb64ae8e66152c60561 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117470 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-19loplugin:finalclassesNoel Grandin
improve the plugin to detect more cases. I only apply the new final changes to classes in /include here. Which reveals that RoadmapWizard::getPageController( TabPage* _pCurrentPage ) will always return nullptr Also needed to sprinkle some SAL_DLLPUBLIC_TEMPLATE around to workaround Visual Studio linking problems. Change-Id: Iadb7d46a9e0e73dabce562375ca013c0fea6690c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117365 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-19svx: prefix member variables for SdrTextObj and othersTomaž Vajngerl
All classes in svdotext.hxx Change-Id: Ib15deca2a625d8352a2572d9fc3e15188b4e718a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117478 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-06-19svx: use constexpr instead of a define for a constantTomaž Vajngerl
Change-Id: Ie2fdd0dbe2c6d8e5c9ff406af5d2be20383fe62b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117477 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-06-19svx: prefix member variables for SdrCreateViewTomaž Vajngerl
Change-Id: I4fb067201d3285b8aad8877bba2f018aab41c026 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117476 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-06-19svx: remove whitespace in member variablesTomaž Vajngerl
Change-Id: Ie841bd3c9449ac7b227ae6adc4df49ad452b59ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117475 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2021-06-18tdf#130428 remove unnecessary usage of SfxItemState::UNKNOWNArmin Le Grand (Allotropia)
Rename ::StateChanged methods using SfxItemState to allow better analysis of SfxItemState/SfxPoolItem usage(s), discussion see tdf#130428 comment 30 Change-Id: I736be0160ad7a9b7882c1c8a4cc05d9396ee3305 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117366 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com>