summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-26tdf#125936 writerfilter: treat escapement in numbering like stylesJustin Luth
deferCharacterProperties wasn't occurring in the numbering import (and so it was affecting the first run of the body text). But just like character styles, it would be better to just consider this auto-superscript instead of to defer it and calculate based on the fontsize - since that really isn't known until layout time, and so only works with direct formating. cherry-picked from 7.2's 2a7617653fb3d31e44e5cbcf8daf4b4c2a24e2c8 Change-Id: I9ce5a31c173089603316f4c3389e5f2e5dbe165a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112987 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113076
2021-03-26tdf#141079 Restore double click behavior for script fieldsSamuel Mehrbrodt
Change-Id: I5daa730740ea042bdae56b832f2557ec974339b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112668 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit 5302268de6a33716c7746aa13232746ad2f2b561) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113072 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-03-26tdf#140590 Writer crash in Tools>Chapter NumberingNoel Grandin
and an assert in vcl to catch it a little higher up the stack. Change-Id: Iaa2e70f901f93ca9f678118e4f5a8bc1b6eda20a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112459 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112866 (cherry picked from commit ebbf550f7087b173bdcf600a02bb87c0b655e787) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113124
2021-03-24update creditsChristian Lohmaier
also stabilize sorting (number of commits, if equal first commit date) Change-Id: Ia2f8484991b0de36f9769120f3d810422e8fc201 (cherry picked from commit 8dded9c4c901118cb73bf59398f6fe08a73fa04a)
2021-03-22tdf#141166 widget with id "tabcontrol" might not be a TabControlCaolán McNamara
it might be a VerticalTabControl or any other type Change-Id: I9f46f7e64a9be2487d400cc4a066575c0d45c19e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112802 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-03-19xmlsecurity: 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/+/111910 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-18tdf#118693: no need to use convertMm100ToTwip() for line shapes anymoreXisco Fauli
It was introduced in 11129d89b152db54c86bb2bda58c24b8abb6c5a8 < tdf#85232 WPG import: fix handling of line shapes > and later in 36bade04d3780bc54c51b46bb0b63e69789658a5 < tdf106792 Get rid of SvxShapePolyPolygonBezier > ForceMetricToItemPoolMetric was added to SvxShapePolyPolygon::setPropertyValueImpl to convert from 100thmm to twips as can be read in the comment in testTdf85232 With this change, xShape->getPosition().X in testTdf85232 is 2267, which was already in twips Change-Id: I30b757885327a477213f96f8f84541971f435164 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112663 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit c9e5640c8fcad7beb42a66f9bee0252eee9fe323) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112619 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112671
2021-03-18xmlsecurity: 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/+/111909 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-18xmlsecurity: 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/+/111908 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-18xmlsecurity: 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/+/111907 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-17tdf#136956 reorder undo actions in removeColumnsMark Hung
and removeRows. Inside the removeColumns and removeRows, undo actions are added first, and then cell spans are updated to reflect the removed columns or rows. Once undo the cell spans they become immediately invalid because the rows or columns are already removed, hence cause Impress to crash. Change-Id: I9d8641bdad43026eca03cbeaaa3a5907b516304f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112355 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com> (cherry picked from commit f3f7cc53efda828af8897fa45fa2a8f18cf3b48b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112526 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112649
2021-03-17do same set error state as ReadAndVerifySignature doesCaolán McNamara
this function is nearly exactly the same as ReadAndVerifySignature except it doesn't set error-state on exception during parse Change-Id: Ife881f639a11d3185920ca62cc2cd22812fae36d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112366 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112412
2021-03-17tdf#134607 use kMDItemFSName instead of _kMDItemDisplayNameWithExtensionsChristian Lohmaier
apparently the latter is not available on older versions of macOS. https://developer.apple.com/documentation/coreservices/kmditemfsname lists it as in version 10.4 and not flagged as deprecated, so keeping fingers crossed that it is not affected by user-settings or similar… Change-Id: I208d22f2abd628e7d95babc23ddb145a88bcf5cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112385 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit daa162c20f4c7d61edc217ed44cb2854652a63ec) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112528 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-03-16Revert "tdf#114076: Expand ClipRange to next PixelBound" ...Xisco Fauli
and "tdf#124272 use ClipRegion's geometry if not a rectangle" This commit reverts c1230cede19ae3633e51c7ca780cb34d9dbaa20f and 362c1cf2bd580f6dc8bf27bdcd79174111bc1b5c tdf#114076, or any of its duplicates, is not reproducible in master if c1230cede19ae3633e51c7ca780cb34d9dbaa20f ("tdf#114076: Expand ClipRange to next PixelBound") is reverted. (Tested on Linux and Windows) So, if we revert it, we no longer need 362c1cf2bd580f6dc8bf27bdcd79174111bc1b5c ("tdf#124272 use ClipRegion's geometry if not a rectangle"), which was a follow-up fix for a regression introduced by the first commit. This also fixes tdf#129085 and all the duplicates, which were introduced by the follow-up commit. I plan to add the unittests in a different commit Change-Id: Ie4328c15b24b521127c1b653bd621bfc92ac39cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112340 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112398 Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> (cherry picked from commit 8926d9282fe84793ce909471b5caec3583fd3ec9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112530 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-15tdf#141045 - fixed copy paste error in the replace functionAndreas Heinisch
Change-Id: Id68670fed89e4cc700c5eea395139914bebdb657 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112509 Tested-by: Jenkins Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de> (cherry picked from commit ac0b6fb3842201e438950ea99a55ad334f8521ab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112512 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit fde29198bd8e345c9a61a9f4d4671a3022a84cf9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112521 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-03-15tdf#127217: Fix buttons in forms not working in Adobe ReaderJulien Nabet
Regression from 76b5dca9dc0ff60f8f62cbecdee68f8f3b287ceb: author Thorsten Behrens <Thorsten.Behrens@CIB.de> 2019-04-09 02:19:14 +0200 committer Katarina Behrens <Katarina.Behrens@cib.de> 2019-07-03 14:48:45 +0200 commit 76b5dca9dc0ff60f8f62cbecdee68f8f3b287ceb (patch) tree e778dad33073a228eb61ab62ce5f38e2a26d07ca parent 1e8a9c19a6f7b82c9e0c481aee0c04c0780f4433 (diff) tdf#113448 don't export any font for radio buttons Don't let only color value in m_aDAString since it'll go here: if( !rWidget.m_aDAString.isEmpty() ) { if( !rWidget.m_aDRDict.isEmpty() ) { aLine.append( "/DR<<" ); aLine.append( rWidget.m_aDRDict ); aLine.append( ">>\n" ); } else { aLine.append( "/DR<</Font<<" ); appendBuildinFontsToDict( aLine ); aLine.append( ">>>>\n" ); } aLine.append( "/DA" ); appendLiteralStringEncrypt( rWidget.m_aDAString, rWidget.m_nObject, aLine ); aLine.append( "\n" ); if( rWidget.m_nTextStyle & DrawTextFlags::Center ) aLine.append( "/Q 1\n" ); else if( rWidget.m_nTextStyle & DrawTextFlags::Right ) aLine.append( "/Q 2\n" ); } But if we shouldn't have /DR at all since we don't want fonts for radiobutton, it also means we don't want /DA too. Indeed at the end of 12.7.3.3 https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf: The default appearance string (DA) contains any graphics state or text state operators needed to establish the graphics state parameters, such as text size and colour, for displaying the field’s variable text. Only operators that are allowed within text objects shall occur in this string (see Figure 9). At a minimum, the string shall include a Tf (text font) operator along with its two operands, font and size. The specified font value shall match a resource name in the Font entry of the default resource dictionary (referenced from the DR entry of the interactive form dictionary; see Table 218). Change-Id: Ib350495d7fc5a7a4fba88d710614a0f67a0b1553 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111724 (cherry picked from commit a0d63ee5df921e5f1ac915ada783fdef0dbbb057) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112306 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-13TipOfTheDay: remove odd tip regarding GSOCXisco Fauli
Change-Id: I4d7111de1fb734c51e6449913caa52adaf43b594 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112381 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 6cae56fe25a51c9c0ec05253be8508940a013eee) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112415 (cherry picked from commit 82273325969bfe85422ed5123d0007b5a28fa75d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112417
2021-03-11tdf#140597 DOCX import: fix missing tblPrEx borderLászló Németh
of first table cells, caused by the workaround for tdf#138612. Now property set of a new cell is a copy of the table exception property set of the table row, as needed for the import of the table style inheritance. Regression from commit f319d6b543c2367546bc80d138e56ed03731e265 (tdf#138612 DOCX import: fix lost part of split table cell). Change-Id: Iaf6637e757fbfeef7651a4300a7f65a23615f5c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112247 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 53884e8fe92597e909e4fa5599192783c3d31a56) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112225 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-11tdf#133473 Change SDRATTR_SHADOWSIZEX flag.Gülşah Köse
SDRATTR_SHADOWSIZEX holds a percentage value. So we shouldn't use METRIC_ITEM. Change-Id: I9f1a20d5871f60d2899ef7d525f4cf837b0a9088 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111311 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112241 Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112262
2021-03-10fix ScFlatBoolSegmentsImpl delayed setup with threads (tdf#140754)Luboš Luňák
Change-Id: I258263f6a15e7098a2292ba7f3336fcaaf5224ff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112184 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 2fb274950e5207ca55f4f52325fb522bd44024e1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112212 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112250
2021-03-10make RenderMaskPrimitive2DPixel() clip using clipping (tdf#140797)Luboš Luňák
The original implementation had this peculiar idea of implementing clipping using transparency, which slows everything down, because contents need to be copied and then alpha-blended. Keep that only for when edges of the clip are to be smoothed. As a side-effect this also seems to fix tdf#115843 again. The commit also adjusts the test for tdf#133477 to not rely on the rounding introduced by the optimization from tdf#115843. Change-Id: Iebae5996159cf9f17066205985c5b591abdae105 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111966 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 6b8c157a0b4f37a09fdbf656919b2df06a3abc3e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112217 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112249
2021-03-10Deduplicate some codeMike Kaganski
Change-Id: I37c492adef30db748eaa975247d386dcd953257b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100949 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/+/112248
2021-03-09tdf#140833 show ScHeaderControl help tip after double click time has expiredCaolán McNamara
so under gtk the popover isn't active when the double click is processed by gtk because under load on wayland the double click is getting handled by something else and getting sent to the the window underneath our window Change-Id: Ie3afcf45c69b7b947b1aeb787478f947deca9307 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112136 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-03-08tdf#140700 nullptr dereferenceMike Kaganski
Change-Id: I6a2ffddfd67784ddc2194dafba7d3eaeb6e4e12e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110854 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 20305894243e24eb383ab9feefebf4a0e9f2644f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112084 Tested-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-07tdf#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> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112058 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-03tdf#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> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111823 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-03-03tdf#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 (cherry picked from commit 4bf14305dfa22a3e4084b630b6924a718d7da3ce) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111702
2021-03-03generic 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> (cherry picked from commit 21305ff47a1bee1fa4787bf792fb3ecdb10d4863) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111782 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-02python3: upgrade to release 3.7.10Michael Stahl
Fixes CVE-2021-3177 plus these less important ones: CVE-2021-23336 CVE-2020-27619 CVE-2020-14422 CVE-2020-26116 CVE-2019-20907 CVE-2020-8492 CVE-2019-18348 Change-Id: I8e83395bd3e871eb2ed030a03827b7d261c96049 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111067 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-03-02update creditsChristian Lohmaier
Change-Id: I9493971d90d9bc1629b1f2a0a1259db233656284 (cherry picked from commit 6c92ca3e04c68dff68345b71a5d01c1764a5ef35)
2021-03-02Update git submodulesChristian Lohmaier
* Update translations from branch 'libreoffice-7-0' to 4ad721ccb9748150616dfc4831e7f1d6706a831f - update translations for 7.0.5 rc2 and force-fix errors using pocheck Change-Id: I1714d06878fca62790a2db7c580c1a2526842a05
2021-03-01tdf#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> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111747
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 Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111741
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/+/111696 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-26Resolves: 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/+/111455 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-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/+/111580 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-02-26tdf#134619 docxexport: don't skip font properties in NumberingLevelJustin Luth
This partially reverts LO 6.4.5 commit 598ca431de96d8bfcf18fa2945e9e30f98387474 The output set can contain more than just the font name. Things like colour and fontsize were being lost when the "else" clause was added. Since it looks like the main intent of the else clause was to avoid specifying a font name twice, erase that from the property set before writing out the rest of the font properties. There is a unit test that enforces that. (I was not able to reproduce the original problem that this was trying to fix. The entire commit is hard to revert, and I will assume that the rest of the commit is useful/accurate, so just fix up a careless portion of the commit.) Change-Id: I772e40e8bd75c0589f3308d4d7470229855aed8f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110034 Tested-by: Jenkins Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110169 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 5031a2932e9146db8b163ecfcaaf29e59cc4cc9d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110558 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-02-25tdf#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/+/111417 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Caolán McNamara <caolanm@redhat.com>
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/+/111458 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-02-24update creditsChristian Lohmaier
Change-Id: I45b6387535bd966f37fdf98579c658747d89a1e0 (cherry picked from commit fcea709798c82105c229f7f7800e2be9be540289)
2021-02-24Possible 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/+/111421 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-17bump product version to 7.0.6.0.0+Christian Lohmaier
Change-Id: I833cdcda1ef1c84f5d059f182d135fb09df85f4b
2021-02-17Update git submodulesChristian Lohmaier
* Update translations from branch 'libreoffice-7-0' to 381c3480192e9c2f6331cdf0da4424dcdd15b8a9 - update translations for 7.0.5 rc1 and force-fix errors using pocheck Change-Id: I314290cd25631469a2b47add402af55244cd4bfd
2021-02-16tdf#139511 Correct calculation of minimum row height during resize.Gülşah Köse
Change-Id: Id47b5877d56850c80395897a83daae8e24f5c099 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110662 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110924
2021-02-16tdf#140207 Qt downscale the ExtTextInputPosJan-Marek Glogowski
Qt reports the unscaled pixel values to the IM, so simply divide all values reported by SalEvent::ExtTextInputPos by the window's scale factor. This correctly positions the IM window on a scaled LO window. Change-Id: Ia639ee3e5fc0e47f7017896b34730bbda7f06a16 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110945 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 41cffc379259fec626a282ca243a9750d96d1c63) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110915 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 61bf6b4d90aa1d37009b397e44fe39c9c5b06afd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110920 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-02-16Improve checkExtensionStephan Bergmann
Change-Id: Iff416a9c5930ad5903f7ee51a2abbc94d5f40800 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110970 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins (cherry picked from commit f456c4dacf700e064e112ef068ff7edb04239754) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110922 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-02-16tdf#137406 removed Apply to Master button in Slide Master modeGokce Kuler
Change-Id: Ic19c38a5e6e561cae45cd0a40cfe56d7002efe9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110835 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> (cherry picked from commit 9887674044e17c4925caa07f197d74233be810d2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110870 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110941 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-13tdf#140239 leave current cursor valid if the contents won't changeCaolán McNamara
Change-Id: I854e8e94c7415d9046088e364f966390c4fb762f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110772 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-02-12always optimize bitmap transform to translate+scale if possible (tdf#138068)Luboš Luňák
Commit 828504974d70111e make OutputDevice::DrawTransformedBitmapEx() always call DrawTransformBitmapExDirect() in preference to explicitly converting to DrawBitmapEx() if the transformation wanted was at most translate+scale, in the hopes that these days the backend implementations work well enough. But it turns out only the Skia backend handles that without loss of performance. So always do the conversion to DrawBitmapEx() if possible. It's so simple that it possibly makes sense to always do this, regardless of the backend. Change-Id: I6eba68e672334c38433f53980f49400499f5d8e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110716 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 9d89d98d3349502b56da4bdd6ea287ac4cde9ce5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110781 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-02-11tdf#140006 don't limit dropdown width to 300pixelsCaolán McNamara
let it use the full width of the cell. Keep that 300 pixel limit if we are expanding the widget width beyond its size request. Change-Id: Ifeaa9ee60e0d5649de71c960ae83270fb1afb2e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110683 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>