summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-05actually restore the original HFONTLuboš Luňák
A mistake I made when fixing tdf#137122. Change-Id: Ie3a258de69e17d8cedb3bf722841af1054bd0fe1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111972 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 0087dc55121808a7fbf09cd94549b44dc17707dd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111927
2021-03-05tdf#139940 oox: mark end before growing largest segment backwardsJustin Luth
This fixes a regression in 7.1 (backported to 7.0.1) caused by commit 73993fdb5d4b507694cd0edf80887d19f7e2bf9a for tdf#134183. The largest segment has already been found, so we know where the next segment starts. Now if we grow it backwards, that shouldn't affect where it ends. So flag the end before growing the start, otherwise we would have to recalculate the end again. Change-Id: Iaae401d0438e533c7498be56f48fa153f7d3ff0a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110004 Tested-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 247963e53cce24c199a751c8ffb17f58b3a7d473) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111926 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-03-04xmlsecurity: improve handling of multiple X509Data elementsMichael Stahl
Combine everything related to a certificate in a new struct X509Data. The CertDigest is not actually written in the X509Data element but in xades:Cert, so try to find the matching entry in XSecController::setX509CertDigest(). There was a confusing interaction with PGP signatures, where ouGpgKeyID was used for import, but export wrote the value from ouCertDigest instead - this needed fixing. The main point of this is enforcing a constraint from xmldsig-core 4.5.4: All certificates appearing in an X509Data element MUST relate to the validation key by either containing it or being part of a certification chain that terminates in a certificate containing the validation key. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111254 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 9e82509b09f5fe2eb77bcdb8fd193c71923abb67) xmlsecurity: improve handling of multiple certificates per X509Data It turns out that an X509Data element can contain an arbitrary number of each of its child elements. How exactly certificates of an issuer chain may or should be distributed across multiple X509Data elements isn't terribly obvious. One thing that is clear is that any element that refers to or contains one particular certificate has to be a child of the same X509Data element, although in no particular order, so try to match the 2 such elements that the parser supports in XSecController::setX509Data(). Presumably the only way it makes sense to have multiple signing certificates is if they all contain the same key but are signed by different CAs. This case isn't handled currently; CheckX509Data() will complain there's not a single chain and validation of the certificates will fail. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111500 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 5af5ea893bcb8a8eb472ac11133da10e5a604e66) xmlsecurity: add EqualDistinguishedNames() Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111545 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 1d3da3486d827dd5e7a3bf1c7a533f5aa9860e42) xmlsecurity: avoid exception in DigitalSignaturesDialog::getCertificate() Fallback to PGP if there's no X509 signing certificate because CheckX509Data() failed prevents the dialog from popping up. To avoid confusing the user in this situation, the dialog should show no certificate, which is already the case. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111664 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 90b725675c2964f4a151d802d9afedd8bc2ae1a7) xmlsecurity: fix crash in DocumentDigitalSignatures::isAuthorTrusted() If the argument is null. This function also should use EqualDistinguishedNames(). Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111667 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit ca98e505cd69bf95d8ddb9387cf3f8e03ae4577d) Change-Id: I9633a980b0c18d58dfce24fc59396a833498a77d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111901 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-04xmlsecurity: ignore elements in ds:Object that aren't signedMichael Stahl
Change-Id: I2e4411f0907b89e7ad6e0185cee8f12b600515e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111253 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 2bfa00e6bf4b2a310a8b8f5060acec85b5f7a3ce) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111900 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-04xmlsecurity: XSecParser confused about multiple timestampsMichael Stahl
LO writes timestamp both to dc:date and xades:SigningTime elements. The parser tries to avoid reading multiple dc:date, preferring the first one, but doesn't care about multiple xades:SigningTime, for undocumented reasons. Ideally something should check all read values for consistency. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111160 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 4ab8d9c09a5873ca0aea56dafa1ab34758d52ef7) xmlsecurity: remove XSecController::setPropertyId() Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111252 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit d2a345e1163616fe3201ef1d6c758e2e819214e0) Change-Id: Ic018ee89797a1c8a4f870ae102af48006de930ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111899 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-04xmlsecurity: replace XSecParser implementationMichael Stahl
Implement Namespaces in XML and follow xmldsig-core and XAdES schemas. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110833 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 12b15be8f4f930a04d8056b9219ac969b42a9784) xmlsecurity: move XSecParser state into contexts Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111158 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 59df9e70ce1a7ec797b836bda7f9642912febc53) xmlsecurity: move XSecParser Reference state into contexts Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111159 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit cfeb89a758b5f0ec406f0d72444e52ed2f47b85e) Change-Id: I03537b51bb757ecbfa63a826b38de543c70ba032 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111898 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-04tdf#124678 DOCX export: always write title page in section propsVasily Melenchuk
Even if page description is not set we should try to mark title page because chaining of two page styles can not work for continuous sections. Unittests were implemented previously and were taken from abandoned patch https://gerrit.libreoffice.org/c/core/+/70646 Change-Id: I0b953d72d762f868735dc658f023d96944c9d308 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111757 Tested-by: Jenkins Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit e305289f87ea058cc92ecd83379b848697aa5a80) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111884 Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
2021-03-04restore namespace unwinding in SvXMLImportNoel
accidentally lost during the fastparser conversion Change-Id: I7d53e9f32dd8cff650b9ffb6dae493419ce8461f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110813 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit e5f436bc53e0d07654901ef7cc8ff56d04f0686e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111897
2021-03-03tdf#139763 set anchor type in meEditAs in all casesRegina Henschel
OOXML specifies a shape anchor type with xdr:absoluteAnchor and xdr:oneCellAnchor, or with xdr:twoCellAnchor and the attribute editAs with values 'absolute' and 'oneCell'. For our UI the member meEditAs is used. But only in case twoCellAnchor it was set. The patch adds the missing assignments. Change-Id: Iceffd4c5c7640e4d9a614cd52cb491774989595f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111436 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> (cherry picked from commit b2848591ca529004fcfef9bd0f3650750b3735d7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111425 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-03-03tdf#140606 make PDF parsing more lenient and prevent a crashTomaž Vajngerl
If the external document can't be opened, it tried to continue with the export anyway, which eventually lead to a crash. This is fixed by handling this situation and prevent a crash, however the part of the document in this case isn't exported. The document couldn't be opened because of a parsing error - there was a unexpected null character instead of a whitespace, which made the parser panic. Fix this by making the parser more lenient in such a situation when there is an unexpected null and try to continue parsing. Bug document seems to be created with a buggy PDF writer, but other PDF readers don't complain when parsing the document so it looks to be a valid. qpdf --check doesn't complain either. Change-Id: I61eb281e821ccd195ef006d778556e25d1c7f5e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111820 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 2c1ed5a5dad827cde032f27a4348e81be15889bc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111857 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-03-03tdf#140537 scroll-wheeling shouldn't affect disabled scrollbarsCaolán McNamara
Change-Id: I5d8659c7d431d35d628b12cebfe6a4b4f9cab9ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111703 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-03-02update creditsChristian Lohmaier
Change-Id: I9493971d90d9bc1629b1f2a0a1259db233656284 (cherry picked from commit 6c92ca3e04c68dff68345b71a5d01c1764a5ef35)
2021-03-02Revert "sw_fieldmarkhide: init fieldmark mode from options"Michael Stahl
This reverts commit c0864f26f3143ea81c65d3826fae32a8fd54c531. Revert "sw_fieldmarkhide: toggle mode depending on View->Field Names" This reverts commit c74a2fd835474caf311be10703c985e2f916a83b. Currently no time to fix the remaining bugs, for example tdf#138771 tdf#139638 tdf#139737 Change-Id: I800c5c8df10c02ac8be6234141e7c58d73915cd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111758 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 70dd95aabd11b2146e2556c1da87da4a22d6f7b5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111779 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-02tdf#140552 RTF export: fix hyperlink, in footnote, in hyperlinkMiklos Vajna
Regression from commit 7d42346ba77c9c4df241ea40eaf550993ca18783 (tdf#90421 RTF export: ignore hyperlinks without an URL, 2015-04-21), URLs can be nested in the footnote case, which requires a stack. Otherwise the inner URL clears "the" URL and we don't close the outer field as we believe it's empty, so it was not started. Change-Id: I9f87ddbb7e597c413bf836eb9b58beb76722361f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111794 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 5a74baa4f033f84c4bbcec869a68eef149f77161) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111778 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-02tdf#140158 tdf#138598 tdf#140598 sw: fix sync of AS_CHAR textboxesAttila Bakos (NISZ)
Textboxes anchored "As Character" fell apart, when typing before some characters or inserting a page break. By fixing that, the tdf#138598 bug also have fixed which was a regression from commit b6850bbe95418ecfde404be1696548f18d200c9b (tdf#106153 sw compatibility: fix textboxes exceeding the page). In addition, tdf140598 is also fixed, which was a regression from commit c96c386c5db45dc4d5e358915caad7474e373068 (tdf#136516 add positioning to SwTextBoxHelper::syncProperty()). Change-Id: Ifeadd8b2055ce52a019d651369ca41185de7bbe3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111338 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111796 Tested-by: Jenkins
2021-03-02tdf#139301 fix OOXML-compatible preset dash stylesLászló Németh
Despite the purpose of the new interoperability styles added in commit b2d8093b19642038631dfb8f1ab6745a380a652c (tdf#127499 added 9 new line styles all are (var) and in line with MSO), collision with commit 57c9bdab377a00649299d1a4c9ed2f9e5e03b84e (tdf#127166, tdf#123903 improve import/export of line styles) resulted still missing interoperability on the user interface: 1) opening an OOXML document, preset styles weren't recognized on the UI, also the preview was a solid line on the Drawing Object Properties toolbar. 2) using the new compatibility preset styles, OOXML export resulted custom styles instead of the intended preset styles. On the UI, now the layout of the first 8 preset dash styles follows the OOXML standard, see 20.1.10.49 ST_PresetLineDashVal (Preset Line Dash Value) in ISO/IEC 29500-1, 2016: dash pattern name (OOXML name) 10 "Dot" (sysDot) 1000 "Long Dot" (dot) 1110 "Dash" (sysDash) 1111000 "Long Dash" (dash) 11111111000 "Double Dash" (lgDash) 11110001000 "Long Dash Dot (dashDot) 111111110001000 "Double Dash Dot" (lgDashDot) 1111111100010001000 "Double Dash Dot Dot" (lgDashDotDot) (Note: missing "Dash Dot" (sysDashDot) and "Dash Dot Dot" (sysDashDotDot) were added only in the master, but not in this back-port, yet, because the commit would contain new translatable strings: 111010 "Dash Dot" (sysDashDot) 11101010 "Dash Dot Dot" (sysDashDotDot)) Remove "Double Dot": it really wasn't an OOXML-compatible preset style, and it has a good replacement among the older styles, the similarly loosely dotted "Fine dotted", which is still supported for back-compatibility. Note: to start the new UI test, use $ (cd sw; make -srj8 UITest_writer_tests7 UITEST_TEST_NAME="tdf139301.tdf139301.test_tdf139301" SAL_USE_VCLPLUGIN=gen) (cherry picked from commit 183c06fc02a50fb117bb6162e4d6e56cdd34fad1) Change-Id: I7f7cf6ea954aad4cb43ef7730b204ed7635f8fb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110403 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-01generic Skia workaround for VCL sending empty size (tdf#140288)Luboš Luňák
There have already been commits to handle this, but the case of getting the wrong size the first was still broken (or was fixed in the past and got broken again). Try to be generic by forcing these to be always considered to be offscreen and force non-zero size there. Change-Id: Ie366a296f7f6645333630fa31e9fe18d54c7fba8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111528 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 9d8c04d2d5529626d649af3fcebb6d4b65193b28) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111711 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-01make sure Skia DWrite matches the given HFONT exactly (tdf#137122)Luboš Luňák
The problem appears to be that we use our private copy of the Dejavu Sans fonts, installed using AddFontResourceExW( FR_PRIVATE ), but that's not for whatever reason available for DirectWrite, which made CreateFontFromLOGFONT() find the system-installed Dejavu Sans, and if there was a difference between the two, then incorrect glyph ids were used. Use CreateFontFaceFromHdc(), which seems to match exactly. For private fonts this later fails the check with GetSystemFontCollection(), which would be nice to handle somehow, but I don't know how to get a font collection containing those fonts other than modifying SalFont to use DirectWrite API to install the fonts. Change-Id: I10d8fcb618f3b4decbb0198274331d7beaf843d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111522 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111773 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-01it's enough to have one Skia font managerLuboš Luňák
Change-Id: I5dd29178e1a1ec1081820912f49fd387eb3f822b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111521 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 9cd95b10936450b5d1d60319192c25c4aea05fa3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111772 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-01tdf#140668 Crashfix: disregard w:textDirection tag outside frameDaniel Arato (NISZ)
DomainMapper_Impl::SetFrameDirection had a false assumption that a w:textDirection tag will only be encountered when the OOXML parser is already inside a frame. This is not always the case. Regression from commit af4e5ee0f93c1ff442d08caed5c875f2b2c1fd43 (tdf#97128 DOCX import: fix frame direction). Change-Id: I39845599b0c7f502870e2de497df8cbdd4475594 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111594 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111754
2021-03-01tdf#136570 OOXML import: fix height of OLE objectsAttila Bakos (NISZ)
e.g. OLE icons or math formulas by skipping unset border properties. Regression from 636d16efe45a55c1a5a7a451c46fbb8618bf0393 (tdf#135653 OOXML import: fix OLE background color). Change-Id: I64bd68037d063de81fbb302b90d65b77af50a622 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111119 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit ca7855c24af858f52a11a593761ee9e6b9d6ba79) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111581 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-01tdf#132368 svx: empty the interop grab-bag on ending text editMiklos Vajna
Regression from commit aafaf1f55fa413ad49d4556cf7c0a713dd206ae4 (PPTX export: save SmartArt as diagram instead of group of shapes, 2019-03-13), the idea of interop grab-bag was to carry additional information around as long as the object is not changed. However, actual clearing of the grab-bag was never implemented, do this when editing shape text. An alternative would be to do this in SdrObject::SetChanged(), but Writer sets the layer of SdrObjects during layout (when the import filter is already finished and undo is enabled), so that would mean loss of the smartart metadata for DOCX. Change-Id: I9ab205b4ef84169f4b5a16b86fe9a152e3370a6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111560 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/+/111595
2021-03-01tdf#140137 Don't throw exception when w:gridCol is missing "w" attrAron Budea
2149e924cbc32c370128c5f87a4f55c50c99e6bd added a division-by-zero check, which caused Writer to throw an error on the bugdoc. Since the file could be loaded fine before, let's return to a working version, with the check included. The cause is the following in document.xml (originating from a non-MS generator): <w:tblGrid> <w:gridCol/> <w:gridCol/> </w:tblGrid> Word still splits such tables differently, but that difference was always there in Writer. Change-Id: I6d91a736f460394a76f035298a238c41da201cb3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111723 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111736
2021-02-27tdf#140528 Crash in writer when switching from Numbering to PositionNoel Grandin
regression from commit e5ecb998fd78137aec32ad2cc996eaa4bb3e499d Date: Mon Dec 5 09:52:43 2016 +0000 avoid coverity#1371269 Missing move assignment operator rather write this code in a more obvious fashion, and bypass the use of the very weird operator= method, which barely copies anything at all. Change-Id: I548d8f73224c2625ed6389861551038b18396b0f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111677 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 9ab2284660857f52efc9b68b9d2dd8ea768d6916) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111695 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-26tdf#134940 sw: fix AutoCorrect of arrow "-->"László Németh
Fix bad replacement of "-->" with "–>" instead of "→" (i.e. premature replacement of "--" to n-dash) since '>' was added to IsAutoCorrectChar(). Regression from commit 57f07b1d7378d218648667c5b1315cc8ad905875 "tdf#133524 AutoCorrect: support double angle quotes". Change-Id: I06f0cddb48d13c8e230dab964f79f588799ed4ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111527 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit d1be3d80d0ca5ccd7639ede379a1befc48dc73f2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111579 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-02-26tdf#140572 writerfilter: ignore position in docDefaultsJustin Luth
Despite the documentation saying that anything in docDefaults should apply everywhere unless it is overridden in a higher priority style, the subscript/superscript setting in docDefaults seems to be ignored. Makes sense in a way, but perhaps document those exceptions? I looked for documentation in both "docDefaults" and "position" and didn't see anything suggesting why it is ignored. Change-Id: If676415b112921e4cb8f7306b8c8ad93a6fd8cde Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111442 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 861ca1f5030f2f6b7fbdc3bb3ded3d11130673ed) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111463
2021-02-26Possible race between retrieving and using parent windowSamuel Mehrbrodt
Filepicker was called from extension, parent window was initialized in constructor with current top level window (extension dialog). Extension dialog got closed before file picker was shown in some cases, causing Show() method to fail Change-Id: Ie41585e6b05511ba2dff265374348b6041e9fa87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111378 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit 8c62c2fb88a7a82939ad3b5c7355c93a41b76d5b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111420 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-02-25Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-7-1' to 2ddcf60f46abe8a99afeffd5f4d1794609784682 - Fix broken link NOTE: No impact on l10n. Change-Id: Ib570fee707d968fae7c17e85720ae0b94e426787 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/111419 Tested-by: Jenkins Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
2021-02-25Resolves: rhbz#1931423 start update timer in IM events as well as keyeventsCaolán McNamara
Change-Id: I5a72adebd34c3983e7a414110c3192d05b725e45 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111490 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-02-25tdf#140572 docx export: avoid DocDefault superscript crashJustin Luth
This fixes a crash situation introduced in LO 6.4 by commit d71cf6390a89ea6a4fab724e3a7996f28ca33661. The crash was occurring when the DocDefaults were being exported. Since there was no character or paragraph context, the lookup of the related fontsize was crashing. Moving this variable closer to where it is used "just happens" to fix the crash. Because the DocDefault is considered a style, we are just exporting the superscript/subscript as a default size, and so don't need to know the font size. Thus a style-context position can't cause the crash again. So it isn't a great fix, and leaves the possibility for the same thing to happen in other situations (like RES_CHRATR_BACKGROUND), but at least it quickly solves this known problem, and is easily backportable, as well as following best practice of keeping variables as close to where they are used as possible - eliminating some unnecessary lookups. I did look for a more generic fix (or whether other properties could be affected) and didn't come with any clear examples or a better fix. Change-Id: I03dc3d74a5148973c065cadb09c5c79068f12df1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111403 Tested-by: Jenkins Tested-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 76d2a9fd461dde817fbb1c5d4aa830cb2c42b504) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111457 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-02-24update creditsChristian Lohmaier
Change-Id: I45b6387535bd966f37fdf98579c658747d89a1e0 (cherry picked from commit fcea709798c82105c229f7f7800e2be9be540289)
2021-02-24Update git submodulesChristian Lohmaier
* Update translations from branch 'libreoffice-7-1' to 2994683aa4f835760bfb43cf2a65ba82ce0ecd8c - update translations for 7.1.1 rc2 and force-fix errors using pocheck Change-Id: I0e5aacf560d4779b40d7755d1d1f5c3d9c83ced8
2021-02-24tdf#139070 format entry view of multilines with final formattingCaolán McNamara
so during editing of a multiline the singleline entry shows what it will show when editing is finished, so we suppress the default behaviour of gtk to show a newline symbol and the default behaviour of vcl to strip newlines Change-Id: Id7d384efc8b737c463f1bd44ca61376f342edb25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111416 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-02-24tdf#140397 make contenttoggle button visible again in all backendsJim Raykowski
fixes regression introduced by commit b80c2745c50d064ad9e673cf8a5b73aaf0aa1778 Change-Id: Ib93a0c1b203f399f4f64681aac8e1f76509bcc63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111439 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit 2b8ce3d62b71ca91df464e26ccc6c6c79d6c886f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111454 Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Tested-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
2021-02-24delete from mdds in reverse order (tdf#139820)Luboš Luňák
This is a more elegant solution from Noel, compared to my previous commit. Deleting in reverse order means the underlying std::vector used by mdds does not have possible to-be-deleted items to move around that forward order would have. Change-Id: I31f0774e302308bcb70595cb899c977ee5966c7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111395 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111438
2021-02-24Revert ""delete" also empty Calc cells if it helps mdds (tdf#139820)"Luboš Luňák
It's much simpler to just delete in reverse order. This reverts commit 2ac0ab976f814e97a38a9685bc23b7255cfef2f2. Change-Id: I310ebb7d517cbfbb7a22206d3c04660097d4ae1f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111394 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111437
2021-02-24Colibre: Update ActionMode iconsRizal Muttaqin
Change-Id: I0f558310e6c0040b9ebc759a0b53ed85a8973a77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111390 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <rizmut@libreoffice.org> (cherry picked from commit 356ee44d982f34d4c3a31c518c326e972cb28edd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111413
2021-02-23tdf#140332: Can't use System V semaphores in a sandboxed macOS processTor Lillqvist
See https://developer.apple.com/library/archive/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html , "Note: System V semaphores are not supported in sandboxed apps". So use POSIX semaphores instead. Change-Id: I37c910cf13b868ab15fe31f90e42d24a9a24eeb1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111239 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111256 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Jenkins
2021-02-23tdf#139039 sfx2 store: fix export to PDF when dir name is URL-encodedMiklos Vajna
Regression from commit 5259ab8104cfba60c40748ed0cd59d93df038c5b (sfx2 store: create temp files next to local files, 2018-01-08), the problem was that the directory hosting the input ODT file was called "Bugzilla%C3%BF" (URL-encoded from "ÿ"), we got this as "Bugzilla%25C3%25BF" (encoded from directory name), but we forgot to decode it before passing this URL to the utl::TempFile ctor as a parent directory, which resulted in failing to save as PDF, and crashing on DOCX export. Note that in practice this only caused a problem on Windows. (cherry picked from commit aaf7fe0326b3be088a5440525363317fb3d0f158) Change-Id: I5fc8a356b63efc2f16405a14ee59a061b52c5205 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111372 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-02-23python3: upgrade to release 3.8.8rc1Michael Stahl
Fixes CVE-2021-3177 plus these less important ones: CVE-2021-23336 CVE-2020-27619 CVE-2020-26116 CVE-2019-20907 Change-Id: Idbe072a9db1faf8363b4f7795b9fde71c26969f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111208 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit a0c8dc42335764d07c16a017c6b00486ec17ae53) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111178 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-02-23"delete" also empty Calc cells if it helps mdds (tdf#139820)Luboš Luňák
With mixed non-empty and empty cells, deleting a range would normally mean deleting just the non-empty cell ranges, which would make mdds repeatedly move parts of the underlying vector. Including empty cells in the range to delete may result in just one pass. Change-Id: Ia2ebcaba054c6e46f3cf6c964ba883bb600d6ee0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111125 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit b9921adae997579915b4600c688719620f9adaf6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111191
2021-02-23tdf#140437 ODF import: fix for broken documents with field code as typeMichael Stahl
Not sure how old the bug that caused this and which filter it was originally but currently the Word import filters don't do that any more. This causes an exception since commit dd24e21bb4f183048a738314934fc3f02ec093f1 so try to fix it up. Change-Id: I087586054ebd5698ed8e8a4054869df202226e92 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111345 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit d62c93a831080ef332e416dc78f5600c2c5b9850) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111318 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-02-22Sukapura: tdf#133038 change some formatting icons for CatalanRizal Muttaqin
Change-Id: I348f0f7b706befd7cb6dc00175875ef4256cba78 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111343 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> (cherry picked from commit bed8fb89abd980d08c5612f5f100bfad4ef0bca8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111317
2021-02-22Karasa Jaga: tdf#133038 change some formatting icons for CatalanRizal Muttaqin
Change-Id: I4146e0afbc7bd1aa95d2029a0618e02b168b33ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111312 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2021-02-22Sifr: tdf#133038 change some formatting icons for CatalanRizal Muttaqin
Change-Id: Ia0023372e70ff3a608f397804466c0ea2b807f0b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111313 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2021-02-22fix sporadic crash in sd_misc_tests on windowsNoel Grandin
we end up trying to process a timer message, but from inside the vcl de-init function, which means the timer stuff has already been de-initialised. Change-Id: I94703219754f1ccabd3065fc5ea437f39264197b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110397 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 14eff34dd10c047de222813eb16198b295b31d54) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111314 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-02-21Colibre: tdf#133038 change some formatting icons for CatalanRizal Muttaqin
Change-Id: I7a56ad91c3f23a0b2a33d732c885dedb06eacd87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111186 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2021-02-21elementary: tdf#133038 change some formatting icons for CatalanRizal Muttaqin
Change-Id: I3b51677f9451220c0c039c61467e903eabfc0395 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111185 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2021-02-19tdf#140486 forms "empty string is null" setting not loadedNoel Grandin
regression from commit 3de38e95561ab7ca114d9f3307702ba89c4e3e9a Date: Tue Nov 10 19:20:06 2020 +0200 use fastparser in forms Change-Id: I1e679bdca17185f20c1f755da16f02aa5661e22f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111123 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 67db5b7c8df4aa0fab08ac2d11b732dbc28c4c62) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111174
2021-02-18Resolves: tdf#140444 return early before null-derefCaolán McNamara
Change-Id: I85c0d178c3d6e375beb3ad50c4bae9ba0ac29937 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111033 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>