summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-11tdf#140865 roundtrip pptx wordart 3D, add sp3dRegina Henschel
Change-Id: I446ae4e8c9dd5f2fbf3efe289681339f967c515a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112185 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> (cherry picked from commit dbbb8cafcb801638bde3b21796eaebfc807acbdc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112229 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-10bump product version to 7.1.3.0.0+Christian Lohmaier
Change-Id: I5aea53cd7428ea7751076ffcda38270fda4f0767
2021-03-10Update git submodulesChristian Lohmaier
* Update translations from branch 'libreoffice-7-1' to 3cc01e19df4c04f4f48376925d5d145530d57b4b - update translations for 7.1.2 rc1 and force-fix errors using pocheck Change-Id: Iadb5e48222cc660cd2dc8852006c249a00435c15
2021-03-10Adapt buck build to jars merged into libreoffice.jarRene Engelhard
Since ae855bf48163ff64d94cfc34aff8e37abdb5518d and 35518c92365cc183ba6cce2a4d284a130c0ca13f the ridl,jurt und unoil jars were merged into libreoffice.jar. Adapt the buck build correspondingly. Preserve the publishing of merged jars for now with dummy content and consider to remove them in future releases. Test Plan: 1. To replace version number with upcoming release version: $ solenv/bin/version.py 7.1.0 2. To install the API to local Maven repository: $ VERBOSE=1 buck build api_install 3. To deploy the API to Maven Central: $ VERBOSE=1 buck build api_deploy Change-Id: Id1b2135682ab962c901b944f3c26aeead9a4b19b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93724 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit ea8d6cd59670854cb153c4e984cb4044093e5994)
2021-03-10Fix an OUString constructionStephan Bergmann
...introduced with 9d161857f1d4afcb772b477455797a2da0e47a9b "tdf#127471 correct EMF/WMF im/export for scaled font" Change-Id: I2b807e102ca7f71a61794f511dee302c7e509026 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111095 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit e0f2256b90fb30a5a7858f93c168d9da12061e70) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112221 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-10tdf#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/+/112223 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-10tdf#140674 sw change tracking: fix :emoji: replacementLászló Németh
Regression from commit 2951c96bcb673a260a09e2c6eb92ca0f99bf0c18 (tdf#83419 sw change tracking: clean-up autocorrect). Note: only :snowman: -> ☃ was added to the test autocorrect file acor_en-GB.dat. Change-Id: Ic3013e969ab937a5f9e5b6d1a6fac2f533b541f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112166 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit db999ddee7a890390f66d7e34906066c8bf178da) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112218 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-10tdf#140498 middle-button paste doesn't depend on a vcl::WindowCaolán McNamara
Change-Id: I4f1f14994b35cec51761689875bf6b5135612f3c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112085 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-10tdf#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
2021-03-10tdf#127471 correct EMF/WMF im/export for scaled fontArmin Le Grand (Allotropia)
If FontScaling is used, system-dependent data is held at vcl::Font Width(). Already if not scaled, we have three definitions: Width is zero, Width is equal to Height (unx) or - on Windows - Width equals avgFontWidth. If used it is W!=H where on unx Width equals Height multiplied with the scale factor. On Windows, this is Width multiplied with the only there existing avgFontWidth. Unfortunately that is ex/imported (since ever) undetected to EMF/WMF thus making EMF/WMF files containing FontScaling system-dependent - on which system was LO running when creating the file? The error can be seen when loading such a EMF/WMF on the vice-versa system, the FontScale is very ugly and wrong. Since EMF/WMF *are* Windows-specific formats the Windows-like definition is the correct one. This change makes all other systems export that now, and adapt on import to their system- specific definition (assuming coming from Windows). As can be seen, the difficulty is that these adaptions are necessary on non-Windows plattforms, but these do not have that avgFontWidth available. Thus I made a deep-dive investigation and multiple experiments to create a as similar as possible value to apply the needed calculations. For details and discussion refer to the bug description. Change-Id: I983fb6d882e2e8fccf9c8460f01509201d8157f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111000 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112089
2021-03-10Reset ShapeProperty priority and handle only crop case.Gülşah Köse
With 2c96bd26ec488d865370fe9d394e7c4e228e05ab we changed the ShapeProperty priority uncessarily. Reset the priority as use FillBitmapName if supported. BlipFillProperties::moFillRect negative GraphicCrop values means stretched. BlipFillProperties::moClipRect positive GraphicCrop values means stretched. We add a control to handle only stretched cases. Change-Id: I2eb1233d0477acf093ada36b4cc29ff34f767037 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111479 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/+/112242
2021-03-10Prevent the unnecessary lclCropGraphic call.Gülşah Köse
In case text::GraphicCrop aGraphCrop( 0, 0, 0, 0 ) we don't need to call lclCropGraphic. Change-Id: I9960900f9b5c5b770824c76ffeb9ec9b51cbaef3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111401 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/+/112240
2021-03-09fix 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>
2021-03-09tdf#140661 Give shapes names when ungrouping if they don't already haveJim Raykowski
Change-Id: I8242a697980e4f661a914998792ae9efdb090915 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111725 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit 1c3e170d56d3cad1e7729f839fa63f607b62e4e3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112215 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-09make 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>
2021-03-09Improve unit test accuracyMike Kaganski
I didn't take clock resolution into account when created the test, and it failed for me occasionally because the value was slightly less than expected. The typical system tick resolution is documented at https://docs.microsoft.com/en-us/windows-hardware/drivers/kernel/high-resolution-timers Change-Id: Ie48b10d15b14f9ac7d292a2cc9916bcbfff44b6f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111946 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit eef43192d4c7b2867638c54a2ac31adfc26476c7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112076 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-09make both 'empty' widget and its treeview replacement the same sizeCaolán McNamara
so on flipping one visible vs the other the panel scrollbar position is equally valid for each mode Change-Id: Iae422c30eb8b752c407070b66852fe23fdc38912 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111925 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-09allow focus into master page panelCaolán McNamara
Change-Id: I34ab8ad6d267ffaab8ead2581e0d892ee37ec095 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111921 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-09master slide panel shouldn't have "more options" buttonCaolán McNamara
default the toolbox to hidden and show it if "more options" is enabled Change-Id: I6ff867268809d949e7854e0e76d3e45c8806797b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111955 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-09tdf#116983 tdf#136175: retry if failedMike Kaganski
Debugging the test case from the latter bug report shows that indeed the call to OleGetClipboard may fail first time, as jasonkres had suspected in the former bug. So follow the suggestion in tdf#116983, and retry the failing calls several times in case of failure. Many thanks to Telesto for preparing a clear bug report with reliable test case. Co-authored-by: jasonkres Change-Id: Ib3c497da830bc5faac586bcfe1eededa54bfa117 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111825 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit cf1c835e8016f8f1eefea6d625a913c0ac343a63) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112075 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-09tdf#127471 improve SVM FontScaling im/exportArmin Le Grand (Allotropia)
Due to svg::Font Width and it's expression of FontScaling being system-dependent the FontScaling when exchanging beween win-based SVM creators and others was creating errors. Corrected this to work now with newly created SVM files in both directions. For more aspects see discussion in task. Change-Id: I326e4e7e895a9dfc3cdfc5323174ca81e22795e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110330 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> (cherry picked from commit 40b56cd8da8c38582dc4660b486993d1b4711535) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112088
2021-03-09tdf#138314 Change selected tab text color on macOS Big SurThorsten Wagner
Change text color of selected tabs starting with macOS 10.16 (not with macOS 11.0) to ensure compatibilty with macOS SDKs prior to 11 used within LibreOffice build process Backport of d8fc89cdfd0043838c4bc2d3b5a50bf5abfc6738 to LibreOffice 7.1 Change-Id: Ib2b7042878596271c194331eaab1915d11124210 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112105 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-03-08tdf#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/+/112135 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/+/112083 Tested-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-08tdf#138122 Detect window scaling for multi display configurations on macOSThorsten Wagner
(1) Activate window scaling when at least one retina display is connected (2) Remove environment variable VCL_MACOS_FORCE_WINDOW_SCALING (3) Disable related unit tests unless bitmap scaling has been implemented Backport of 0c36f364b14aacd0eeb53087ae2fce54402dc741 and 06d918dcc47ae3f1c511cbdccfeacc8adb123f28 for LibreOffice 7.1 Change-Id: I20b075bf4e2927d62a04cd935e4496721b4c695d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112106 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-03-07tdf#139928 XLSX import: fix conditional formatting in same cell rangeTibor Nagy
Multiple conditional formatting rules of the same cell range were imported incorrectly because of missing handling of their (different) priorities and operators. Note: older unit tests were modified according to the fixed priorities. Co-authored-by: Attila Szűcs (NISZ) Change-Id: I4b542b310642e1a85ef6281d0025b3ef2b2ba8c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110544 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit a5513cb45d90e0a1bfa0dfe39c0f090f1cda45de) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111923 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-03-07elementary: tdf#140838 new Undo & Redo iconsRizal Muttaqin
Change-Id: Id1fae6168de9c431c54b6b6c985a5cd3a6082531 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112056 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <rizmut@libreoffice.org> (cherry picked from commit d64ce9f3b239e87622dd5bf313476b503df730af) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112073
2021-03-07elementary: related to tdf#140838 new Undo & Redo iconsRizal Muttaqin
Change-Id: Ifc24f15cb876ce5676ff288a87b39b9a632dbcd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112057 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <rizmut@libreoffice.org> (cherry picked from commit 9eeb580f5c57918484baff74ca052a96ed1056b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112074
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