summaryrefslogtreecommitdiff
path: root/sd
AgeCommit message (Collapse)AuthorFilesLines
2019-10-31tdf#113041: Kill WaitCursor after FindAll in Draw and ImpressMuhammet Kara1-2/+2
Change-Id: Ibfbbc673a00839f538febc5bab1140b2e53535eb Reviewed-on: https://gerrit.libreoffice.org/81809 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-10-31tdf#114175: No slides in DrawMuhammet Kara3-2/+12
In the past in Draw and Impress the same term 'slide' was used. Although it was decided to use 'page' in Draw and 'slide' in Impress; in several locations of the user interface this has been changed but not everywhere. Change-Id: I8f0911a6ae1775335950c0212dac52962a2af46a Reviewed-on: https://gerrit.libreoffice.org/81779 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-10-31tdf#84257: Consistent 'slide' naming in Impress UIMuhammet Kara7-7/+25
Change-Id: I6af0f6d79e145a4a0497cd72f960ee21d595b311 Reviewed-on: https://gerrit.libreoffice.org/81796 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-10-30tdf#114175: Set proper title for page rename dialog in DrawMuhammet Kara2-2/+5
Change-Id: I014a4a654b9f6f4f330e61d1436d2a7aceead0c1 Reviewed-on: https://gerrit.libreoffice.org/81738 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-10-30tdf#114175: Proper naming for 'Insert Page' undo action in DrawMuhammet Kara2-1/+6
Change-Id: Ia22b4ee8cde95dac936715ef89ca5ef9811ede12 Reviewed-on: https://gerrit.libreoffice.org/81735 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-10-30tdf#126324 pptx unit test for custom date importTamas Bunth2-0/+17
Add unit test for importing custom date field (<c:fld> element of type "datetime") Change-Id: Ifcb5641c99eeb79afe54b801750e68792880c000 Reviewed-on: https://gerrit.libreoffice.org/81682 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-10-30svx: prefix members of SdrModelMiklos Vajna5-32/+32
See tdf#94879 for motivation. Change-Id: I08d77b07092894b67f33ce4cdbe29302b61121d3 Reviewed-on: https://gerrit.libreoffice.org/81717 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-10-29remove unnecessary includesCaolán McNamara1-1/+2
Change-Id: Ia4a622b34ff3f71963cff7a1aa8658a4df12f04f Reviewed-on: https://gerrit.libreoffice.org/81676 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-29lok: simplify the function "SlideBackground::DumpAsPropertyTree"Henry Castro1-2/+1
Change-Id: I288bcfa2f6ba82e83c541430d3782f2001645396 Reviewed-on: https://gerrit.libreoffice.org/81544 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2019-10-29tdf#108202: Correct Draw page naming in insert pages, and page naming dialogsMuhammet Kara3-1/+10
Change-Id: I2485bc29d6286cc30436fa9ecfb29e724578db41 Reviewed-on: https://gerrit.libreoffice.org/81631 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-10-28tdf#125191 Give object copies unique namesJim Raykowski2-2/+17
This patch makes a unique name for a copy of an object having a user given name. Change-Id: I14a7f45cc02962fc34a1532dd5db1cb9657b41d3 Reviewed-on: https://gerrit.libreoffice.org/77500 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-25sd: fix missing includeMiklos Vajna1-0/+1
Change-Id: I696268d5eb27c51a9058da354676feceba4813da
2019-10-25lok: ensure that the paper size list box control has selected items inHenry Castro2-0/+12
the slide background panel. When a client side request the property tree data on the background panel the paper size list control has no selected items yet. I was tempted to force update the selected item in "Slide Background:: Initialize", however, I am not sure why it is not initialized the list box. This is done after an asynchronous update, maybe it is because the impress document is not initialized yet. anybody knows?. I prefer not to have side effects, so let's force initialization on in the tiled rendering case when the function SlideBackground::DumpAsPropertyTree is called. Change-Id: I596b75da46f2180342cb50bde03ee0ff1d414f05 Reviewed-on: https://gerrit.libreoffice.org/81483 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2019-10-23Resolves: tdf#128313 disambiguate flow-to search resultsCaolán McNamara2-2/+2
for a11y between find/replace where our result is a single thing, and find-all/replace-all where the result is potentially many things, which allows that searching in a selected calc column will flow-to the current cell, not the entire ~infinite set of cells in the column Change-Id: Ib3e56fceb90d869f157427f090cdffe986a5a588 Reviewed-on: https://gerrit.libreoffice.org/81396 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-23put together the 'magic' flow-to constantsCaolán McNamara1-4/+3
as a side note, there's no actual use of FORSPELLCHECKFLOWTO anywhere that I can see Change-Id: I90d50d7f98dede3803fec1d22d32d5d57858c1e3 Reviewed-on: https://gerrit.libreoffice.org/81394 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-23Add document-level option to lock down file exportSamuel Mehrbrodt3-0/+9
Setting this option will disable any export command (File->Export*, File->Send*, graphic/chart export context menu, save as, mailmerge wizard, ...) Change-Id: I07a2a3b9179b494ac839e7d1e407194600679aa1 Reviewed-on: https://gerrit.libreoffice.org/81316 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-10-23tdf#112126: Correct naming for pages in DrawMuhammet Kara1-0/+3
Pages are named as 'Page X' rather than 'Slide X' now. Change-Id: I3d4838ef5dbd8d0c04a068adc12ad9cea0bbb0b1 Reviewed-on: https://gerrit.libreoffice.org/81364 Tested-by: Jenkins Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
2019-10-22sd: sidebar: force to set the id of the LayoutMenu controlHenry Castro1-0/+1
Otherwise, the function std::unique_ptr<UIObject> WindowUIObject::get_child(const OUString& rID) will not find the control with the rID. Change-Id: Ie571eb351bb0c59654f577cef1961247273d7608 Reviewed-on: https://gerrit.libreoffice.org/81345 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com>
2019-10-22Comparison between css::uno::WeakReference and css::uno::ReferenceStephan Bergmann1-1/+1
...causes overload resolution ambiguity in C++20, as observed with recent Clang 10 trunk with -std=c++2a: > sd/source/ui/framework/factories/BasicPaneFactory.cxx:327:39: error: use of overloaded operator '==' is ambiguous (with operand types 'css::uno::WeakReference<css::drawing::framework::XConfigurationController>' and 'const ::css::uno::Reference< ::css::uno::XInterface>') > if (mxConfigurationControllerWeak == rEventObject.Source) > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~ > include/com/sun/star/uno/Reference.hxx:425:28: note: candidate function (with reversed parameter order) > inline bool BaseReference::operator == ( const BaseReference & rRef ) const > ^ > include/cppuhelper/weakref.hxx:106:19: note: candidate function > bool SAL_CALL operator == ( const WeakReferenceHelper & rObj ) const An alternative would be to add overloads for combinations of css::uno::WeakReference adn css::uno::Reference, but this was the only case of such an ambiguity across the whole code base, such just resolve it with an explicit .get(). Change-Id: I4689d5ffd4f8993cc1f9401d3c21b24f53f21ccd Reviewed-on: https://gerrit.libreoffice.org/81282 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-22Make comparison operator member functions constStephan Bergmann2-4/+4
...which avoids overload resolution ambiguities in C++20, when a synthesized candidate of operator == for a reversed-argument rewrite conflicts with the actual operator ==, due to the asymmetric const-ness of the implicit object parameter and the RHS parameter. (As observed with recent Clang 10 trunk with -std=c++2a: > sd/source/ui/view/Outliner.cxx:543:44: error: use of overloaded operator '!=' is ambiguous (with operand types '::sd::outliner::Iterator' and 'sd::outliner::Iterator') > mbMatchMayExist = (maObjectIterator!=sd::outliner::OutlinerContainer(this).begin()); > ~~~~~~~~~~~~~~~~^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > sd/inc/OutlinerIterator.hxx:133:10: note: candidate function > bool operator!= (const Iterator& rIterator); > ^ > sd/inc/OutlinerIterator.hxx:125:10: note: candidate function > bool operator== (const Iterator& rIterator); > ^ > sd/inc/OutlinerIterator.hxx:125:10: note: candidate function (with reversed parameter order) ) Change-Id: Ia477f3f9cf19a5ae0e15a4536d70924962098ce4 Reviewed-on: https://gerrit.libreoffice.org/81280 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-21loplugin:virtualdead unused param in SfxObjectShell::FillClassNoel Grandin3-8/+1
and since I notice that the two call sites also don't care about pShortTypeName, remove that too Change-Id: I4649fc4c134c1113555b9dedb53499ce39d17132 Reviewed-on: https://gerrit.libreoffice.org/81213 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-21loplugin:deadvirtual unused param in ItemUpdateReceiverInterfaceNoel Grandin2-4/+2
Change-Id: I3db5a456a259a97dc9bdf6be0d478177bac05215 Reviewed-on: https://gerrit.libreoffice.org/81186 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-21loplugin:virtualdead unused param in SdrHdl::onHelpRequestNoel Grandin1-2/+2
Change-Id: I3d75755bd6fd7f3168725c53fd8ce571a938fa37 Reviewed-on: https://gerrit.libreoffice.org/81181 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-19OUStringChar must either take a sal_Unicode or an ASCII charStephan Bergmann2-3/+3
...so forbid anything else, to avoid issues like the one described in 766cdd869d7d983e9e171a3eae0629cb9a0206ff "This code wants to add the numeric SvxRotateMode value". Some remaining places that apparently do want to convert some numeric value to sal_Unicode have been augmented with an explicit cast. Change-Id: I6200a84e250e697bc88694bd71142ca1d9a13651 Reviewed-on: https://gerrit.libreoffice.org/81132 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-19Replace some uses of OUStringChar with string literalsStephan Bergmann1-1/+1
Change-Id: I763f9a3f57efcd47643ca4651e2454e95c6921c9 Reviewed-on: https://gerrit.libreoffice.org/81127 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-19loplugin:virtualdead unused param in sd::View::AcceptDropNoel Grandin6-11/+7
Change-Id: I51aceb8a1f908cf89a0b8b6d0e58755fc4374862 Reviewed-on: https://gerrit.libreoffice.org/81075 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-19loplugin:virtualdead unused param in ViewClipboard::DetermineInsertPositionNoel Grandin4-8/+5
Change-Id: Iad1a4dbd603e9258e8835e7ab534cd74f4882968 Reviewed-on: https://gerrit.libreoffice.org/81074 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-19loplugin:virtualdead unused param in sd::ViewShell::UpdatePreviewNoel Grandin5-7/+7
Change-Id: I1ac98096d117e3ae7c2f0be2690acef32b85fbdb Reviewed-on: https://gerrit.libreoffice.org/81073 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-18make bin/update_pch.s always include code in trivial #if'sLuboš Luňák2-19/+6
E.g. #ifdef LIBO_INTERNAL_ONLY is always true for code that builds with our PCHs. Change-Id: I3cf311ea3621b909105754cfea2cb0116b8b67f5 Reviewed-on: https://gerrit.libreoffice.org/80961 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-10-17rename LanguageBox back to SvxLanguageBoxCaolán McNamara3-5/+5
Change-Id: I9bd29b7377fdf0e1ba36cc021e7e78f83bb1c12c Reviewed-on: https://gerrit.libreoffice.org/80960 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-17gbuild: Treat 'DBUS_GLIB_CFLAGS' as includes, not definesMichael Weghorn2-2/+4
Since that variable holds the relevant includes, using 'gb_LinkTarget_set_include' makes sure that those flags end up in the correct section, e.g. when generating IDE integration using 'gbuild-to-ide'. E.g. for the 'qtcreator-ide-integraton' make target, this makes sure that they end up in the 'INCLUDES' section in 'sd/sd.pro' and not the 'DEFINES' section, which previously led to an "error: macro name must be an identifier" being shown when editing files underneath 'sd/' in Qt Creator with the Clang Code Model plugin enabled, s.a. commit 4aa60490622cc10f8d3a31489c62a5622d240c83 ("gbuild: treat $({QT,KF}5_CFLAGS) as cxxflags, not defines"). Corresponding entry in my config_host.mk.in on Debian bullseye/testing: export DBUS_GLIB_CFLAGS=$(gb_SPACE)-I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include Change-Id: I9af9a58fdc05ce6648221c00a20859be777843f9 Reviewed-on: https://gerrit.libreoffice.org/80944 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-10-17tdf#128166 sd: Fix canvas initialization argsMichael Weghorn2-10/+8
Commit 5926b22b5dc33490d23d594b129eb8a70b94ffb0 ("The SystemEnvData passed into the canvas factories appears to be unused") removed previous arg at index 1, so adapt here, too. This makes the presenter console shown again (tdf#128166). A visible result of FullScreenPane::CreateCanvas passing wrong args was that an Impress presentation shown in presentation mode in dual screen using the qt5/kf5 VCL plugin wouldn't terminate properly and crash Impress on close. Change-Id: I3933864d4bb007cfdefb0a20378ff3d75ea6cd85 Reviewed-on: https://gerrit.libreoffice.org/80933 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-10-17Remove some memset callsMike Kaganski2-8/+4
Replace them with default initialization or calloc Change-Id: I747f53c2ced2d0473fd5a5ede4f8520a0633dcc1 Reviewed-on: https://gerrit.libreoffice.org/80805 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-17Add Name and Description to group context menuandreas kainz2-0/+6
Change-Id: Icc19b6e3493f1d9e49584c3e2ac99509fae4e02e Reviewed-on: https://gerrit.libreoffice.org/80923 Tested-by: Jenkins Reviewed-by: andreas_kainz <kainz.a@gmail.com>
2019-10-17Rename OUStringLiteral1 to OUStringCharStephan Bergmann8-15/+15
It started out as a wrapper around character literals, but has by now become a wrapper around arbitrary single characters. Besides updating the documentation, this change is a mechanical for i in $(git grep -Fl OUStringLiteral1); do sed -i -e s/OUStringLiteral1/OUStringChar/g "$i"; done Change-Id: I1b9eaa4b3fbc9025ce4a4bffea3db1c16188b76f Reviewed-on: https://gerrit.libreoffice.org/80892 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-10-16loplugin:bufferadd loosen some constraintsNoel Grandin1-2/+2
and extend O*StringView to have a constructor that takes a pointer and a length Change-Id: I6120e96280f030757e855a6596efdae438b7e1e8 Reviewed-on: https://gerrit.libreoffice.org/80872 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-16tdf#126060 Handle text camera z rotation while pptx import.Gülşah Köse7-0/+121
Change-Id: Ifa4589fb50affc4c5ffb52288db8533c98ec6dd9 Reviewed-on: https://gerrit.libreoffice.org/80587 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2019-10-16convert some Buffer.append to +Noel Grandin1-4/+1
by hand, because I don't feel like teaching this specific idiom to the plugin Change-Id: If400677dac842ca740c4532ed79f6f18f752b730 Reviewed-on: https://gerrit.libreoffice.org/80842 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-16loplugin:stringadd look through a couple more known-good methodsNoel Grandin2-8/+8
Change-Id: Ifbdb3e41eae665f7dcaf5301aaba2b6e4662cf48 Reviewed-on: https://gerrit.libreoffice.org/80855 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-15new loplugin:bufferaddNoel Grandin7-49/+31
look for OUStringBuffer append sequences that can be turned into creating an OUString with + operations Change-Id: Ica840dc096000307b4a105fb4d9ec7588a15ade6 Reviewed-on: https://gerrit.libreoffice.org/80809 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-15tdf#127964 PPTX import: fix shape fill handling: style vs slide backgroundMiklos Vajna2-0/+23
Regression from commit 943a534ac7cb3df513583e226c986dafd8ba246b (tdf#123684 PPTX import: fix wrong background color for <p:sp useBgFill="1">, 2019-04-23), the problem was that we didn't handle the case when a shape had an XML fragment like this: <p:sp useBgFill="1"> <p:style> <a:fillRef idx="1"> <a:schemeClr val="accent1"/> </a:fillRef> </p:style> </p:sp> i.e. the shape both wants to use background fill and it has a style declaring how to fill it as well. We gave the style a priority, while PowerPoint gives the background fill a priority. Fix the problem by not setting the fill from the style in case the background fill is already set. Change-Id: Ie1b56e5615219138a5b7ddd7a2b25295b991bc05 Reviewed-on: https://gerrit.libreoffice.org/80804 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-10-14lok: impress: show only supported transitions in the side paneMarco Cecchetti1-0/+137
Change-Id: I631ee8b101bacc4dec075100aa25158b71fbae40 Reviewed-on: https://gerrit.libreoffice.org/80681 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2019-10-14loplugin:stringadd look for unnecessary temporariesNoel Grandin3-13/+13
which defeat the *StringConcat optimisation. Also make StringConcat conversions treat a nullptr as an empty string, to match the O*String(char*) constructors. Change-Id: If45f5b4b6a535c97bfeeacd9ec472a7603a52e5b Reviewed-on: https://gerrit.libreoffice.org/80724 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-14Add document-level option to lock down content extractionSamuel Mehrbrodt3-2/+8
Setting this option will prevent copying/dragging any content from LO to another program or even another LO window. Change-Id: Ifbc032a4fa69ac1a17d4b500f5a30f5399d84ed7 Reviewed-on: https://gerrit.libreoffice.org/80586 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-10-13tdf#128096: pptx: export highlightXisco Fauli2-0/+16
Change-Id: If3084f7ffaceb774dba1b1f195229313a8f1d04a Reviewed-on: https://gerrit.libreoffice.org/80670 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-10-13tdf#125566 Add arrangement functions to position & size sidebarTomaž Vajngerl4-0/+54
Adds arrangement actions to position & size sidebar so it is possible to move the object up/down in the stack. As Draw/Impress uses it's own action names for the same UNO action (Forward/Back in Draw and ObjectForwardOne and ObjectBackOne in Writer/Calc) also add the global ones to Draw/Impress and connect them to the same function as Forward/Back. This commit does not unify them however (Forward/Back are still used in menus/toolbars) but this could be done in the future. Change-Id: Ibb152f29dbe11dfb1b6a057e6ea60b21029912e2 Reviewed-on: https://gerrit.libreoffice.org/80729 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2019-10-13Revert "tdf#127164 Don't add SdrUndoDelPage undos during pptx save"Jim Raykowski1-1/+1
Wont work because it will disable undo during any scripts that luck/unlock documents for their duration This reverts commit fae4f1506fc481b8dc2977d3bf9363dd8eaf4945. Change-Id: I447560c9200d381ea93e2275abd57f91c5acc819 Reviewed-on: https://gerrit.libreoffice.org/80725 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2019-10-13tdf#127164 Don't add SdrUndoDelPage undos during pptx saveJim Raykowski1-1/+1
Change-Id: I1a5e17dc056311caba3dbabfb70d21e87344eda0 Reviewed-on: https://gerrit.libreoffice.org/80429 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com>
2019-10-12tdf#127129: pptx: map highlight to CharBackColorXisco Fauli2-0/+22
Change-Id: I033c15db6848e96ba6b6bd7a2852c9e4d1524a8e Reviewed-on: https://gerrit.libreoffice.org/80630 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2019-10-11Propagate stock info through slide layouts.Michael Meeks2-4/+8
(cherry picked from commit f107161bbd0eb4ee5766f5f983d18b32b929b15c) Change-Id: If717db82fe6ab14bbf32225c1f1c95f44954f011 Reviewed-on: https://gerrit.libreoffice.org/80667 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com>