summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-26Bump version to 21.06.5.2cp-21.06.5-2Andras Timar
Change-Id: Iaba9c6c6de7554a920e70a8e532697f1433981c7
2021-10-26Fix Nesting Level Bug in ProfileZoneGopi Krishna Menon
Moves the profile zone global nesting variable into the source from header and makes it threadlocal Change-Id: I97751f5c532d8e0e36adb7d9d383bd88f752953f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119662 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 74f4a1796f94477d459c71d0a0aaa8f4a430e208) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119618 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2021-10-26tdf#138531: Also update DDE tables, not only fieldsco-21.06.5-1Bjoern Michaelsen
Change-Id: I0cbf8ce355b460b2f7ea73c8fae653641c980979 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124129 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 98247b039baea4697e6c387025afcf6a2963c043) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124020
2021-10-26Run testODFX509CertificateChain first because otherwise it fails on my MacTor Lillqvist
Sure, it would be better to figure out why it fails. Change-Id: I4c9e8aa0a9a3cd421de08ec9c9ea2dcb1a242ab1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123875 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit fd7f17ca580888044050fbf25df65354ba12d4ca) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124023 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins
2021-10-25use pull model also for LOK text selectionLuboš Luňák
Make LOK_CALLBACK_TEXT_SELECTION, LOK_CALLBACK_TEXT_SELECTION_START, LOK_CALLBACK_TEXT_SELECTION_END and LOK_CALLBACK_TEXT_VIEW_SELECTION also use pull model, i.e. LO core will only set a flag and when CallbackFlushHandler needs the actual data it'll use getLOKPayload(). This again avoids a large number of messages passed to CallbackFlushHandler only for them to be sooner or later discarded. Change-Id: Ia7528039be996a6e9e8491b4eba3f4133582fa56 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124147 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-10-24test: upgrade test NSS database from dbm: to sql:Michael Stahl
Fedora nss-3.69.0-1.fc34.x86_64 and Debian libnss3:amd64 2:3.70-1 no longer support the old BerekelyDB databases, so convert them to the new SQLite format for the benefit of --with-system-nss builds. This worked to do the upgrade: > certutil -N -d sql:test/new --empty-password > LD_LIBRARY_PATH=instdir/program workdir/UnpackedTarball/nss/dist/out/bin/certutil --merge -d sql:test/new --source-dir dbm:test/signing-keys Builds would fail running tests added in commit 40d70d427edddb589eda64fafc2e56536953d274 signing.cxx:551:Assertion Test name: testODFX509CertificateChain::TestBody equality assertion failed - Expected: 0 - Actual : 1 Change-Id: I00aa20703e117ebf583c3331b84e966c2cfc78cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123586 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit d09cbdc12ef5af6d98f62c06056f36306c247cfe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123644 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-10-24Revert incompatible ScriptEditor changeStephan Bergmann
...from interface to abstract class, in 1c42afc194da2288c5a738b727952e80c323885c "Respect DisableMacrosExecution option in javascript editor". It caused 3rd- party code like ScriptProviderForooRexx.oxt to fail to install. Change-Id: I532f27fdce806e471a8551646adbb3aecf80bcee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123745 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit d425cd604cb4d30862640851b11a31e742d81336) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123770 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-10-24remove slow wrappers for std::vectorLuboš Luňák
Noel has already done this in master in a number of commits, this one changes those that make SfxViewShell:GetFirst/Next slower. Change-Id: I69dcb026ce969731071be55f36d3c6d42daa89e4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124116 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-10-24clang does not support -flto=<number>Luboš Luňák
This may happen when building with GCC when Clang is used for Skia and --with-parallelism is in effect. Change-Id: Ic52dbbcf53253ed73413af4ea8254b000eee72d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123430 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 5b2848413883565c48d312c96daf8fbca25405d8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124017 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2021-10-24change some LOK internal updates to be pull model instead of pushLuboš Luňák
Some LOK messages may get called very often, such as updates about cursor position. And since only the last one matters, they get generated every time, which costs some time, and then later except for one they get all discard again from CallbackFlushHandler queue, which again costs time. Change the model to instead only set an 'updated' flag, and CallbackFlushHandler will request the actual message payload only before flushing. This commit changes LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR and LOK_CALLBACK_INVALIDATE_VIEW_CURSOR to work this way. Change-Id: I376be63176c0b4b5cb492fbf529c21ed01b35481 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124084 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-10-23[cp] Fix of Win32 MSP creationAndras Timar
Change-Id: Id7743b45958a53fa5e3034836ba280dfddcc2e2e
2021-10-23use LTO to build hunspell if LTO is enabledLuboš Luňák
Without this, LTO gcc build may fail while linking libmerged because of an undefined reference to `std::string::append(char const*)', which looks like a gcc bug because std::string should be a template, but whatever, this makes it build. Change-Id: I173cc0c773d5957a0c4a9cecc74c1ab33afad7db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123541 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124082 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2021-10-23MSVC LTO does not like mixing 32bit and 64 codeLuboš Luňák
So disable LTO for x64 code when building for 32bit. Change-Id: I8445d8307b3b797b78cea12e6322e0d792c71dfd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123537 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124081 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2021-10-22svx: Don't end text edit mode for all viewsTomaž Vajngerl
This allows multiple views to not disturb each other editing inside a impress document. With the ending of text edit for all views still enabled, one view can cancel other views text editing just by moving or resizing a unrelated shape in the document. To make this possible we also need a view-local undo manager for the text edit mode, which is independent of the document undo manager. When the text edit mode ends, all the changes will be added as one change to the document undo stack. This prevents any conflicts in the undo stack that could be made when 2 views are editing the same document at the same time. This also adds the test for the new use case and changes the existing tests to reflect the change. Change-Id: I04edb4f91d7e111a490c946f7121cbca75f818d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123220 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit c175c1dc19d0edc8ca66e39f0b4b8af04e3d6c87) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123951
2021-10-22hdiutil flatten/unflatten was removed in macOS 11Andras Timar
Change-Id: If5a1a70f8a7428d81668704f93fa7a1f45058b68
2021-10-22tdf#140022 sd: fix inteaction between multi-col shape text and automatic heightMiklos Vajna
Multi-column shape text works by assuming a fixed height, then flowing content to a next column once the current one is full. Automatic height works by first laying out the text and then resizing the shape to have a matching height. When both are enabled, then we used to first calculate the automatic height and then lay out the multi-col text using that height. PowerPoint takes the height from the file format and lays out the multi-col text using that fixed height, and only editing modifies the automatic height. Fix the problem by not updating the automatic height when we have multiple columns, this is meant to improve the stability of the layout anyway. Manual testing shows that editing the text on the UI still updates the automatic height, as probably expected. Based on Mike Kaganski's research - thanks! :-) Change-Id: Iaf46c6008018b4bf26310322f25788a49c1d27f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124048 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 7e74c6cf8d0a56cc061f48e1c6f397d393165220) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124062 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-10-22properly flush LOK invalidations in testsLuboš Luňák
This should be done always before doing something with a flag related to the invalidations. Use an idle timer for simplicity, tests already usually process to idle. Change-Id: I979900da28061cc690ecbcce023dbb769239f205 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124027 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-10-22ignore invalidations in Writer when doing tiled paintingLuboš Luňák
That's done by ignoreLibreOfficeKitViewCallback() called from SfxViewShell::libreOfficeKitViewInvalidateTilesCallback(), but in case Writer delays invalidations to compress them, the tiled painting flag may be already reset by the time flushPendingLOKInvalidateTiles() gets called, so handle that explicitly. SwTiledRenderingTest::testTablePaintInvalidate() would otherwise fail with my follow-up commit that makes TestLokCallbackWrapper flush the invalidations. Change-Id: I915ae4e40bc7a82b3e48498f7e5513420dd64522 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124006 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-10-22better name for a function overloadLuboš Luňák
It's better to add to the name what the overload does rather than just have a "mysterious" extra int. Change-Id: Iff89679c4a978a4596ac662ef74e934cdefefc9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124005 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-10-22revert unittests to use plain text-based LibreOfficeKitCallbackLuboš Luňák
At least for now it seems that the more complex SfxLokCallbackInterface is just an unnecessary complication for unit tests. The performance doesn't matter, and handling all the specialized callbacks makes things more complicated. In the future it'd be also useful to make the tests (optionally?) use also CallbackFlushHandler as the provider of the messages, in order to test CallbackFlushHandler more thoroughly, so perhaps in the end it makes more sense to keep unit tests using the plain text interface. This reverts unittest-related parts of 3b729db05553c1a6d461fb41c89 and adds a smaller wrapper callback class that converts messages from SfxLokCallbackInterface to LibreOfficeKitCallback format. Change-Id: I6c14f0be4ed7b777444b131140be54188d309cca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124004 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-10-22Move SalInstanceImage decl to header fileSzymon Kłos
Change-Id: Ic71e10a9cb296e8fed366b7dd622d8875d68f2d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123876 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2021-10-22jsdialog: export common properties for ImageSzymon Kłos
Change-Id: Id01686106477cc1911fb5ec345ffcff5537e0de6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123884 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2021-10-22lok: fix formula mode after reference dialog was usedSzymon Kłos
m_nCurRefDlgId is a global variable which can be used by many views. It should be deglobalized in LOK case in the furture. For now let's fallback when we didn't get child window for remembered value of m_nCurRefDlgId. It fixes following case: 1. opened pivot table dialog and in destination section selected "selection", selected a range, closed dialog 2. tried to type formula in the cell and point any cell to add reference before this patch formula mode was closed, after it adds correctly the selected range to the formula Change-Id: I4d6756f08207f78a6033865203905bc2fed59fb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123803 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
2021-10-22sw: fix crash in SwXTextDocument::postMouseEvent()Miklos Vajna
From crashreport: SIG Fatal signal received: SIGSEGV SwXTextDocument::postMouseEvent(int, int, int, int, int, int) sw/source/uibase/uno/unotxdoc.cxx:3559 doc_postMouseEvent desktop/source/lib/init.cxx:4245 Make sure we don't crash when a mouse event is posted on a disposed document. Change-Id: I3fb123460b21bf8fe21406d1745f43270102af33 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123947 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124044 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-10-21svx: add "m" prefix to some member variables in SdrObjEditViewTomaž Vajngerl
Change-Id: I2877f63d97ff6d15f08bd2dbaee6128b8a689cc5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123219 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 93115d2c54d645bcf2f80fde325e3ede39dee4d5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123950 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2021-10-21Resolves: tdf#145235 TEXTJOIN() clear last string also for referenced emptyEike Rathke
Change-Id: If6d20a1629e001708c700c5c25bef8a75fa34e25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123889 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit f4f2c94513e7d06691a73d9f12707c33d131d537) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123865 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-10-20Fix gpgmepp build with glibcMike Kaganski
posix-io.c: In function '_gpgme_io_spawn': posix-io.c:492:23: error: void value not ignored as it ought to be 492 | while ((i = closefrom (fd)) && errno == EINTR) | ^ make[1]: *** [Makefile:964: posix-io.lo] Error 1 Change-Id: I0e7abc33200ca7436c72e925447e681fd241c6a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123259 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit f60214a1ad45f947d063e4cfdbeb86bd819ab87c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123927 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
2021-10-20xmlsecurity: fix --without-system-nss usage of NSS_SetAlgorithmPolicyMichael Stahl
The problem with commit ff572d9222ec16ffd679ae907a0bf4a8900265e1 is that it's using the wrong library; NSS_SetAlgorithmPolicy is actually in libnssutil3.so. This causes a linking problem when upgrading the internal NSS to a version that has NSS_USE_ALG_IN_ANY_SIGNATURE. Change-Id: I954d88062c38881bc721bdf052db4f7b55888aae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123819 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 395c0c0bbaceadf909e0189af99c6358487c7978) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123848 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-10-20xmlsecurity: fix test failing because NSS policy forbids SHA1Michael Stahl
With Fedora's nss-3.71.0-1.fc34.x86_64 there is the problem that 8 tests including testODFGood in CppunitTest/xmlsecurity_signing fail because the crypto policy disallows SHA1 for signatures. Apparently this particular policy bit was added in NSS 3.59: https://bugzilla.mozilla.org/show_bug.cgi?id=1670835 For signatures, maybe it's not a good idea to override system policy for product builds, so do it locally in the tests, at least for now. If similar problems turn up for encrypted documents in the future, that should be fixed in product builds too of course, as encrypted documents must always be decryptable. Change-Id: I4f634cf5da1707fb628e63cd0cdafebdf4fc903f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123768 Tested-by: Jenkins Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-10-20xmlsecurity: add tests for multiple X509Data/X509CertificateMichael Stahl
Change-Id: If50ae8156f81c1053aa8fbfc3148da64bb8e1442 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111666 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins (cherry picked from commit 40d70d427edddb589eda64fafc2e56536953d274) This commit also contains: xmlsecurity: fix new tests on WNT Tests added in commit 40d70d427edddb589eda64fafc2e56536953d274 don't actually run on WNT but that wasn't obvious because commit 149df1fec6472e30582162e17e04c75aee91d26a prevented running them in Jenkins on master, they failed only in the libreoffice-7-1 backport. xmlsecurity/qa/unit/signing/signing.cxx(631) : error : Assertion Test name: testODFDoubleX509Certificate::TestBody assertion failed - Expression: (nActual == SignatureState::NOTVALIDATED || nActual == SignatureState::OK) - 2 This is an oddity where NSS claims the signature in the document is valid but CryptoAPI claims it is invalid; the hashes passed into the validation functions are the same. Just allow BROKEN as an additional result value on WNT. xmlsecurity/qa/unit/signing/signing.cxx(550) : error : Assertion Test name: testODFX509CertificateChain::TestBody equality assertion failed - Expected: 0 - Actual : 1 The problem here is that with NSS the tests use a custom NSS database in test/signing-keys so we need to make these certificates available for CryptoAPI too. The following one-liner converts the NSS database to a PKCS#7 that can be loaded by CrytpAPI: > openssl crl2pkcs7 -nocrl -certfile <(certutil -d sql:test/signing-keys -L | awk '/^[^ ].*,[^ ]*,/ { printf "%s", $1; for (i = 2; i < NF; i++) { printf " %s", $i; } printf "\n"; }' | while read name; do certutil -L -d sql:test/signing-keys -a -n "${name}" ; done) > test/signing-keys/test.p7b Then one might naively assume that something like this would allow these certificates to be added temporarily as trusted CAs: + HCERTSTORE hRoot = CertOpenSystemStoreW( 0, L"Root" ) ; + HCERTSTORE const hExtra = CertOpenStore( + CERT_STORE_PROV_FILENAME_A, + PKCS_7_ASN_ENCODING | X509_ASN_ENCODING, + NULL, + CERT_STORE_OPEN_EXISTING_FLAG | CERT_STORE_READONLY_FLAG, + path); + if (hExtra != NULL && hRoot != NULL) + { + BOOL ret = CertAddStoreToCollection( + hRoot, + hExtra, + CERT_PHYSICAL_STORE_ADD_ENABLE_FLAG, + 0); + SAL_DEBUG("XXX hExtra done " << ret); + } There is no error from this, but it doesn't work. Instead, check if CertGetCertificateChain() sets the CERT_TRUST_IS_UNTRUSTED_ROOT flag and then look up the certificate manually in the extra PKCS#7 store. Change-Id: Ic9865e0b5783211c2128ce0327c4583b7784ff62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123667 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 7d664ec788acdc378506a7ff8b1120cea24a6770) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123646 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-10-20comphelper: fix bad error handling in CreatePackageEncryptionData()Michael Stahl
Not sure if rtl_digest_SHA1 can realistically return an error but avoid out-of-bounds write in this case. (regression from commit 9188ea83c346fdc2f668178ae7538665a1b09c02) Change-Id: If5f134cbcd9236338d1938242a469d7c79e87f06 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123649 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 62128c09237152d9e0585abe2fc88f0a13274b34) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123630 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-10-20tdf#134426 tdf#138873 sw: Revert "tdf#79717 ...Justin Luth
...save/restore character format on selection overwrite" which might also fix tdf#144638 as well. This reverts LO 6.3 commit 6abed0ea006f3616e40faf2ae782cf64f8ac2914. This 6.3 fix for bug 79717 has caused too many other problems that are not being looked at, so it should just be reverted. It is spamming documents with direct formatting which is a terrible thing to have happen by accident. It completely wrecks the proper use of styles. Also revert asscoiated follow-up commits: Revert "tdf#79717 save/restore character style on selection overwrite" This reverts commit 6.3 04bd1925706360414438b814046b543c5e317d0a. Revert "tdf#79717: sw_uiwriter: Add unittest" This reverts commit 7.1 b05955b480fe4d32852e7be8a118d46ca7e6dbfa. These effectively revert 7.0.4 12eac5bcbc9b71bf00cb88b918988826229cca35 but its unit test is left intact. Change-Id: Ideced4d38bfdf4c82f1744534afbaad29689fded Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123566 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123577 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-10-20lok: invalidate sheet-geometry sizes on clip pasteDennis Francis
Change-Id: Ie2b308f970673381dfa354620e3394acb44f971f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123869 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2021-10-18writerfilter: give up if body text is missingMiklos Vajna
Crashreport trace: writerfilter::dmapper::DomainMapper_Impl::DomainMapper_Impl(writerfilter::dmapper::DomainMapper&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::lang::XComponent> const&, writerfilter::dmapper::SourceDocumentType, utl::MediaDescriptor const&) writerfilter/source/dmapper/DomainMapper_Impl.cxx:359 (discriminator 2) writerfilter::dmapper::DomainMapper::DomainMapper(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&, com::sun::star::uno::Reference<com::sun::star::lang::XComponent> const&, bool, writerfilter::dmapper::SourceDocumentType, utl::MediaDescriptor const&) writerfilter/source/dmapper/DomainMapper.cxx:113 writerfilter::dmapper::DomainMapperFactory::createMapper(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::io::XInputStream> const&, com::sun::star::uno::Reference<com::sun::star::lang::XComponent> const&, bool, writerfilter::dmapper::SourceDocumentType, utl::MediaDescriptor const&) writerfilter/source/dmapper/domainmapperfactory.cxx:34 ollaboraoffice6.4/program/../program/libwriterfilterlo.so RtfFilter::filter(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) writerfilter/source/filter/RtfFilter.cxx:152 I.e. we end up in a situation where the insert position does not have a containing XText. It's hard to continue from that point and this is in the ctor of the dmapper, so we didn't start the import. Just throw an exception to avoid further crashes. Change-Id: Idb5c06186a82c00b838d0b3330260340eb4218b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123616 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123737 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-10-18LOK: maintain blocked command list per viewPranam Lashkari
Change-Id: I7c621accd84f49447ab3e08a4bb662a9b91b834a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122253 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2021-10-18LOK: unify freemium APIs and uno command restriction APIsPranam Lashkari
Signed-off-by: Pranam Lashkari <lpranam@collabora.com> Change-Id: I3badb038822331ab5cb30df6a66ce9a0640cf340 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122162 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2021-10-18LOK: introduce way to restrict uno commandsPranam Lashkari
With this new API we can define which uno commands to restrict their functionality Change-Id: I9f3fd659d373e56542c5323922a53564f1cfb27b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122049 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2021-10-18[cp] Restore light document border for writer part2Pedro Pinto Silva
- Make shadow not so harsh - Add border radius fixes https://github.com/CollaboraOnline/online/issues/3403 Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com> Change-Id: I5a46915ca4db7b484d5e816985e834b2777a9786 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123672 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2021-10-18--enable-lto for CP distro configs that use --enable-mergelibsLuboš Luňák
It's a couple of percent better performance at the cost of build time. It should build properly, but if something breaks for whatever reason, shout and I'll fix it. Change-Id: I37b7e90eecc0d7b503db88ad18fcbf2ae5f22a98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123587 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-10-15delay, collect and compress LOK invalidations for Writer viewsLuboš Luňák
Due the to way views are updated on any document change, invalidations are at least O(n^2), and since LOK may use a number of views and for each view the entire document is considered to be the view area, this can lead to a huge number of invalidations that are mostly the same repeated rectangles. Change-Id: I63682958d2fc388344641dcd19fa1d2b39054b51 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123618 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-10-15do not use text-based LOK callback internallyLuboš Luňák
CallbackFlushHandler post-processes LOK messages, but for things like dropping useless invalidations it needs to know the rectangle or the view id, and since the only data it gets are string messages, it needs to convert those back to binary form. Which is slow with large numbers of messages. Add internal LOK callback variant that allows also passing specific data in the original binary form. And then use directly the binary data in CallbackFlushHandler. Change-Id: I8dd30d2ff9c09feadebc31a44d8e6a8ccc306504 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123627 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2021-10-15tdf#145016 calc: don't show selection from other split panesSzymon Kłos
Change-Id: I636d98b5b95bb7ad51b39c6328440686f0bfd030 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123407 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Mert Tumer <mert.tumer@collabora.com>
2021-10-15[cp] Restore light document border for writerSzymon Kłos
to apply use make postprocess.clean && make postprocess fixes https://github.com/CollaboraOnline/online/issues/3403 Change-Id: I3d0d12a60eacc73ace3f614360bc86a8a44f28a2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123572 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
2021-10-14use ThinLTO for Clang everywhereLuboš Luňák
No idea why it should be used only on Apple platforms and normal LTO elsewhere. ThinLTO should build faster and the result should perform roughly the same. Change-Id: Ie93cf0ba810ee5bb2309fcbd3548a4847587b3d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123256 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit cca8c5ad553e21bd55aef93757cd31626f9beba1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123521 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2021-10-14T602 is an obsolete format, don't assume .txt files are T602Jan Holesovsky
Without this, when the user tries to open a 0-bytes .txt file, they are asked for a Save As operation after they hit the Save button. When we remove the 'txt' from the T602 detection, it rather asks if the user wants to use ODT or Plain text (and lose formatting). Change-Id: Ic48fa61064a9ed78c64d56bc8864f0e12528e072 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123216 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit d602c433a08c6df28198ceb61b95f5c6d85d1a87) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123402 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-10-14fix MSVC mergelibs buildLuboš Luňák
Linker complains about duplicate symbols for the template, seems to be a case of https://codesynthesis.com/~boris/blog/2010/01/18/dll-export-cxx-templates/ Change-Id: Iaffa3ba55edf4e54c62757c64d6b340b55a514cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123362 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit bbe9bfee56ce395c5fa1c1173e9909925a3a6393) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123520 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2021-10-14Bump version to 21.06.5.1cp-21.06.5-1Andras Timar
Change-Id: I5c589aafa81853d9a8f35adc57d37a37f18e6ee9
2021-10-14Update git submodulesChristian Lohmaier
* Update translations from branch 'distro/collabora/co-2021' to 199bc9df9e0c79c47767cf6abb24e7b4aa116c6f - update translations for 7.1.7 rc1 and force-fix errors using pocheck Change-Id: I190d7d75d9c53fcf3e09553f6a30ec788aaf3561
2021-10-14xmlsecurity: add test for timestampsMichael Stahl
Change-Id: I6ce64ca7c59639684779144ed0ed8d36c4aca32b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111665 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit e5a0acda428fed64b9ba69365d6a54fbffa0727b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123404 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-10-14Adapt to Bison 3.8 internal yyn -> yyrule renameStephan Bergmann
see <https://git.savannah.gnu.org/cgit/bison.git/commit/?id=f30067ed51f23802fc91761ede1506dfa72b2865> "glr2.cc: log the execution of deferred actions" including "Rename argument yyn as yyrule for clarity." YYBISON was defined as 1 rather than as a representation of the Bison version prior to <https://git.savannah.gnu.org/cgit/bison.git/commit/?id=21c147b6e5372563b7c4741deadaddb9354f4b09> "yacc.c: provide the Bison version as an integral macro", which shouldn't be a problem here. And YYBISON is apparently completely undefined with /usr/bin/bison on macOS. (The preceding comment always mentioned "yyi" and "yyrmap" in apparent mismatch with the actually used "yyn" and "yyr1" ever since c25ec0608a167bcf1d891043f02273761c351701 "initial import", so just leave it untouched.) Change-Id: I4f901407aa21ed4abec84e661d813ee7599f02f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122082 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 45227d9b79dc4f2a2aa6874cd4e3c02b7934b197) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123408 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
generated by cgit (git 2.34.1) at 2024-05-22 03:14:19 +0000