summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-11-25Version 7.0.4.1, tag libreoffice-7.0.4.1libreoffice-7.0.4.1Christian Lohmaier3-0/+0
2020-11-25bump product version to 7.0.4.1Christian Lohmaier1-1/+1
Change-Id: Ied9df89b98c9a27fcee4c32f0b578af4a30227a3
2020-11-25Branch libreoffice-7-0-4Christian Lohmaier4-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.
2020-11-25crashtesting: make tdf129410-1.ods not crash on loadCaolán McNamara1-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>
2020-11-25tdf#138430 toolbar bullet dropdown should have a scrolledwindowCaolán McNamara4-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>
2020-11-25Better handling of Java filesStephan Bergmann2-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>
2020-11-25tdf#137662 set focus in combo/list box on clickCaolán McNamara1-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>
2020-11-25Update git submodulesChristian Lohmaier1-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
2020-11-25tdf#138253 sw textbox: fix content of draw format on undoMiklos Vajna3-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>
2020-11-25tdf#131970 enable tab-cycling between VerticalTabControl membersCaolán McNamara1-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>
2020-11-24fix unit-test with non-pdfium buildNoel Grandin1-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>
2020-11-24CVE-2020-25713 raptor2: malformed input file can lead to a segfaultCaolán McNamara2-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
2020-11-24tdf#137662 ignore focus in dropdown if dropdown is hiddenCaolán McNamara1-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>
2020-11-24Resolves: rhbz#1900428 don't crash on invalid index used in StarBasic macroCaolán McNamara1-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>
2020-11-24Make python3 build on macOS 11, including for arm64Tor Lillqvist2-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>
2020-11-24Make bridgetest exercise parameter passing in the C++/UNO bridge harderTor Lillqvist5-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>
2020-11-24Cosmetic change to make it easier to see which parameter is the nthTor Lillqvist4-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>
2020-11-24Make --without-webdav work even with --enable-mpl-subsetTor Lillqvist1-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>
2020-11-24Fix nss build for x86_64 on an Apple Silicon MacTor Lillqvist1-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>
2020-11-24The config.{guess,sub} in $SRCDIR is good for external projects, tooTor Lillqvist3-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>
2020-11-24Make the C++/UNO bridge work on macOS on arm64Tor Lillqvist9-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>
2020-11-24Use <alloca.h> for macOS and iOS, tooTor Lillqvist1-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>
2020-11-24Update config.{guess,sub} with latest versions and handle fallout of thatTor Lillqvist7-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>
2020-11-24Replace brittle gcc3_linux_aarch64 vtableSlotCall with pure assembler codeStephan Bergmann3-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>
2020-11-24Avoid warning about deprecation in macOS 11.0Tor Lillqvist1-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>
2020-11-24Avoid unused parameter warning in the !HAVE_FEATURE_PDFIUM caseTor Lillqvist1-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>
2020-11-24Avoid unused parameter 'pImpl'Tor Lillqvist1-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>
2020-11-24There is no QuickTime frameworkTor Lillqvist1-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>
2020-11-24Colibre: tdf#138350 fix wrong color from monoline color to these HEXRizal Muttaqin32-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
2020-11-23avoid Skia floating point position fixups for rectangles (tdf#137329)Luboš Luňák1-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>
2020-11-23tdf#138428 don't record SetName("ScPostIt") in undoCaolán McNamara1-0/+8
Change-Id: Iae87db47907078282e48035ad7892dbf52942e53 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106432 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-11-23tdf#135202: Mysql declare more plugins for native passwordJulien Nabet1-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>
2020-11-23Initial attempt at macOS on arm64 support for OpenSSLTor Lillqvist3-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>
2020-11-23More WIP work for macOS on Apple SiliconTor Lillqvist2-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>
2020-11-23For macOS on arm64, be sure to use HOST_PLATFORM=arm64-apple-darwinTor Lillqvist1-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>
2020-11-23Fix apr build with current Xcode: Include <stdlib.h> for exit()Tor Lillqvist2-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>
2020-11-23Clean up arm64 confusion a bitTor Lillqvist1-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>
2020-11-23Use USE_DLFCN also on macOS on arm64Tor Lillqvist1-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>
2020-11-23Set CROSS_COMPILE=1 when cross-compiling nssTor Lillqvist1-0/+1
Change-Id: Iad826eb83e4c49078e6c668661446b5b70e6a981 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97987 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106375 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-23Be more generic for CPUNAME=ARM64Tor Lillqvist1-1/+2
It's used not just for iOS but can be macOS too. Also, nss wants to call it CPU_ARCH=aarch64. Change-Id: I6398c3bf1409f2ccf16b0d154ad7c2b56f493b15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97986 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106374 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-23Use up-to-date config.{guess,sub} for external/nss, tooTor Lillqvist1-0/+2
Change-Id: I387aba22b90ab1bde1ae3659ea06a5838c1c829d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97983 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106373 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-23tdf#138210 check if CustomShapeGeometry exist first.Mark Hung3-39/+44
CustomShapeGeometry does not exist for a text frame. Getting the property throws an Exception and cause a general IO error. Change-Id: I0e31780292d45211bfd1250d0d359c72def50583 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105834 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com> (cherry picked from commit 8c14adfa76956e76bac98330ce67f080c90af184) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106237 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-11-23tdf#128213 Fix text camera z rotation import and export.Gülşah Köse9-24/+126
Text3DProperties is added to distinguish shape and text 3D effects. Before there was implementation error about text camera z rotation support. We were using shape effects for text. We already have not support shape 3D rotation but we have text camera z rotation. This patch includes import and export filter changes about text camera z rotation. Change-Id: I623392b82edf4585888d2f15ad91ffb2109d8f96 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106033 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> (cherry picked from commit 72998fc859a83f063698c287d035f3fdc8b4481c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106003 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-11-23Initial WIP steps for building for macOS on Apple SiliconTor Lillqvist4-41/+111
Don't use $host_os="darwin" for both macOS and iOS depending on $host_cpu. Soon macOS will run on either x86_64 or arm64. Instead, use "darwin" (or "macos") for macOS and "ios" for iOS. Some other early changes for arm64-apple-macos, too. Change-Id: Id89987d854ceba2cd87c6222db2081ccdec0c73e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96976 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105868 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106368 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-23Accept macOS SDK 11.0Tor Lillqvist1-4/+13
Change-Id: I92275eabe3c6a9442f675ec211c1dd1a8b58bd1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96909 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105787 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106367 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-23ofz#27756 null derefCaolán McNamara1-1/+7
Change-Id: Iccbd368a69f86abe7c7c72df8158db98eaf2bc58 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106239 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-11-20tdf#127086 PPT export: fix lost bitmap fill for OOXML custom shapesMiklos Vajna5-1/+146
PPT can't store an OOXML custom shape with fill bitmap, PowerPoint generates a fallback bitmap when saving to PPT. We used to keep the bitmap and loose the custom shape geometry, but that was changed with commit f4ba484183a1e7b9824f10580d633466c266828f (ooxml import: supprt cropping to shape, 2019-05-13). Fix the regression by going back to keeping the bitmap, a full fallback bitmap (ala PowerPoint), would be more work, taking e.g. blurry shadows (changing the shape position and size) into account. (cherry picked from commit 7032be2e9edd82dad2d67f1582aaa57676bda4a1) Change-Id: I7192f912077f2de026573855dbebbdf576e39ebc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106264 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-11-20tdf#138148 Protect aspect ratio of graphic bullets.Gülşah Köse4-2/+53
Change-Id: I166d547cdc01853fd81436c6cdc8d64b0fe817be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105618 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> (cherry picked from commit c9619a5f6c351ede0dbfb3cf07df0ac9b74c2992) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105860 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-11-20tdf#138108 terminate on uncaught exception in a11y callbackCaolán McNamara2-9/+9
#1 0x00007ffff5d3fafe in accessibility::AccessibleContextBase::ThrowIfDisposed() (this=0x85de440) at editeng/source/accessibility/AccessibleContextBase.cxx:513 #2 0x00007ffff5d3fbee in accessibility::AccessibleContextBase::getAccessibleParent() (this=0x85de440) at editeng/source/accessibility/AccessibleContextBase.cxx:203 #3 0x00007fff999cad24 in SwAccessibleMap::DoInvalidateShapeSelection(bool) (this=0x687e610, bInvalidateFocusMode=false) at sw/source/core/access/accmap.cxx:1647 #4 0x00007fff999cc5a5 in SwAccessibleMap::InvalidateShapeSelection() (this=0x687e610) at sw/source/core/access/accmap.cxx:1152 #5 0x00007fff999d78b0 in SwAccessibleMap::InvalidateCursorPosition(SwFrame const*) (this=0x687e610, pFrame=0x5a3faa0) at sw/source/core/access/accmap.cxx:2744 #6 0x00007fff9aae5c32 in SwViewShellImp::InvalidateAccessibleCursorPosition(SwFrame const*) (this=0x6594330, pFrame=0x5a3faa0) at sw/source/core/view/viewimp.cxx:345 #7 0x00007fff99b01fcd in SwCursorShell::UpdateCursor(unsigned short, bool) (this=0x6594840, eFlags=7, bIdleEnd=false) at sw/source/core/crsr/crsrsh.cxx:2020 #8 0x00007fff99b02db4 in SwCursorShell::EndAction(bool, bool) (this=0x6594840, bIdleEnd=false, DoSetPosX=false) at sw/source/core/crsr/crsrsh.cxx:279 #9 0x00007fff9a2249b2 in SwFEShell::SelectObj(Point const&, unsigned char, SdrObject*) (this=0x6594840, rPt=Point = {...}, nFlag=0 '\000', pObj=0x0) at sw/source/core/frmedt/feshview.cxx:323 #10 0x00007fff9b30eacb in SwWrtShell::UnSelectFrame() (this=0x6594840) at sw/source/uibase/wrtsh/select.cxx:326 Change-Id: I122d087b67c3615afb0c34aa714bc1066946c8c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106139 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins
2020-11-20tdf#138187 Don't open UNO hyperlink control's URL twiceMichael Weghorn1-22/+0
It looks like handling the click by opening the URL was added directly to 'FixedHyperlink' in commit f0006e79c4112b06b65c098722729b9a3f3301c7 Date: Thu Oct 20 10:49:24 2016 +0200 Handle link click directly in FixedHyperlink to deduplicate the handling done explicitly in various dialogs by themselves. The handling in 'VCLXFixedHyperlink::ProcessWindowEvent', which did the same for the case where no action listeners exist, there since commit ea665e6fe7af34fcdcefd73bc05c68eb88e42073 Date: Tue Jan 29 14:05:57 2008 +0000 INTEGRATION: CWS fwk80_SRC680 (1.64.12); FILE MERGED 2008/01/24 12:27:38 pb 1.64.12.6: fix: #i83756# VCLXFixedHyperlink::ImplGetPropertyIds() added 2008/01/24 07:50:51 pb 1.64.12.5: RESYNC: (1.64-1.64.18.1); FILE MERGED 2008/01/15 09:14:01 mav 1.64.12.4: adopt for gcc 2008/01/15 08:13:04 pb 1.64.12.3: fix: #i83756# open the hyperlink if there are no action listeners 2008/01/14 09:48:30 pb 1.64.12.2: fix: #i83756# VCLXFixedHyperlink::get/setProperty() added 2008/01/11 15:04:28 pb 1.64.12.1: fix: #i83756# class VCLXFixedHyperlink remained, though, so clicking a UNO hyperlink control resulted in the corresponding URL being opened twice. Drop the extra handling from there so this only happens once. (I couldn't quickly double-check that the URL is only opened once before f0006e79c4112b06b65c098722729b9a3f3301c7 since opening the dialog from the sample file fails in such old versions in the bibisect repo.) Change-Id: I32eace51bf8f14e968a939398c2bf2fd6f83de28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105793 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 42a691933429dbb315de2bd7ba2724993c60411f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105859 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 14:44:14 +0000