summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2022-05-16Use interpreter stack to determine JumpMatrix context, tdf#148863 follow-upEike Rathke1-2/+2
pJumpMatrix may or may not be set; actually may need some rework, but get this straight here. Change-Id: I0948e6aeb6637e7a5009a17f63f01d0733c0205c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134252 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134277
2022-05-16Resolves: tdf#148863 In JumpMatrix context use its dimensions for resultsEike Rathke1-1/+11
Problem was, that in array mode the result matrix of random values was created according to the dimensions of the formula cell range selected/resulting, which if transposed and displayed obeys the general rules of a repeating vector if not a 2D matrix. For example, entering the array formula =TRANSPOSE(IF({1,1,1};RAND())) (with , comma array column separator) is supposed to create a row vector of 3 columns transposed to a column vector of 3 rows. The selection created for the automatically determined result is 3 rows in one column, for which the RAND() was calculated, resulting in a column vector { 1 2 3 } which transposed gave a row vector { 1, 2, 3 } and displayed for one column such row vector is repeated as { { 1, 2, 3 } { 1, 2, 3 } { 1, 2, 3 } } of which the first column displayed is the repeating first value 1. With this change the dimensions of the JumpMatrix created by IF({1,1,1};...) is used to generate the RAND() matrix, resulting in a { 1, 2, 3 } row vector that then is transposed and displayed as expected. Change-Id: I267ff5d336a86372ee456fd929249e5f0444f843 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134247 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134276
2022-05-14unotest: fix NSS initialization for CentOS7 system NSSMichael Stahl1-1/+2
When given an unprefixed path, CentOS7 system NSS 3.67 apparently ignores the nice unit test database and creates a legacy "dbm:" one in the same directory, which is of course empty. This causes: xmlsecurity/qa/unit/signing/signing.cxx:570:aaa_testODFX509CertificateChain::TestBody equality assertion failed - Expected: 0 - Actual : 1 The intermediate/root CA certificates are read from the signature and added with CERT_NewTempCertificate(), which then does a lookup in the database to find the trust flags of the certificate: 0 nssTrust_GetCERTCertTrustForCert () at pki3hack.c:610 1 fill_CERTCertificateFields () at pki3hack.c:819 2 stan_GetCERTCertificate () at pki3hack.c:926 3 STAN_GetCERTCertificate () at pki3hack.c:973 4 add_cert_to_cache () at tdcache.c:721 5 nssTrustDomain_AddCertsToCache () at tdcache.c:849 6 cert_createObject () at pkibase.c:1023 7 nssPKIObjectCollection_GetObjects () at pkibase.c:853 8 nssPKIObjectCollection_GetCertificates () at pkibase.c:1077 9 nssTrustDomain_FindCertificateByIssuerAndSerialNumber () at trustdomain.c:796 10 nssTrustDomain_FindCertificateByEncodedCertificate () at trustdomain.c:839 11 NSSTrustDomain_FindCertificateByEncodedCertificate () at trustdomain.c:852 12 CERT_NewTempCertificate () at stanpcertdb.c:366 13 __CERT_NewTempCertificate () at stanpcertdb.c:474 14 SecurityEnvironment_NssImpl::verifyCertificate() () at xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx:524 Change-Id: If334d056a9e13ad806e3ea1a03d395d606fd3d84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133622 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 55b9b3c9d4a71de1f4e4c79bfce2766d3ef73e28) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134292 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-14svl: fix testSignDocument_PEM_PDF with "dbm:" NSS DBMichael Stahl1-1/+26
CentOS 7 system NSS defaults to legacy "dbm:" DB. test_desktop_lib.cxx:2943:Assertion Test name: DesktopLOKTest::testSignDocument_PEM_PDF assertion failed - Expression: bResult NSS_CMSSignerInfo_Sign() (called from NSS_CMSEncoder_Finish()) internally calls PK11_FindKeyByAnyCert() and that fails likely for same reasons as documented in previous commit. The workaround here is a bit more involved, it turns out there's another path with NSSCMSSignerID_SubjectKeyID where the caller can pass in a SECKEYPrivateKey, let's try to do that as a fallback if a manual call to find the key fails. Change-Id: I298ee72f178220bcf644093917dba8143b092c92 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133577 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 5592ee094ca9f09bfcc16537d931518d4e6b2231) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134291 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-14xmlsecurity: fix testInsertCertificate_PEM_ODT with "dbm:" NSS DBMichael Stahl1-0/+7
CentOS 7 system NSS defaults to legacy "dbm:" DB. test_desktop_lib.cxx:2830:Assertion Test name: DesktopLOKTest::testInsertCertificate_PEM_ODT equality assertion failed - Expected: 1 - Actual : 2 The problem is that getPrivateKey() doesn't work: warn:xmlsecurity.xmlsec:624712:624712:xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx:824: Can't get the private key from the certificate. In this function, there is a check for trust flags, and the CERTDB_USER flag is not set, which causes the failure. The certificate was inserted here and the trust flags were set; this does write something to cert8.db and it's not clear why it doesn't work (if this call is omitted with the "sql:" backend, the test fails with NOTVALIDATED = 4 - as expected). Oddly enough, while PK11_FindPrivateKeyFromCert() fails, there's another function PK11_FindKeyByDERCert() that does appear to work, so call it as a fallback. Change-Id: I9821966a086574374f4f6df0ac5db2f7376fe742 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133576 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit c9e758e3961b71c83a781da4cb12e454f09b094e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134290 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-14tdf#148470 if macOS glyph fallback provided a partial result flag what failedCaolán McNamara1-0/+20
so another font can be attempted for the remainder Change-Id: Ie2c67c7c63510d02c99f2377c0c43ed6050ccd86 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134131 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4b693a0c594fb3b73f4a4c1e03e9916f1a107012) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134070 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-13curl: upgrade to release 7.83.1Michael Stahl6-22/+10
Fixes CVE-2022-27774 CVE-2022-27775 CVE-2022-27776 CVE-2022-27781 plus 6 more CVEs that shouldn't affect LO. Remove obsolete configure-eval-fix.patch.0. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134225 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 58a3bf5199818e30ef4207213f29692d81b519c6) upgrade to curl-7.81.0 Change-Id: I0a34239bfb16bf19e25bf374c7f36c4cdf1776c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128783 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 40a84af1bdd7b3c414a8a78ca32b0951c03f9976) Change-Id: Ifbd7ff5acf390df1d95d6b8be0dc7751e4753bbe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134246 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-13sw: fix crash in SwDrawShell::Execute()Miklos Vajna1-0/+5
Crashreport signature: SwDrawShell::Execute(SfxRequest&) [clone .cold] include/svx/svdhdl.hxx:194 SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) sfx2/source/control/dispatch.cxx:255 which is a bit tricky to read (probably due to LTO), but what happens here is that the handle index is user input and we look at index up in a list without error handling. This is a problem since commit 7eed711a6115bf892c998cbd73a2c5b706c6f99d (Extended MoveShapeHandle command for Anchors as well, 2021-05-24), which assumed that handle indexes and the handle list can't get out of sync. Fix the problem similar to what commit 48beccf52413981d3d1c525a81a2c57048abe261 (sw: fix crash in SwView::Execute(), 2021-09-03) did at SID_MOVE_SHAPE_HANDLE handler for Writer images (this one is for Draw shapes). This fix just makes sure we don't crash, there may be some deeper reason why the handle index is out of sync with the handle list in the first place. Change-Id: I8f3a25d74082984cedce09362a690f24d7236ba6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134216 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 3f318b314eb161d293990efa401a626ed8017c87) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134184 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-05-12tdf#149023 set property immediately on changeCaolán McNamara1-7/+3
and not in an idle which may be triggered on losing focus and arrive when a new shape is selected Change-Id: I7cec8f1c9bf864cdb30516dece1ef9d6b689a94e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134175 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-12tdf#142840: doc export: use BookmarkToWord() for hyperlinksVasily Melenchuk3-2/+22
Inernal hyperlinks to bookmarks should not contain spaces. This is not required for RTF or DOC: MS Word is okay with spaces there (unlike in DOCX). But since we are replacing spaces in bookmark names we should do this also in links to these bookmarks. Change-Id: I7a3e530817572ed53032c2be1ad96f8e8498bac3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133590 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit d45315c8eb91862958b29ead09cec58e03a80096) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134177 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-05-11Update mdds to 2.0.3.Kohei Yoshida1-2/+2
This release includes a revised block position search implementation that shouldn't touch the internal STL iterators so that even if you pass an invalid position hint, it should not trigger process termination. Change-Id: I8c76eb012ba7ce304ff10b38de468b7c9c6cce2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134140 Tested-by: Jenkins Reviewed-by: Kohei Yoshida <kohei@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134152 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-11Resolves: tdf#132582 Display duration for calculated time values selectionEike Rathke1-0/+12
Change-Id: I634cd0fb059ed9c35849b435bcbd178cd84ac2ae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134132 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 23689e492feb41a391738586cef04ab82cc21f80) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134069 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-05-11sw XHTML export: output table / table row background format using CSSMiklos Vajna5-14/+65
The HTML export uses HTML elements / attributes to describe the background color of tables / table rows. CSS markup is used when exporting styles, not direct formatting. This behavior makes sense for the HTML mode, but XHTML wants to CSS markup whenever possible, and usage of CSS markup for the reqif mode is not even optional. Fix the problem by switching to CSS markup for table and table row backgrounds in the XHTML case -- this is OK for reqif when describing tables (the reqif spec only forbids detailed CSS markup for spans, not tables or table rows). This amends the behavior of commit 4cd3c436923bfba281b1bf16d9785208a2119cea (sw reqif-xhtml export: limit values of the style attribute, 2018-04-11), which avoided invalid table row background markup by losing it on export. Change-Id: Ia0858986c3e8a3ea41adf8a24119442fe5068ee3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134119 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134136
2022-05-11tdf#108188, tdf#131190 - Verify that the page style is actually usedAndreas Heinisch4-26/+45
Change-Id: I007d26c6fcaf60d2a2378cc00e630da447f95a8a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134022 Tested-by: Andreas Heinisch <andreas.heinisch@yahoo.de> Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de> (cherry picked from commit ad79900cd62c487bda9d2515892d62b3b08a5dfa) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134067 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-05-10tdf#148993 XLS export: fix broken formula regressionLászló Németh2-2/+6
Exported XLS documents lost their formulas opened in MSO. Regression from commit 12ee423c7549ddd2b86dfc3fc6fed2c617dcca7f "tdf#144397 tdf#144636 XLSX: cache external named ranges and their formulas". Change-Id: I009630a41b29bb21349711cc07d0ed181f816374 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134075 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit ac9de05cc79e76392891c18814e8f120178ccf38) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134063 Tested-by: Jenkins
2022-05-09Resolves: tdf#148985 crash on searching for non-existing prefixCaolán McNamara1-0/+2
Change-Id: Ib89af12e75910adbd32abab5afceb9013dc51df2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134055 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-05-09Test StarBasic's native non-ASCII name syntaxMike Kaganski1-0/+28
Change-Id: Ie9f0cd21e59ffc1e3fbe2616e2ae7abbd0169424 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133103 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134044
2022-05-09sw: don't copy useless char escapement to next node on splitMiklos Vajna3-0/+57
Unless autocorrect notices such a just-typed content, pressing enter at the end of a paragraph which ends with superscript or subscript text will carry over that formatting to the next paragraph, which is hardly wanted by any user. Technically this is not copying: paragraph split works by creating a next text node, moving all content & formatting to this next node, then move part of the content back to the previous node, which is all content in case of an enter at the end of a paragraph. Copying character formatting over to the next text node makes sense: e.g. paragraph alignment or boldness is probably something a user wants to continue using in the next text node. But superscript is typically created by autocorrect in English text for "1st" and similar input, this is usually unwanted in the next paragraph. Fix the problem by special-casing the RES_CHRATR_ESCAPEMENT case and remove the matching SvxEscapementItem from the hints of the just created next paragraph in case it's there. A possible future improvement would be to support this when there are other active (direct formatting) hints, in which case going via SwDoc::ResetAttrs() is probably a better choice, but the effects of that for undo and redlining is not clear. Change-Id: I57feb99d9a31f16c277eba44f464ab49936b65aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133936 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit 71019ec15bd3fe15385443b68614fd2402e0040f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133867 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-05-09Delete CJK-style mnemonics on macOSxuenhua1-1/+2
Delete CJK-style mnemonics for the dropdown menu of the 'New button' and lower menu of 'File > New' on macOS Change-Id: Idd0ab671cd75151095c92b37e5b6b5e81ddae7e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133872 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-09Resolves: tdf#148948 Use QueryBy(Non)Empty for "=" and "<>" criteriaEike Rathke1-4/+25
Change-Id: I94e29370076fff977b6552d10883878633bee313 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134000 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 920a083f3818765528899ab38170db5a2917a06c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134054 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-09ucb: webdav-curl: if LOCK fails, display error messageMichael Stahl1-32/+47
Sharepoint may reject LOCK with HTTP/1.1 403 FORBIDDEN and then a dialog pops up via UUIInteractionHelper that says "Server error message: ." Let's actually put some error message in the dialog, why not the HTTP status line, plus a little prefix to see which method failed. Change-Id: Ied895787f813c5cddcb18eb4f693d5bfc8c62076 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133835 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit cb64a52afc92891ab853b9bb1294610bb9ca98d0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133856 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2022-05-08tdf#148962 starmath's UnicodeNotationToggle (alt+x) getting called twiceCaolán McNamara1-1/+3
Change-Id: Ib150e4825c547c19a30c7b66d3f33904b814a917 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133865 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-07svl: fix crash if user cancels/closes master password dialogMichael Stahl1-1/+3
(regression from d7ba5614d90381d68f880ca7e7c5ef8bbb1b1c43) Change-Id: I8bb9a967aefa2e88f05c23456a0dd1a090e1a5fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133932 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit bbb8617ece6d946957c2eb96287081029bce530f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133863 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-07Resolves: tdf#148843 Handle single reference error values correctlyEike Rathke1-8/+7
... if errors are to be ignored through AGGREGATE(). Affected were AVERAGE, SUM, SUMSQ and PRODUCT. An error encountered in this constellation lead to the next argument being ignored as well. Change-Id: Ief28d79b4c230b1a2b6f8f0a865fbf8f51854c4c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133964 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 4ea44fdb19e568093ab1e0549c3ffa33296a486b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133868 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-07tdf#143720 treeview not expanding vertically to fill spaceCaolán McNamara1-7/+9
use a simpler box instead of a grid here and it works out ok vertically Change-Id: I14fd05b25b00f79b115c041a8e9f5c7ebcf49419 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133956 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-07tdf#148837: fix cell range negative selectionhasban121381-2/+2
In Calc when you select all and then do negative selection, there has a bug. The reason is in ScMultiSel::SetMarkArea that case will make nBeg larger than nEndRow and in MarkAllCols start will be larger than end. So I added a condition in the if clause to make sure that nBeg is not larger than nEndRow. Change-Id: I7f39a588bf928b2885207810534d78481589c2f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133538 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 2490715c112699487915865f4267a880fe7bc4b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133861
2022-05-06update creditsChristian Lohmaier1-1962/+1989
Change-Id: Ib5064763e88ca90d1ad52c71f4ac920de3ae0274 (cherry picked from commit 40462e3e78e7beb7cd22c8825f473126d1c89ef8)
2022-05-06tdf#91035 sw page-style UI: All styles shown, not hiddenJustin Luth1-1/+1
The first entry in the list (All styles) is what is shown by default, so that means that the 0th entry should be pre-selected, not the 1st. Change-Id: I4c204fda41a0551b9f30724df361e4f797a87325 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133911 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> (cherry picked from commit 3a79bd968869f782b8540aea6598c1f8ee14cced) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133862 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-05-06vertical text test fails with latest harfbuzzCaolán McNamara1-2/+2
with font "Droid Sans Japanese" which doesn't seem to be available in ci, but is by default in the Fedora 37 build roots I suspect since: https://github.com/harfbuzz/harfbuzz/issues/537 Change-Id: I23d9415444668ce379765f32a96ed67f057ebfd7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133858 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-05-06tdf#146007: make sure to not hold solar mutexMike Kaganski1-0/+5
COM might need to forward the call to another thread (with corresponding apartment); if that thread happens to wait for solar mutex, COM call may deadlock. Change-Id: I8fcf04619cd29b678fd7ade87254b9aad2f639a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133853 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133882
2022-05-06tdf#148920 sw page-style UI: make conditional filter usableJustin Luth1-1/+1
In windows, and SAL_USE_VCLPLUGIN=gen ./instdir/program/soffice the style filter on the conditional tab was disabled. It worked fine in gtk3 though. This fixes a 7.2 regression from tdf#82802's commit 1f066313218449cac494a887eb209311efbaa405 Change-Id: I1e6bb8d589224e4ad51ae0057d5278e3888cc3b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133910 Tested-by: Justin Luth <jluth@mail.com> Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> (cherry picked from commit 397fbda8c31e931f68a6c0072f6051f68481fc9e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133860 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-06Resolves: rhbz#2081661 gtk-critical gtk_tree_view_scroll_to_cell assertionCaolán McNamara2-3/+5
Change-Id: I4c7c4caed907072ef3a73ccfafabe882d618fa0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133730 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-05libxml2: upgrade to release 2.9.14Michael Stahl1-2/+2
Fixes CVE-2022-29824. Change-Id: I31d6ec794b01dee0bb17022ef2e18d2acd8255df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133813 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit f670422a01e7336ba8a554331f3781ec7f5c4e8c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133731 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-05-04Some JREs need the bin/server/jvm.dll path after allStephan Bergmann1-1/+5
...which had been removed in 18bdf78e156f3cd1e6ccbb3ae28e919583bac70c "Azul is just another OpenJDK variant", when fixing the previously mis-classified Azul JRE from "uses OtherInfo" to "uses SunInfo". But the IBM Semeru Runtime (<https://developer.ibm.com/languages/java/semeru-runtimes/downloads/>) is another arguably mis-classified case due to its java.vendor of "IBM Corporation" (and where the VENDOR_MAP_ENTRY<OtherInfo>("IBM Corporation"), line in jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx might be relevant for some other JRE from IBM; at least, that entry is present ever since the introduction of vendorlist.cxx in 738e9b77b9d181b376188e405e1eb353cf93c597 "INTEGRATION: CWS jl8"). So just generally support the bin/server/jvm.dll path here for "uses OtherInfo", even though it should actually only be necessary for "uses SunInfo". (See the mail thread starting at <https://listarchives.libreoffice.org/global/users/2022/msg00246.html> "[libreoffice-users] LibreOffice 7.3.3.2 Windows 64 bit seems not detect AdoptOpenJdk JRE Windows 64 bit runtime".) Change-Id: I3a4d02309b7c833c3cd32dc2dda4f4cb7b216693 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133827 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit c7b923a9ebaa40809c11659f8816a1d2bfd44c89) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133733 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-04ucb: webdav-curl: fix handling of non-standard propertiesMichael Stahl2-6/+16
Sharepoint uses properties like these: "http://schemas.microsoft.com/repl/resourcetag" "urn:schemas-microsoft-com:Win32CreationTime" They aren't standard and don't match our own ucbprops namespace, and it looks like they should be handled by an encoding to a name like "<prop:Win32CreationTime xmlns:prop=\"urn:schemas-microsoft-com:\">" Unfortunately WebDAVResponseParser::endElement() didn't do that when handling a PROPFIND reply to get the property names. This causes a crash when all properties are copied in UniversalContentBroker::globalTransfer(), which is called by SfxMedium::DoBackup_Impl() when the setting "/org.openoffice.Office.Common/Save/Document/CreateBackup" is in effect. Change-Id: I2d6480bfd2f828b6e7fc431ba4b333d95ec12718 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133769 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 65362d63b9019e45d1224ed6d78d4e1d443d6b00) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133727 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2022-05-04sw: avoid one more EXCEPTION_INT_DIVIDE_BY_ZEROXisco Fauli1-2/+7
Seen in https://crashreport.libreoffice.org/stats/signature/SwTextFrame::PaintExtraData(SwRect%20const%20&) Change-Id: Ie6924254dca73360d384987834460a6f813e0d69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133691 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit fae937b6859517bd9fe8e400cad3c84561ff98ab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133715 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-04tdf#148426 ucb: webdav-curl: fall-back to GET if OPTIONS status 500Michael Stahl1-1/+3
With the ndr.de server, OPTIONS on an image URL results in a status 500 Internal Server Error and an unexpected closed connection: 16.591:info:ucb.ucp.webdav.curl:1634132:1634170:ucb/source/ucp/webdav-curl/CurlSession.cxx:285: debug log: 0x7f9c94004988: transfer closed with 222 bytes remaining to read Apparently Neon always reported the closed connection problem with a string: "Could not read response body: connection was closed by server" The HTTP status code is extracted in makeStatusCode() and the string doesn't contain it, so the status is reported as 0 up the stack. With curl, it can apparently happen that either CURLE_PARTIAL_FILE is returned, in which case the status is ignored and reported as 0, or CURLE_OK is returned and the status 500 is reported up the stack. Adapt the handling in Content::open() to fall back to GET in case of a 500 status. Change-Id: I5f3dce7f67ce25c87bf3882c89e7ff2d386bcbad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133707 Tested-by: Jenkins Tested-by: Gabor Kelemen <kelemeng@ubuntu.com> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 5801b887629dbd784116ec6878b61bb99e991647) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133723 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-04tdf#147283 allow 'fake italic/bold' glyph fallback results to be cachedCaolán McNamara3-35/+64
see also tdf#32665 Change-Id: I69746b815fec3c73f87de4dc3fe84dbc91e61f0f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130877 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 04f9a8957c04b8c5abaa58140328d2c83381f4ff) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133724 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-04do not allow reusing already used SalLayoutGlyphs (tdf#148477)Luboš Luňák2-3/+22
If the glyphs have already been used, the AdjustLayout() call in OutputDevice::ImplLayout might have altered them, since MultiSalLayout::ImplAdjustMultiLayout() drops glyphs that need falllback from the base layout. And then then GenericSalLayout::LayoutText() would not know to call SetNeedFallback(). Change-Id: I2f79d26c8b861f20d7d52abaa0d917aaeefb37a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133758 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 22191901bc91535121a5e8dc7ee6137233824d36) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133726 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-04tdf#146346 DOCX import: fix table margins in footnotesLászló Németh3-1/+27
Paragraph of the anchoring point of the floating table needs zero top and bottom margins, if the table was a not floating table in the footnote originally, otherwise docDefault (Standard) margins could result bigger vertical spaces around the table. Quasi regression from commit c46950fee11f5207fb8324947280cd565ae483e7 "tdf#143583 DOCX import: fix lost empty paragraphs of footnotes" (before this commit, empty paragraphs at the end of the footnotes were removed by accident, which hid the real problem fixed now). See also commit e11c51eefe8c3210cef2b5850f401ba67a401d01 "tdf#95806 tdf#125877 tdf#141172 DOCX: fix tables in footnotes" (Note: before this commit, only a single table was shown instead of the eight tables of the eight footnotes.) Change-Id: I4180a6f7d7c49faf0842637b23aa1c8c5680a76c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133752 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit d1ac8df139a2a65db45d1970ccc0b80e17d827f6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133728
2022-05-04ofz#47198 Use-of-uninitialized-valueCaolán McNamara1-1/+3
seen in ww8 filter with rName of length 0 in if (rName.startsWithIgnoreAsciiCase("Tms Rmn") Change-Id: Ia8a20971161a44d62ead9bfcef59f86b007fd58b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133713 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4e1cf8411197b4c11a6c5d4728e047e6d46567b5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133719 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins
2022-05-03tdf#146573 sw: recalculate cells with footnotesLászló Németh3-7/+41
Commit 915d3eebc1dc4f18d7a1992db801ee8313ee46c0 "tdf#39828 sw: fix table formula calculation at track changes" allowed to use footnotes in value cells unintentionally. The only problem was that modifying cells with footnotes didn't trigger formula recalculation in text tables, according to the incomplete SwTableBox::IsValidNumTextNd(). Instead of asking formula recalculation pressing F9, now IsValidNumTextNd was extended to skip footnotes, similar to the already skipped comments. Also clean-up to testTdf39828 (remove copy-paste code), and clean-up to commit 915d3eebc1dc4f18d7a1992db801ee8313ee46c0 "tdf#39828 sw: fix table formula calculation at track changes" to avoid of unnecessary calls of GetRedlineText(), which is an expensive call, especially when there are a lot of redlines with overlapping (see commit d467cd0dd9e9cf3b018859a592e2638527bc7add "tdf#135683 speedup DocumentRedlineManager::GetRedlinePos"). Change-Id: I00243ef0985805414723e26fe26d6e9c04ce86cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133579 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 978e22f8cfb3db573bed3fd4b14a515cf090f7e5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133722 Tested-by: Jenkins
2022-05-03ofz: Use-of-uninitialized-valueCaolán McNamara1-1/+1
Change-Id: I9ca24a135494a49449aec63615b2d945a93e8b27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133717 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-05-03sw: avoid EXCEPTION_INT_DIVIDE_BY_ZEROXisco Fauli1-1/+1
Seen in https://crashreport.libreoffice.org/stats/signature/SwBookmarkPortion::DoPaint(SwTextPaintInfo%20const%20&,rtl::OUString%20&,SwFont%20&,int%20&) Introduced by 4ce8120f1e53f7b81e653b01d141643013bc69ab "tdf#45589 sw: create and paint text portions for bookmarks" Change-Id: I7d025878164e1f97b86f9d129af9ba93e93b6ba3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133562 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 7c8b9fa98f4c5f7f5620e797dbbe24081e252548) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133601 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-05-02Delete mnemonics for CJK translations on macOSxuenhua1-16/+3
'Cop~y' translated into Chinese is '复制(~Y)' But the mnemonics '(Y)' is useless on macOS. In English, 'Cop~y' with the '~' removed is the correct result. But in CJK should remove along with '(' and ')', not just only for mbMenuBar. Use the method MnemonicGenerator::EraseAllMnemonicChars already defined in vcl/mnemonic.hxx Change-Id: Ic37ce566923e3dea47535d187b1b3dba2088e960 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133572 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7fd1b0aa2ba741103a7d9ac835514ebbeae3bcff) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133714
2022-05-02tdf#148714 connect first and second arc with arcToRegina Henschel3-4/+81
The curved*Arrows start with two arcs, which should be connected by a line. The used commands are double V and double B respectively. Both have an implicit moveTo, so that there should be no line between. Other applications show the shapes correctly without line. But because of bug 148714 LO shows a connecting line so that the error was not earlier detected. The patch changes the segment definition so that for the second command the variant with implicit lineTo is used. This does not change rendering in LO but makes other applications rendering the shapes like LO. Change-Id: I4f799f89497e52b1a7e00d8e5345a66ce21c00a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133586 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133640
2022-05-02tdf#148683 sw: fix crash on deleting text with redlining enabled, but hiddenMiklos Vajna3-1/+62
Regression from commit 32902f66e7749b2d06d13f50416be5323a0c0ea9 (sw_redlinehide: make layout based Show/Hide mode the default, 2018-11-30), deleting some text in the middle of the paragraph with the bugdoc results in an assertion failure in the SwDrawTextInfo ctor. Normally this doesn't happen on text deletion as we already have a mechanism for truncating no longer needed lines in SwTextFrame::Format_(), though that only checks the length of the current line. Fix the problem by extending this mechanism to also check the remaining lines: if change tracking is on and the total of all line lengths is more than the string length of the text frame, then time to re-calculate. It seems this is not needed in practice when redlining is disabled, though we might want to enable this for the non-redline case as well in the future. (cherry picked from commit 515bf5d4afa3a8ed413fd6f17f66fa98b6dbf29e) Change-Id: Iede03e11daceb3c2b614a301e21560b075a60c01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133684 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins
2022-05-02tdf#140272 gtk3: fix crash with dnd using touchCaolán McNamara1-10/+33
gdk_wayland_drag_context_manage_dnd needs gdk_device_window_at_position(device, ...) to succeed similar to the problem of https://gitlab.gnome.org/GNOME/gtk/-/issues/1080 Change-Id: I2e1956b40a622b1d74d3aef3b5fac654fc1256eb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133409 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-01tdf#143956 Remove page size of Writer templates 3Laurent BP5-1995/+72
This patch concerns "offmisc" templates: - Businesscard-with-logo: - use predefined style names to have them automatically translated - use automatic date format according to locale settings - update preview - remove useless duplicate code and unused styles - contributor's name to top to fit in A4 and Letter formats - remove 1 empty line in table to fit in Letter format also - remove useless stuff in settings.xml file. Keep these fields, because if certain settings are MISSING, xmlimp will consider the file in old format (thanks to Justin Luth) - reindent xml files Change-Id: Ie1b35fe420dbb445cb5070b8a3726c40184973ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121267 Tested-by: Jenkins Reviewed-by: Laurent Balland-Poirier <laurent.balland-poirier@laposte.net> (cherry picked from commit fd9d71d7706adcbe1191b09c8ba252d2b4dfb50e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133607 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-05-01Align macro menu in start center with other placesSamuel Mehrbrodt1-0/+1
Esp. "Edit Macros" was missing here - it's available in the other apps. Change-Id: I807e9c35da42729d3c3838266736fdfa5be23fcc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133434 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 96ce28f5eb7139f66ba35e74e997c3a686aeca39) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133606