summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bump product version to 7.0.4.2.0+libreoffice-7-0-4Christian Lohmaier2020-12-091-1/+1
| | | | Change-Id: I27007219e3ace964b03941df17e805988d9bc9c3
* Resolves: tdf#136272 convert DBL_MAX to 1.7976931348623157e+308Eike Rathke2020-12-091-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a combination of 4 commits. Resolves: tdf#136272 convert DBL_MAX to 1.7976931348623157e+308 ... and the 4 subsequent nextafters to appropriate strings. An interim workaround to not write the out-of-range string 1.79769313486232e+308 until we have a proper rounding. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106717 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 4713c19e2b79341dc27e66d4c6449497db1e73d8) Consistently use RTL_CONSTASCII_LENGTH(), tdf#136272 follow-up The mix with SAL_N_ELEMENTS() was confusing and even wrong in one case. Ife73342b0efc01ed4e76e217d372fc32500c9b2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106764 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 1a0f9a9c56e7b7952b813b3efd34f9be6c853957) Fix comment I2ae6e3cadc0f182c4798e5d33b0c7f07fbcbbff6 (cherry picked from commit b8404ae521a9c2d183d4e076a7884627ba353e4b) Typo in rounded digit string, tdf#138360 follow-up Ic436d3e9f0c93cb36c5e4377519f2aeb6b7fbd5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107034 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit d8e0b1c81ffa16be8aae2231bcd3c02e8c01cf88) Change-Id: I5f98a7f0a8e0421fd024a8cc37cc6f3a198d02d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106687 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* tdf#134754: Gracefully handle EINVAL from mmap MAP_JIT on old macOSStephan Bergmann2020-12-081-1/+17
| | | | | | | | | | | | | | | (cherry picked from commit 6cab5c9170dc167838f1aebafc47153cd84713b4, with cca1240fe5884f184af489f5326e96892d1ae975 "Related tdf#134754: Detect failed mmap on macOS" folded in) Change-Id: Idfb148fad55c7c6b6e6f4f4b5316fd3b086f7d2e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107365 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107378 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* Related: tdf#136272 accept 1.79769313486232e+308 as DBL_MAXEike Rathke2020-12-081-1/+20
| | | | | | | | | | | | | | | | | | | | | | This does not solve writing the badly rounded value, which still has to be fixed, but at least be able to read/convert it back as double max value. This is not even used in the bug scenario because the "fake" condition in that number format is discarded anyway because it was only written to satisfy ODF, but it helps in case a 1.7976931348623157e+308 value was entered/used on purpose. Change-Id: I413dd93d5a3c4df609fd42a3133d6d82c34afff0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106586 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit ee2cc952eeb5385ee37485c822d7ad7abd8fb989) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106613 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* tdf#138612 DOCX import: fix lost part of split table cellLászló Németh2020-12-083-3/+17
| | | | | | | | | | | | | | | | | | | | | | by removing unnecessary rewriting of cell properties during import of w:tblPrEx. Regression from commit da8ea444b004a0be36964ae9a778f73e752b2673 (tdf#133455 DOCX import: fix table border regression) Change-Id: I93ce36991437644db439c8cf02e1a8503fbdfba7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107239 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit f319d6b543c2367546bc80d138e56ed03731e265) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107304 (cherry picked from commit 2c4806d6b8d79c1b95a41b72d295888bca01d5d8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107305 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 17419824db9174d45dc41ed731aa227ede6f72c4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107306 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* update creditsChristian Lohmaier2020-12-081-2194/+2376
| | | | | | Change-Id: I79a8fa1548ef4651fae87ab98dd7de26af099bcf (cherry picked from commit 1ce76cb05311e7766d16d4da168c57d3516cd792) (cherry picked from commit 19b33f29f8ea80d5ba69a0d23ee150547ec5c771)
* Update git submodulesChristian Lohmaier2020-12-081-0/+0
| | | | | | | | | | | * Update translations from branch 'libreoffice-7-0-4' to 34a00a3a01edd34d19a60956fd680399c5974aa0 - update translations for 7.0.4 rc2 and force-fix errors using pocheck Change-Id: Id740fa248a5b76d46e2ed5cee2d0a85033d19b0d (cherry picked from commit 3f1b6e2d81992864173e6b58615be8c0434b4ad7)
* tdf#135479: Seems we need the more broad entitlement for Java's sakeTor Lillqvist2020-12-021-1/+1
| | | | | | | | | | | | | | | Sad, but OK. This reverts part of 2c366aae9263dc4115b054fe74b90cabea61fa0b. Change-Id: I6b74c871e3ec2408f833a5e2b652fd19cb7a2c0e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103230 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 247a5304475b9a045a08cbb5e74aec4b99127511) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107023 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* Resolves: tdf#138549 use GetSpecialTextBoxShadow to identify ScPostItCaolán McNamara2020-12-012-15/+7
| | | | | | | | | | | instead of a 'special' name which causes undo-related causes side effects Change-Id: Id36b0b5360ddde3469721a7c837fe3942af08209 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106938 Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#138130, tdf#123621 sw: fix textbox position according to DOCXTibor Nagy2020-12-014-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i.e. when spAutoFit is present in DOCX, and size of the textbox is relative. See also commit cab956c480eb4f619580285c7b9a15b9e6d9b780 (tdf#112312 DOCX legacy shape export: keep fixed size). Co-authored-by: Attila Szűcs (NISZ) Change-Id: I29af97001954ad353a386164b68cd22f6230e3e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98401 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> This commit also includes: Clean-up of commit I29af97001954ad353a386164b68cd22f6230e3e5 Change-Id: I1963a5d899da2d122e60c4d87ca32aba4fb1f32a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102449 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/+/106589 (cherry picked from commit 92f1c430e4e77e71e7c914ad567d4970e5b2cd95) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106672 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* tdf#137745: crash, when deleting tables and changed relationship isn't changedJulien Nabet2020-12-011-0/+5
| | | | | | | | | | | | | | | | | | | | bt here: https://bugs.documentfoundation.org/attachment.cgi?id=166782 some explanations here: https://bugs.documentfoundation.org/show_bug.cgi?id=137745#c8 Change-Id: I1d9dc8d2e3ad7e3e36c4687cb9b2c5990f2d2c8d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106715 (cherry picked from commit 4335810b00abb9b00a9d81caa5ffe09a3ea927fd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106743 Reviewed-by: Lionel Mamane <lionel@mamane.lu> Tested-by: Jenkins (cherry picked from commit d9c84029c18ea0964705ed8c56e40784a1c556df) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106819 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* Adapt solenv/flatpak-manifest.in to312a33b7636334f6ce3b6d1702bc5d3e45215601Stephan Bergmann2020-12-011-3/+3
| | | | | | | | | | | | | ..."Update language-subtag-registry to 2020-09-29" Change-Id: Idea4df8f6a920cbceb37d5156417f6979d7a4fff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106718 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 25bb4c31a68acd4526176580be72a9d4d626d013) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106732 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#138466 Crash when creating different scenariosNoel Grandin2020-11-291-2/+3
| | | | | | | | | | | | | | | | | | | | | | apparently this is a regression from commit 4176beb7ef831152ce92ac3fa31314438635ec2c Author: Noel Grandin <noelgrandin@gmail.com> Date: Sat Sep 12 18:21:44 2020 +0200 tdf#133327 fix calc loading background color with many cols but I have no idea how or why, so just fix the crash. Change-Id: Ia2f056fc53527338c431d3b34bb64e6eedc8e955 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106799 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 52aebe6986bcec07071adb3f94d6c09fea147044) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106748 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 7f2828aa84f87c85c92969a9b0eace4df75870df) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106811 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
* bump product version to 7.0.4.1.0+Christian Lohmaier2020-11-251-1/+1
| | | | Change-Id: I5f0c286217a18866295e043fb51ea632a9cd8805
* Branch libreoffice-7-0-4Christian Lohmaier2020-11-254-1/+1
| | | | | | | | | | This is 'libreoffice-7-0-4' - the stable branch for the 7.0.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.0.x release, please use the 'libreoffice-7-0' branch. If you want to build something cool, unstable, and risky, use master.
* crashtesting: make tdf129410-1.ods not crash on loadCaolán McNamara2020-11-251-1/+2
| | | | | | | | | | | | | | | Give its multiple anonymous ChartListeners unique names Maybe ScMyOLEFixer::FixupOLEs should instead skip calling CreateChartListener if getPropertyValue(sPersistName) >>= sName succeeded but has an empty sName result. Change-Id: I0741694ee692aaa22e0441a5e09748eb67e8dbf4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106066 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106363 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* tdf#138430 toolbar bullet dropdown should have a scrolledwindowCaolán McNamara2020-11-254-12/+18
| | | | | | | | | as should the matching dialog pages Change-Id: Ib327d3c02d1bc5ae11a6a76d52c9e17803f05534 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106436 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* Better handling of Java filesStephan Bergmann2020-11-252-1/+6
| | | | | | | | | | Change-Id: Ifa662be39ac7d35241ee31956e2556b7ba3b5a02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106558 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 696739056f37430154d6333b8f7228d1c44d09b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106520 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
* tdf#137662 set focus in combo/list box on clickCaolán McNamara2020-11-251-0/+14
| | | | | | | | | | | | | | backport the part of commit d2f1cd004310b9ea6654d17fddc11cb08e884c90 Date: Fri Jun 26 20:57:29 2020 +0100 that sets the correct focus on click Change-Id: Ia053925f5e541642720892dfe2edc27995e84a61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106414 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* Update git submodulesChristian Lohmaier2020-11-251-0/+0
| | | | | | | | | | * Update translations from branch 'libreoffice-7-0' to 60c5bafea5acf84c0147812a50516136a4225d88 - update translations for 7.0.4 rc1 and force-fix errors using pocheck Change-Id: I14fb846e0ef6fbb92b944a25f9470530c172910f
* tdf#138253 sw textbox: fix content of draw format on undoMiklos Vajna2020-11-253-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | Regression from commit da4f9b77a6cd39b1ae5babdd476d1575c8b9371c (tdf#135149 sw: fix deleting textbox of as-char shapes, 2020-09-07), the crash was caused by a user-after-free triggered from the X11 clipboard code. This could happen beause the clipboard document had a draw frame format, which has an SwNode pointer, but the SwNode instance was outside that clipboard document, and the owning document is already gone. So by the time the clipboard document would be deleted, the SwNodeIndex can't de-register itself. The root cause was that the doc model was corrupted after a cut of a textbox + undo: the textbox pointers of the fly/draw formats were OK, but not the SwFormatContent of the draw format. (cherry picked from commit 42e8e16cf93dcf944e5c1106f76aaa32057c0397) Conflicts: sw/source/core/layout/atrfrm.cxx Change-Id: I5761b72948caca397320aed801559e8493c33e1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106539 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#131970 enable tab-cycling between VerticalTabControl membersCaolán McNamara2020-11-251-0/+2
| | | | | | | | | Related: tdf#131970 icon-switcher should be in single-selection mode Change-Id: I7d009c2345cc7b3a3c692bb8734d9939ce465db2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105764 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
* fix unit-test with non-pdfium buildNoel Grandin2020-11-241-1/+4
| | | | | | | | | | | | | otherwise testSwappingPageNumber will crash accessing out of bounds element in vector. Change-Id: I07499e79d523931e1f3cc02a5150f033e1ea9578 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101094 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 17798a503bc67f2a38f4b558e37447d1ea8f4623) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106511 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* CVE-2020-25713 raptor2: malformed input file can lead to a segfaultCaolán McNamara2020-11-242-0/+34
| | | | | | | | | | | | | | | due to an out of bounds array access in raptor_xml_writer_start_element_common use a better fix than the initial suggestion See: https: //bugs.mageia.org/show_bug.cgi?id=27605 https: //www.openwall.com/lists/oss-security/2020/11/13/1 Change-Id: Ida4783a61412ffce868eacf81310da338d3e2df1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106249 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
* tdf#137662 ignore focus in dropdown if dropdown is hiddenCaolán McNamara2020-11-241-3/+11
| | | | | | | Change-Id: I0263fb832f31c6926ac63cab79ce8fd0b9548581 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106245 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* Resolves: rhbz#1900428 don't crash on invalid index used in StarBasic macroCaolán McNamara2020-11-241-3/+8
| | | | | | | Change-Id: I05064f7e9216c9c43b49950b309afe72466857a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106242 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* Make python3 build on macOS 11, including for arm64Tor Lillqvist2020-11-242-0/+60
| | | | | | | | | A combination of what is two separate commits in master. Change-Id: I92ac0c500388730eca0be4766f07b1af2d2808e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106471 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Make bridgetest exercise parameter passing in the C++/UNO bridge harderTor Lillqvist2020-11-245-13/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C++/UNO bridge for macOS on arm64 currently uses the Linux code. Apple's ABI uses slightly different parameter passing on the stack, though. See https://developer.apple.com/documentation/xcode/writing_arm64_code_for_apple_platforms?language=objc That has not been taken into account yet in the bridge code. The bridgetest, when run on macOS on arm64, didn't notice, sadly, but succeeded. With this change it crashes, as one would expect it to do. Add one more byte and short parameter to the setValues(), setValues2() and getValues() calls in the XBridgeTestBase interface. The stack allocation for those [in] parameters to setValues() differ between the Linux and Apple ABIs. Add corresponding attributes to the interface, and members to the SimpleTest struct. The changes to the source files in the cli subdirectory (C++/CLI, VB.NET, and C#) are done blindly as they aren't compiled even on Windows currently. Most likely the changes to them are incomplete and erroneous. Change-Id: I6f689a130d89b23cad9918829107d7da49a79c55 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105770 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105888 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106470 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Cosmetic change to make it easier to see which parameter is the nthTor Lillqvist2020-11-244-108/+277
| | | | | | | | | | | | | | | | | | Consequently put each parameter/argument on a separate line for the get/setValues methods. Will make it easier to add more parameters of such types and at such positions that they catch errors in the C++/UNO bridge on more platforms (specifically, the one for macOS on Apple Silicon). Change-Id: I68578d0401358317f3baf913ef4d53009c8f5f2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105633 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105887 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106469 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Make --without-webdav work even with --enable-mpl-subsetTor Lillqvist2020-11-241-1/+3
| | | | | | | | | Change-Id: I319e0b3aefa721f2503494783af6d73470f592a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105271 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106468 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Fix nss build for x86_64 on an Apple Silicon MacTor Lillqvist2020-11-241-0/+3
| | | | | | | | | | Change-Id: I337f2a8e777394e586f659fadd819cf7dfc0a332 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104546 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106467 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* The config.{guess,sub} in $SRCDIR is good for external projects, tooTor Lillqvist2020-11-243-3313/+1
| | | | | | | | | | | No need for the older second copies in solenv/gbuild. Change-Id: I088f7d06b0727d1b336e3ba314b5c874d8ce3776 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103027 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106466 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Make the C++/UNO bridge work on macOS on arm64Tor Lillqvist2020-11-249-13/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same code as for Linux on aarch64, with minor additional hacks. (There are slight differences in the ABI. See https://developer.apple.com/library/archive/documentation/Xcode/Conceptual/iPhoneOSABIReference/Articles/ARM64FunctionCallingConventions.html The run-time code generation requires use of a new API on macOS to work: See the use of pthread_jit_write_protect_np() in bridges/source/cpp_uno/shared/vtablefactory.cxx. Unlike the arm64 ABI used on Linux, on macOS (and iOS, but we don't really use the C++/UNO bridge for iOS) we need to pack parameters smaller than eight bytes according to their natural alignment. Bytes take one byte, shorts two bytes aligned at a two-byte boundary, etc. For some reason, when compiling for arm64-apple-macos, the symbols for the type_infos for the UNO exception types (_ZTIN3com3sun4star3uno16RuntimeExceptionE etc) end up as "weak private external" in the object file, as displayed by "nm -f darwin". We try to look them up with dlsym(), but that then fails. So use a gross hack: Introduce separate real variables that point to these typeinfos, and look up and dereference them instead. If this hack ends up needing to be permanent, instead of having a manually edited set of such pointer variables, we should teach codemaker to generate corresponding functions, and look up and invoke them to get the std::type_info pointer. When compiling for x86_64-apple-macos, the type_info symbols end up as "weak external" which is fine. (This is a combination of what was two patches in master.) Change-Id: I05f46a122a51ade1ac7dccd57cb90e594547740e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106465 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Use <alloca.h> for macOS and iOS, tooTor Lillqvist2020-11-241-15/+1
| | | | | | | | | Change-Id: I20f349cc03fe28536470c19f2559cc5414b823fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100284 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106464 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Update config.{guess,sub} with latest versions and handle fallout of thatTor Lillqvist2020-11-247-334/+432
| | | | | | | | | | | | | | | | | | From http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD . This time, do not apply the add-on change from 25a09c8776cc6088a5b2bf13dc84eb386c26bb7e to config.sub, but keep it pristine. Instead, let's start using the name "aarch64" instead of "arm64" for macOS and iOS in the autofoo context, as that is what those tools call it. Clang and Apple call it arm64, though. Change-Id: I1e05866c5fb08e0800cdfeaf7f6a71bfb43d1777 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100272 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106463 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Replace brittle gcc3_linux_aarch64 vtableSlotCall with pure assembler codeStephan Bergmann2020-11-243-65/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * For one, as discussed in the comment at <https://gerrit.libreoffice.org/c/ core/+/91978/2#message-97da6c6ece7ae7bd49e9eb4843be333192fcc057> "Port to FreeBSD aarch64": "So it looks like Clang does not treat those register asm as we expect it would, at least on aarch64. "Witness a local Linux recent master --with-distro=LibreOfficeAndroidAarch64 [i.e., using Clang] build's > $ llvm-objdump --disassemble instdir/program/libgcc3_uno.a [...] > 0000000000000000 <vtableSlotCall>: > 0: ff 43 03 d1 sub sp, sp, #208 > 4: f4 4f 0b a9 stp x20, x19, [sp, #176] > 8: fd 7b 0c a9 stp x29, x30, [sp, #192] > c: fd 03 03 91 add x29, sp, #192 > 10: a8 43 00 91 add x8, x29, #16 > 14: bf 83 1d f8 stur xzr, [x29, #-40] > 18: e0 07 04 a9 stp x0, x1, [sp, #64] > 1c: e2 0f 05 a9 stp x2, x3, [sp, #80] > 20: e4 17 06 a9 stp x4, x5, [sp, #96] > 24: e6 1f 07 a9 stp x6, x7, [sp, #112] > 28: e0 07 00 6d stp d0, d1, [sp] > 2c: e2 0f 01 6d stp d2, d3, [sp, #16] > 30: e4 17 02 6d stp d4, d5, [sp, #32] > 34: e6 1f 03 6d stp d6, d7, [sp, #48] > 38: a8 03 1c f8 stur x8, [x29, #-64] > 3c: a0 43 5e b8 ldur w0, [x29, #-28] > 40: a1 03 5e b8 ldur w1, [x29, #-32] > 44: a5 83 5e f8 ldur x5, [x29, #-24] > 48: e4 03 08 aa mov x4, x8 > 4c: e2 03 01 91 add x2, sp, #64 > 50: e3 03 00 91 mov x3, sp > 54: f3 03 01 91 add x19, sp, #64 > 58: f4 03 00 91 mov x20, sp > 5c: 00 00 00 94 bl 0x5c <vtableSlotCall+0x5c> > 60: 60 06 40 a9 ldp x0, x1, [x19] > 64: 80 06 40 6d ldp d0, d1, [x20] > 68: 82 0e 41 6d ldp d2, d3, [x20, #16] > 6c: fd 7b 4c a9 ldp x29, x30, [sp, #192] > 70: f4 4f 4b a9 ldp x20, x19, [sp, #176] > 74: ff 43 03 91 add sp, sp, #208 > 78: c0 03 5f d6 ret [...] vs. [this commit's vtableslotcall.s; see below for details]. "And also latest Clang 12 trunk still does e.g. > $ cat test.c > void f(long); > void g() { > register long volatile a asm ("x8"); > f(a); > } > $ clang --target=unknown-linux-aarch64 -S -O2 test.c > $ cat test.s > .text > .file "test.c" > .globl g // -- Begin function g > .p2align 2 > .type g,@function > g: // @g > // %bb.0: // %entry > sub sp, sp, #16 // =16 > ldr x0, [sp, #8] > add sp, sp, #16 // =16 > b f > .Lfunc_end0: > .size g, .Lfunc_end0-g > // -- End function > .ident "clang version 12.0.0 (git@github.com:llvm/llvm-project eb31ddd71eb44d53ebe12a09c9587198bb6f2a2e)" > .section ".note.GNU-stack","",@progbits > .addrsig "(This is probably also the underlying issue that eb15ac837e06087fb8148330e9171d6697d89ee6 'android: Avoid throwing exceptions through the bridges' tries to hack arond.)" * For another, this also gets rid of the dddb527db1562f30a2a2b20338dfc8458086a4a9 "Again, no -fstack-protector-strong for gcc3_linux_aarch64/cpp2uno.cxx" hack. The contents of the new vtableslotcall.s is effectively the GCC 10 -S output of the old vtableSlotCall C++ function from cpp2uno.cxx. (And as cpp2uno.cxx only takes the address of vtableSlotCall, never calls it directly, it does not matter that it declares it with an imprecise extern "C" void vtableSlotCall(); signature.) Change-Id: Icfbf0622a47825ff7cf21008de27d3da6a2f0ebd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99660 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106460 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Avoid warning about deprecation in macOS 11.0Tor Lillqvist2020-11-241-0/+3
| | | | | | | | | Change-Id: Ie1a7e19093b439eb133632ee881e1e3dbe58132d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98176 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106459 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Avoid unused parameter warning in the !HAVE_FEATURE_PDFIUM caseTor Lillqvist2020-11-241-0/+1
| | | | | | | | | | Change-Id: I218265f0bda7cdfcae523ea386edaec1a9143cef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106283 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106458 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Avoid unused parameter 'pImpl'Tor Lillqvist2020-11-241-4/+6
| | | | | | | | | | | | Change-Id: I8dd30ed3ffffa0e5340b32ce4399dd05cc57e2b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105962 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106258 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106457 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* There is no QuickTime frameworkTor Lillqvist2020-11-241-1/+0
| | | | | | | | | | | The reference was a leftover from 32-bit times. Change-Id: Ie453a4c644787a49f8742eab4b4ea9d49cddf32d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98175 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106456 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Colibre: tdf#138350 fix wrong color from monoline color to these HEXRizal Muttaqin2020-11-2432-16/+16
| | | | | | | | | | | | | | | | color values: - black : 000000 - magenta : ff00ff - green: 00ff00 In order to obey color replacement function Change-Id: I575709a84b83e7bf61f089477d5edd8810f880ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106391 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> (cherry picked from commit 6c5fa6b299b1736bd37c7f0d901418b4a9401df0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106438
* avoid Skia floating point position fixups for rectangles (tdf#137329)Luboš Luňák2020-11-231-16/+36
| | | | | | | | | | | | | | Avoid to toSkX()/toSkY() tweaks for rectangular areas, so with AA enabled it leads to fuzzy edges, and rectangles should line up perfectly with all pixels even without tweaks. Change-Id: I45bf5a57a9f2d941eb7ec224992fc452481a2f98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106060 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 5b292e878703ebc32e875406f4116cba145a9042) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106434 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#138428 don't record SetName("ScPostIt") in undoCaolán McNamara2020-11-231-0/+8
| | | | | | | Change-Id: Iae87db47907078282e48035ad7892dbf52942e53 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106432 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* tdf#135202: Mysql declare more plugins for native passwordJulien Nabet2020-11-231-0/+3
| | | | | | | | | | | | Add pvio_npipe + pvio_shmem + dialog Change-Id: I48d828e5cdf8d269aef3a40d75235a9519af8dc1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105804 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 51a7985f539b7760c22b19521ed2bf5c2df4b1c1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106235 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Initial attempt at macOS on arm64 support for OpenSSLTor Lillqvist2020-11-233-0/+15
| | | | | | | | | | | | | | | | | | Sadly the existing arm64 assembler files in OpenSSL use a syntax that Apple's clang doesn't accept. And yeah, ideally we should not use either NSS or OpenSSL on macOS, but native APIs for the functionality in question. Trying to make everything look like Linux is a bone-headed approach. Change-Id: Ib3f137ac73329b92e82c654d1277ee21f5f81b37 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98095 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105871 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106371 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* More WIP work for macOS on Apple SiliconTor Lillqvist2020-11-232-36/+5
| | | | | | | | | | | | | | If cross-compiling to a DESKTOP platform, use RepositoryModule_host.mk on the build platform, too. Change-Id: Icd3f3081e5af0c7cda95e9bce7572d37567d4f6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97356 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105869 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106369 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* For macOS on arm64, be sure to use HOST_PLATFORM=arm64-apple-darwinTor Lillqvist2020-11-231-0/+5
| | | | | | | | | | | | | (That is for external projects.) Change-Id: I709ff37ebca304f862ff94bdb1c6e6035f5cda77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97981 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105870 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106370 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Fix apr build with current Xcode: Include <stdlib.h> for exit()Tor Lillqvist2020-11-232-0/+27
| | | | | | | | | | | | | (Or whatever it is that had broken it.) Change-Id: I72bc42e618f011518c05a2cdb875cfe64515b4d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105269 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106042 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106372 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Clean up arm64 confusion a bitTor Lillqvist2020-11-231-2/+1
| | | | | | | | | | Set nss's CPU_ARCH to aarch64 also when compiling to arm64 on arm64, without any cross-compiling involved. Change-Id: I2eb9fb7b9547e5ded75ca242ea7ef09c826bf561 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106377 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Use USE_DLFCN also on macOS on arm64Tor Lillqvist2020-11-231-0/+14
| | | | | | | | | Change-Id: I8975ea2d4f33a101b5ac6db247a6dd062bc0c410 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100273 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106376 Reviewed-by: Caolán McNamara <caolanm@redhat.com>