summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-12-09tdf#121987: Don't fail installation if failed to enable WU serviceMike Kaganski
Since commit 1882827320ed760de82211cf690b686f8d34ff74, an attempt to install UCRT will be performed regardless there is an evidence that it's present on the system, to workaround some cases where the existing UCRT is broken (tdf#115405, tdf#119910). But that made other errors to emerge: on systems where users disable WU service using some exotic ways, installer is unable to enable the service, and fails. [1][2] Examples of such hard-disables are using `sc delete` [3] and associating WU service with a guest account. Many such cases are reported for Windows 10, where installation of the UCRT is not required. So the solution (imperfect, but possibly the best possible here) is to allow installer to continue in case of failure enabling the service. This will automatically eliminate all problems related to Win10; and also for cases where users are advanced enough (the majority of such hard-disable cases should be those), it might be enough to add a relevant FAQ entry. [1] https://ask.libreoffice.org/en/question/172227/cannot-install-631/ [2] https://ask.libreoffice.org/en/question/175571/installation-failed-unknown-error-win10x64/ [3] https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/sc-delete Change-Id: Ie85016eb6f0667f39412a3089fe1b1855cb1fc73 Reviewed-on: https://gerrit.libreoffice.org/64825 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 53058090beede6a399e2f408f62c28a2921ff8ab) Reviewed-on: https://gerrit.libreoffice.org/64828 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-09missing g_signal_handler_disconnect in GtkInstanceWidgetNoel Grandin
found by loplugin:unusedfields Change-Id: Iefd64e879b32f696456c51da595e462295e5c58e Reviewed-on: https://gerrit.libreoffice.org/64820 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 145280ffd1dabdc629c14c8162beef668741bcef) Reviewed-on: https://gerrit.libreoffice.org/64847 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-09cppcheck: multicondition "columns" in sw/tmpdlgJulien Nabet
weld writer page style dialog and SvxBorderBackgroundDlg writer, format page is complete a2304f62e963b413b7575bedfb8d34e5f2d3ea58 + SwTemplateDlg is now unused 2fc2f235b94de9f70a28aee90564745cda313489 Change-Id: I67c3ed5b2724ac7d8dacc42ad6eabf4ec68739a8 Reviewed-on: https://gerrit.libreoffice.org/64836 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 00c6b2976e5326cd94ce81ab6d750a2c2cd99cbb) Reviewed-on: https://gerrit.libreoffice.org/64846 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-09fix build (boo->bool)Rene Engelhard
Change-Id: Ia25f388f81b827803683859c388317484a2b0cde Reviewed-on: https://gerrit.libreoffice.org/64845 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Rene Engelhard <rene@debian.org>
2018-12-08Resolves: tdf#80583 create range list string with proper delimiterEike Rathke
... which is the to be used function parameter separator here. The current document's grammar (from which the separator is obtained in ScRangeList::Format() if not specified) may differ from the forced English grammar later when compiling the formula, and all formula expressions to be inserted use the language independent ';' semicolon function parameter separator. Change-Id: I7a3deb6d50fc57ed434ede1f00bbe8c5c1361e0f Reviewed-on: https://gerrit.libreoffice.org/64819 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 470a91cb041782e29664212d096bb16873ba57a0) Reviewed-on: https://gerrit.libreoffice.org/64823
2018-12-08tdf#112236 Enhance error message when renaming a sheet to blankRoman Kuznetsov
Change-Id: Icd7ac2d10e9d28d563f964cb144bbe94027617c1 Reviewed-on: https://gerrit.libreoffice.org/64788 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 06fae15c8c7aac7a6d50f1f3cf635f6ae3355bda) Reviewed-on: https://gerrit.libreoffice.org/64812 Tested-by: Jenkins
2018-12-08tdf#121017, tdf#121897: editstyle is always paragraph styleXisco Fauli
Change-Id: Ia82e6e5c4d6c3e78ba5fbc320d299acf3800a72e Reviewed-on: https://gerrit.libreoffice.org/64766 Reviewed-by: andreas_kainz <kainz.a@gmail.com> Tested-by: andreas_kainz <kainz.a@gmail.com> Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit c9713e08d23ff1addc6a6a23d895340d77c4fecb) Reviewed-on: https://gerrit.libreoffice.org/64787
2018-12-07Upgrade flatpak to org.freedesktop.Sdk//18.08Stephan Bergmann
...fixing <https://github.com/flathub/org.libreoffice.LibreOffice/issues/54> "Build against org.freedesktop.Platform 18.08" Change-Id: I70448277ce326075435932c75a837bd7be3d4508 (cherry picked from commit 9d6799c116cab67c43893e81904386d90992211e) Reviewed-on: https://gerrit.libreoffice.org/64775 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-07Drop obsolete font sources from flatpak manifestStephan Bergmann
...which are no longer used by the LO build since 0ce173b50fd12342979cf3f8f9b2d92267552060 "tdf#103080 Dont package Open Sans and PT_Serif fonts" Change-Id: I9ece7a85fe0003711eb23f332e617b780e6701cd (cherry picked from commit aa3584085d41c242341a810cae05995ea7850389) Reviewed-on: https://gerrit.libreoffice.org/64774 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-12-07Resolves: tdf#121954 basic input box used to have label on top of entryCaolán McNamara
so for a quiet life arrange it like that again. https://xkcd.com/1172/ Change-Id: I8d1f3a914f8792b8c91ccd1b98d1fbd2a25a4213 Reviewed-on: https://gerrit.libreoffice.org/64778 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-12-07Resolves: tdf#121942 action deactivated twiceCaolán McNamara
Change-Id: I25b1ed89b8d0e7a7c0e36c621a43644bc2b4aa7b Reviewed-on: https://gerrit.libreoffice.org/64708 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f820f6eb6036197bbb53e2d5e4bf4d5341ad280d) Reviewed-on: https://gerrit.libreoffice.org/64754 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
2018-12-07tdf#121759 Revert "tdf#99296 - Disable headers/footers by default"Heiko Tietze
This reverts commit 08b5048198d59441cb8033ed14cd17e68c943004. Disabled h/f lead to an inactive menu entry (tdf#121759). Also, the change was not accepted by the OP (tdf#99296). See discussion on the mailing list, Gerrit, and BZ. Change-Id: Ie3dcf14c173a1813da05d8f2a9c8f2eda14cee46 Reviewed-on: https://gerrit.libreoffice.org/64727 Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> (cherry picked from commit d08e63fb1ab16d96e3d1404c4b82267447104a0f) Reviewed-on: https://gerrit.libreoffice.org/64728
2018-12-07Upgrade external/postgresql to postgresql-9.2.24Stephan Bergmann
...which is the latest 9.2.x currently listed at <https://www.postgresql.org/ftp/source/>. 9.2.1 doesn't build against OpenSSL 1.1 which dropped SSL_library_init (cf. <https://wiki.openssl.org/ index.php/Library_Initialization#libssl_Initialization>), and 9.2.24 apparently has that covered. (Ran into this when trying to upgrade the LibreOffice flatpak build to org.freedesktop.Sdk//18.08, which has OpenSSL 1.1.) On Windows, the new tarball as-is fails with > ..\..\port\chklocale.c(214): error C2037: left of 'lc_codepage' specifies undefined struct/union '__crt_locale_data' because at least in Windows Kits/10/Include/10.0.17763.0/ucrt/corecrt.h (included from Windows Kits/10/Include/10.0.17763.0/ucrt/locale.h), the relevant definitions are now > typedef struct __crt_locale_data_public > { > unsigned short const* _locale_pctype; > _Field_range_(1, 2) int _locale_mb_cur_max; > unsigned int _locale_lc_codepage; > } __crt_locale_data_public; > > typedef struct __crt_locale_pointers > { > struct __crt_locale_data* locinfo; > struct __crt_multibyte_data* mbcinfo; > } __crt_locale_pointers; > > typedef __crt_locale_pointers* _locale_t; which presumably has changed from a past state where that lc_codepage member was directly publicly accessible. <https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2> is a copy of <https://ftp.postgresql.org/pub/source/v9.2.24/postgresql-9.2.24.tar.bz2>; `sha256sum postgresql-9.2.24.tar.bz2` reports the same a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126 as recorded in <https://ftp.postgresql.org/pub/source/v9.2.24/postgresql-9.2.24.tar.bz2.sha256> Change-Id: I196dd93aa03471042efba57ea639e1bb6655de98 Reviewed-on: https://gerrit.libreoffice.org/64730 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit a01ac385ed16fbe4239938c9d31462691707e87b) Reviewed-on: https://gerrit.libreoffice.org/64764
2018-12-07sw_redlinehide_4a: MoveDeletedPrevFrames() should only moveMichael Stahl
... frames from a layout with hidden redlines. Change-Id: I8f5d5bbbc5bfd49a8a52579a1c34157b9c5c4515 (cherry picked from commit c1d7cc390c6e095d6e58b856758ba86f7666195f)
2018-12-07sw_redlinehide_4a: fix infinite loop in SwAttrIter::Seek()Michael Stahl
It's actually possible for Seek to be invoked with a position that is neither 0 nor >= the current position: lcl_CalcOptRepaint(), called from SwTextFormatter::FormatLine(), will move backwards via some funny heuristic and call GetCharRect(), which then seeks. Change-Id: If061a768b9a0155d9a95b190c44e7048312f4ba3 (cherry picked from commit c985eba6e9d6f9d3fece903a6b72eca611894b16)
2018-12-07sw_redlinehide_4a: fix asserts caused by invalid index in SwUpdateAttrMichael Stahl
There is no reason for SwpHints::TryInsertHint() to add 1 to the end index of an empty hint, which results in an invalid index when the end of the hint is at the end of the node. The only user of the indexes in SwUpdateAttr is SwTextFrame::SwClientNotify() and it already extends a 0 range to 1. Change-Id: I7355bac931cd8dd390f96d04546d73273f364cda (cherry picked from commit 109a573a644ab7aa760cde30538b1122155adc9f)
2018-12-07sw_redlinehide_4a: stop toggling ShowDelete in SwAutoFormatMichael Stahl
Change-Id: Ib6495d4248faa679d5a55642ac51baf419708287 (cherry picked from commit e7283ebe7a2ba9b608a04d1efbe5504f182369a7)
2018-12-07sw_redlinehide_4a: TextFrameIndex goes liveMichael Stahl
Change-Id: Ie59c09bdc57505e16022c43791d5e65cc233d5b9 (cherry picked from commit aa4f245efa24e25bfd78114ab8651220d0723757)
2018-12-07sw_redlinehide_4a: SwEditShell::AutoCorrect() etc.Michael Stahl
The hope is that the AutoCorrect never deletes nodes, hence never deletes SwTextFrames, hence we can pass in the SwTextFrame::GetText() result and it will be updated via the SwTextFrame::SwClientNotify() on editing operations. Change-Id: Ib644d0373963119b9f7fe6767b028fd89724feb3 (cherry picked from commit 7481e8b5500e86626be5f8eae1e7f48b7f51e21a)
2018-12-07sw_redlinehide_4a: SwAutoFormat::AutoCorrect()Michael Stahl
Change-Id: I0ab7665f8635d6716fce996408db1e2bedf54d0c (cherry picked from commit c03da6a4a429327244bbe27e32e2f6e82b18163d)
2018-12-07sw_redlinehide_4a: SwAutoCorrDoc iterates frames, not nodesMichael Stahl
Adapt this in a similar way, with a DeleteSel() that skips over delete redlines. The Replace functions fortunately only have callers that replace 1 character currently, but there is another ReplaceRange() call that needs a litte more complicated handling. Change-Id: Idd5c80e96c0f355d3dc965b2f70376258d23e1a3 (cherry picked from commit 9926ea7dd07f1f3d012ddf97941a42bb7fa5717d)
2018-12-07sw_redlinehide_4a: SwAutoFormat iterates frames, not nodesMichael Stahl
In order to not require moving the delete redlines out of the document body, rely on the DeleteSel() implementation skipping over the redlines, and also pass the shell's layout to the various SwDoc functions that are called. Previously, the redlines were not deleted by DeleteSel() due to SwAutoFormat setting RedlineFlags::Ignore. Change-Id: Ib05ecb534993368d81f66e70124617968b4c8e9a (cherry picked from commit eb92dc08f2abf5ed088da0d736266f213adf00de)
2018-12-07sw_redlinehide_4a: SwAutoFormat: manually skip redlines when deletingMichael Stahl
Change-Id: I001e61305ee8416f851f834d3068bd91de8281f8 (cherry picked from commit b9a5d49761351eee327e9bc8518d9388d409058d)
2018-12-07sw: fix wrong title of AutoFormat with redlining dialogMichael Stahl
(regression from 9fcef57a34dbd88a98621dfaf8668fa076dd98f1) Change-Id: Id6ea5841dd25a30519deb825c3ae0aaa7469c250 (cherry picked from commit 564260804ee3a8846b921188e36bc269fc8ba98e)
2018-12-07sw: rename misleading DeleteCurrentParagraph()Michael Stahl
Rename also DelPrevPara() and DeleteCurNxtPara(). Also document the state transitions. Change-Id: I0b874852a4c1aab8d5d3a55b9dfef360e313089c (cherry picked from commit c1f1cad3e63afcf6b9bbf6e42f28efa74ec49189)
2018-12-07sw_redlinehide_4a: some page break calls in SwFEShell/PageBreakWinMichael Stahl
... should use layout. Change-Id: Iabb29bb49558ef1c805ede3300042b815f62136a (cherry picked from commit 1af5ca57dc89fffd460a3168a937036b589c3cd7)
2018-12-07sw_redlinehide_4a: fix SwDoubleLinePortion/SwMultiCreator/SwBracketMichael Stahl
Missing TextFrameIndex conversion. Change-Id: Ie7b58b74aa6bb1e2ff8199031a9f59f5c3ba68c0 (cherry picked from commit fd04c73a3897c1a0c450a09b911a14c2128c16b3)
2018-12-07sw_redlinehide_4a: finish conversions guess.cxx,itrcrsr.cxx,porfld.cxxMichael Stahl
... and tests. Change-Id: I847a9441b73cdfc9bd826fad2c9075a9aa1d7d2d (cherry picked from commit 23b008ee75e22cbd3c2b08b7a7968dec22257791)
2018-12-07sw_redlinehide_4a: SwEditShell::GetLineCount()Michael Stahl
Change-Id: Ib9a13eab25b02b919d472ae864213b110e7794c7 (cherry picked from commit a4165e1b08c82b667b209ee38b4d2a2c534c1def)
2018-12-07sw_redlinehide_4a: convert SwTextNode::GetMinMaxSize()Michael Stahl
Change-Id: I1ac09d3dfd95f2a98142c4bfe51aad04926e2d38 (cherry picked from commit 6b54554d93bb0683ae63836a85975f0b17bd1324)
2018-12-07sw_redlinehide_4a: convert SwEditShell::GetScalingOfSelectedText()Michael Stahl
Move SwTextNode::GetScalingOfSelectedText() to SwTextFrame & simplify. Change-Id: I9e9f0059665fb128de6be12a15ca2b4a95ebc5ff (cherry picked from commit 782506335e2b5a1c6d4c0222520165900a91aeb8)
2018-12-07sw_redlinehide_4a: fix the number handling in SwEditShell::GetScriptType()Michael Stahl
This is really to complicated & should be simplified, but while it seems reasonable to assume that a frame always exists (or that nodes without frames should be skipped), there needs to be a way to update a SwScriptInfo if it turns out to be invalid... Change-Id: I185733c2e1e93b0c4d2453eeb3ea48cd4b9b6779 (cherry picked from commit 025ebb415e7dd2d91e6be7b3a913ef78dca7c9a6)
2018-12-07sw_redlinehide_4a: SwEditShell::IsMoveLeftMargin(), MoveLeftMargin()Michael Stahl
Change-Id: I2bc29816af93ae265c0f0d11977b2d694e00ad6c (cherry picked from commit b070202b420129b5edd368420e0e50ec45261d01)
2018-12-07sw_redlinehide_4a: adapt SwEditShell::GetPaMParAttr()Michael Stahl
Change-Id: I97a2081a142fd1f74a5d6be534f094fdc4db45ab (cherry picked from commit a382ecb5689ee425e77f830fd81b8696dc90a68b)
2018-12-07sw_redlinehide_4a: adapt SwEditShell::FillByEx()Michael Stahl
Change-Id: I8a85d1fe580ce8c8a52d0ee00d36e499b5e903dc (cherry picked from commit 695a7f10fa9dd55359fbc99b7fdced1c1a7fe025)
2018-12-07sw_redlinehide_4a: more adapting of SwDoc::SetCounted()/SetNumRule()Michael Stahl
Apply to/reset only the paragraph properties node. Change-Id: I4dd3973a758f4afcc30f905b7351e9687d050e33 (cherry picked from commit c2932c1005968b9d0f1500c6a018704e2ccd4658)
2018-12-07sw_redlinehide_4a: adapt SwEditShell::ResetAttr()Michael Stahl
Change-Id: I5131f5a3ff261a4d86e65b4afff3eb8cdd98cebf (cherry picked from commit 68093f957d936f938213290c790443ed83435361)
2018-12-07sw_redlinehide_4a: adapt SwEditShell::SetTextFormatColl()Michael Stahl
Skip hidden nodes, apply to properties-node. Change-Id: I9c511e87c431bd39dc6efdcddf2cad9bbf18c592 (cherry picked from commit 6bbec38ae2f795b2ca839224a5997f2a883256f8)
2018-12-07sw_redlinehide_4a: adapt SwEditShell::ReplaceDropText()/GetDropText()Michael Stahl
Change-Id: Iaf6101f02bd5dbeb9a07e796932186b5e2b1a563 (cherry picked from commit 3b3a81ce2324a11530142c15c62ce64ac2bfaef5)
2018-12-07sw_redlinehide_4a: InsertItemSet()/InsertPoolItem()Michael Stahl
It's really quite annoying to have RES_BREAK applied to all nodes; so apply the node-items only to the first-/properties-node and skip hidden nodes. Keep applying text/character items as before, except skip over hidden nodes. Change-Id: I085afd59af78caf1ca8dac4080c53bdbdb4e56a1 (cherry picked from commit c253dde883b2cc7fd1fd0a460fd969bcb941d32c)
2018-12-07sw_redlinehide_4a: ignore hidden nodes in SwEditShell::GetPaMAttr()Michael Stahl
MergeValues would set everything to invalid. Change-Id: I45795fe9bd113399e276ac42851cbf5a198c9694 (cherry picked from commit 2ad1767c58a46266401c07d4dd4625f1fc816ac2)
2018-12-07sw_redlinehide_4a: add layout to SwTextNode::GetParaAttr()Michael Stahl
Merge items from first-node and props-node, as they are used in the text formatting. Change-Id: I4cbab55bc3b0f8bc6dc5bd3577da53b3160018a3 (cherry picked from commit eb3481d9d0d67c88e04a9da86e0cee6a7585c386)
2018-12-07sw: rename to SwTextNode::GetParaAttr(), at least that's uniqueMichael Stahl
Change-Id: I1de6b544a4868f0d30077ba2c6d195bffd2e8b00 (cherry picked from commit 2b61043032e2e408e3a721bb91dd13577aa673dc)
2018-12-07sw: simplify SwTextNode::GetAttr()Michael Stahl
Change-Id: I78d32031ebc42d749dbc750b7127983810bbfb1d (cherry picked from commit cb53a34d663626a2ae26ab85d5735bc1371c8aab)
2018-12-07sw: SwTextNode::GetAttr() inconsistencyMichael Stahl
If there are hints, the aFormatSet.Differentiate(rSet) will cause the pre-existing items in the parameter rSet to win, whereas without hints the SwContentNode::GetAttr() calls rSet.Set() which clears everything. It looks like WW8Export::WriteFootnoteBegin() was sort of relying on this; presumably it wants the pCFormat to win over node's items but hints on the position to win over pCFormat. Well that's what it currently gets anyway, so try to preserve that. The other use in SwUnoCursorHelper::SetPropertyValues() looks like an oversight. Change-Id: I80e18e040413fcf26f6f77844ed731de31a464d2 (cherry picked from commit a91992e7b3e7f59e9116aef859696d517a93dab7)
2018-12-07sw_redlinehide_4a: the SwTextNode item set contains XATTR_FILL tooMichael Stahl
... so handle them as well in SwTextFrame::SwClientNotify(). Change-Id: Ifa8bf8f44bcd08a64dc36939bad58efefbd7af55 (cherry picked from commit 52e8b41f1ceec33cd774d3e6b61e208b61a65eb3)
2018-12-07adapt to the change from sal_Int32 to TextFrameIndexhimajin100000
see commit 2136dc24 and commit e721f958 Change-Id: I07ace74f93adc2568003314b5f05c41611d6f77c Reviewed-on: https://gerrit.libreoffice.org/64671 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit a10dd637dc842e0b0221b8ec10965c8f130b4059)
2018-12-07tdf#105225 Add palette choice to calc tab background color dialogJim Raykowski
Change-Id: I9891a20d3bc3de51fec84fb54c7aae42f7142662 Reviewed-on: https://gerrit.libreoffice.org/64329 Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> Tested-by: Heiko Tietze <tietze.heiko@gmail.com> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 0a139d98477c116f14041b3c4ebb7bb6204808d3) Reviewed-on: https://gerrit.libreoffice.org/64747
2018-12-07Use gb_UnpackedTarball_update_autoconf_configs in external/postgresqlStephan Bergmann
Change-Id: I56c68b74daa701e0e27ca4b661ece12bf20a8776 Reviewed-on: https://gerrit.libreoffice.org/64729 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 7c3c2ef49f636653808d3cbd2629cb18ffc45ee1) Reviewed-on: https://gerrit.libreoffice.org/64748
2018-12-07tdf#121022 Do change parent of SdrObj earlyArmin Le Grand
Need to change parent of an SdrObject in the according SdrObjList methods before calling InsertedStateChange - that one relies on asking for the parent of the SdrObject Change-Id: I8c4d39190cafe889b27975941d72afca870e2ce5 Reviewed-on: https://gerrit.libreoffice.org/64608 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> (cherry picked from commit b38f856f234f364199d306226875471ed589b764) Reviewed-on: https://gerrit.libreoffice.org/64706 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>