summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-02-28bump product version to 7.3.1.3.0+libreoffice-7-3-1Christian Lohmaier
Change-Id: I5eb53886fd2301e832d73fe5f35646edf90f23f2
2022-02-28add to suffix denylistCaolán McNamara
mostly https: //support.google.com/mail/answer/6590?hl=en#zippy=%2Cmessages-that-have-attachments but see also: https://www.howtogeek.com/137270/50-file-extensions-that-are-potentially-dangerous-on-windows Change-Id: Ibe3abbdcdb6f82a73d245318ef97d86789d00523 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130394 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130383 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-28add to suffix denylistCaolán McNamara
add the macOS specific suffixes from https: //support.google.com/mail/answer/6590?hl=en#zippy=%2Cmessages-that-have-attachments Change-Id: I3a834694e3aefb757974cd00ade009874c68c8b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130397 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 3e67678af2f6f8f7d25c5ad67b3828e96bc293b8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130449 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 2004067d2d3f9728770eac8f99a8835d230ffb0a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130452 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-28Update git submodulesChristian Lohmaier
* Update translations from branch 'libreoffice-7-3-1' to 58047d0be2e5d50a4c38b245c6692628e77728e9 - update translations for 7.3.1 rc3 and force-fix errors using pocheck Change-Id: I41de399ba9bbdc8157aa5c04a76f1845d974fc8a (cherry picked from commit 1dab7b297f1b7c2c2ab834239fc40961f60b70e3)
2022-02-28tdf#147298: When swapping the cell stores, swap back the event handlers.Kohei Yoshida
Swapping the cell stores also swap the event handlers stored therein. But we do want the event handlers to stay with the original column instances as they store pointers to their host column instances. Change-Id: Id35b89db641e94dbaa341b33d0b64dce19a99465 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130510 Reviewed-by: Kohei Yoshida <kohei@libreoffice.org> Tested-by: Kohei Yoshida <kohei@libreoffice.org> (cherry picked from commit 8f25d42938977b34f3281238a92fb34ebea5838c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130464 Tested-by: Jenkins (cherry picked from commit 7d64ec7d342da64e050ed9ac326b1af33d5c6955) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130571 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Kevin Suo <suokunlong@126.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-26Resolves: tdf#147448 ScRefreshTimerControl mutex must be std::recursive_mutexEike Rathke
ScRefreshTimer::Invoke() locks the mutex and subsequent nested locks are attempted in ScDocShell::ConvertFrom() and ScDocShellModificator ctor by ScRefreshTimerProtector. A std::mutex must not be owned by the calling thread when a lock is attempted, otherwise even deadlocks may occur, as was the case here. This is exactly the difference of std::recursive_mutex. Likely a regression from commit 287680683ca266f1fb4f447ac9bdaf76669d559d CommitDate: Mon Aug 2 12:17:07 2021 +0200 osl::Mutex->std::mutex in ScRefreshTimer Change-Id: Iaa0f1da2b4b9616e9627d8d0001775f554756048 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130573 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 4361ee2585e616cb3c504eb719deca4076de78da) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130552 Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-02-23bump product version to 7.3.1.2.0+Christian Lohmaier
Change-Id: I18b349fad8664d0343d0ba998764ec3ef8e49521
2022-02-23update creditsChristian Lohmaier
Change-Id: I153162daf766b49806d327b64d9a6c574f275b12 (cherry picked from commit f7b99812c088b1738f25fb57a821b90b8520d8dd) (cherry picked from commit d3edbd4801b0a3383d0022e01433cc6d464aab50)
2022-02-23tdf#147086 OOXML export: don't save the empty editing passwordTünde Tóth
Saving with opening password, but without editing password resulted read-only documents (only on their original path: saving, i.e. copying the file in a different path was a workaround for the lost permission). Regression from commit 1b53c1dfc76f08ca7df40a0673aa50eca700d072 (tdf#144374 DOCX: export the password for editing). Change-Id: I2759dc876ee7668d00eee0aa81490c9d1e0c272b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129593 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130060 Tested-by: Jenkins (cherry picked from commit f7e03352c18e13161effcfe08c7591d3be11b3e0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130088 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-23keep paragraph's that failed to load until import is completeCaolán McNamara
LIBREOFFICE-509JU93T Change-Id: I526edb182fed4fa023cce58e78a650a7c2046ed3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130367 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-23Refetch in case SwTextNode::InsertItem causes it to be deletedCaolán McNamara
Change-Id: Ie189ae4d37ffc33e58bb405f2521d1ae02a9997b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130025 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 780842b6fba24b753f33015bd5c2ad46ced4771c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130147 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-23cid#1500612 Dereference after null checkCaolán McNamara
otherwise this doesn't make sense Change-Id: I321a86cf8f9f05639b686a4c15b2e8fca2e10955 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130255 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit ec21d93f5b649353439d7498d9e0fb9136a5fb6b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130322 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-23libxml2: upgrade to release 2.9.13Michael Stahl
Fixes CVE-2022-23308 Change-Id: I1b3bf5cf58d7d1f39c224b0d898176c95107fbf5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130241 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit d50a7151431335d1431bccef000ae39f84bdf135) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130259 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 1e548cb91c0db71d8f2f8826fb87d2ff8e766586) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130307 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-23clear ScDocumentImport position cache if iterators are invalidCaolán McNamara
SheetDataBuffer::finalizeArrayFormula calls ScCellRangeObj::setArrayTokens ScDocFunc::EnterMatrix ScDocument::InsertMatrixFormula and InsertMatrixFormula calls the variant of ScColumn::SetFormulaCell which doesn't take a sc::ColumnBlockPosition& param when SetFormulaCell adds a cell to the column so any iterators belonging to ScDocumentImport are invalid. Change-Id: Ic2814ecbeafdeb99632d2a255ed6c1dedf7376b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130150 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 49a7e3cbc16f8e23910eadf6fbc135bdeb326253) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130308 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-23Avoid unnecessary empty -Djava.class.path=Stephan Bergmann
Change-Id: Idcfe7321077b60381c0273910b1faeb444ef1fd8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130242 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5e8f64e50f97d39e83a3358697be14db03566878) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130266 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5fc2efcfdf7398abf4265b37608099adbc9d2406) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130312 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-23fix Writer key event delayed compression (tdf#145963)Luboš Luňák
SwEditWin::KeyInput() was stopping the flush timer on every invocation, which means that as long as key events kept coming the timer would be started again and again and would not time out, and so the input buffer would not be actually processed. It seems that AnyInput(KEYBOARD) there actually does not normally manage to return true ... except for Win11 where it seems that now GetQueueStatus() detects even key-up events even though it didn't before (I've not debugged this enough to be certain). I think it still makes sense to have the compression in case Writer get overloaded to help it process the pending input events, so fix this (but if there are problems, I think an easy solution is simply to drop it, it doesn't seem to be that necessary). Also decrease the timeout from 200 to 20ms, as 200ms is a very visible delay. Change-Id: I760ad9c4f58726a80bd6a9fbf93f2771f10cbdb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130083 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130093 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-23tdf#143817 Fix HUD deleting text contents in WriterRafael Lima
Change-Id: Ie28388016c475907c5d8fbe51906bc4a01d6b0d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130091 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 3c94a0f7729f1638ab3b273a186c48de859cfb49) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130092 (cherry picked from commit 4886374fca8f17de78ae558033aa677bcefc0a4e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130099 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-23tdf#146704 sw: fix regression of endnote layout in sectionsAttila Szűcs
Endnotes collected at the end of sections moved to a new page. Regression from commit 4c31b4ef2083087a822c3ae648fd09acc67d2f88 "tdf#139336 sw: fix extra pages of multicolumn sections with footnotes". Co-authored-by: Tibor Nagy (NISZ) Change-Id: I36568e33b04ba8024ceef6b3ea84b71fb375e2a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129896 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 9a457c24ab2731c99f1a5fa1d28f68788e6977f3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129936 Tested-by: Jenkins (cherry picked from commit dbfa2662a6d9a9b53f95198313374f5529978836) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129941 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-23Resolves: tdf#147325 "Edit in SQL View" should accept tabCaolán McNamara
Change-Id: I286281c317c30e5c189747f2d4844a0d5dd0828f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129829 Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 67c3601b835febca282b2ff44137a18891a4fd0b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129835 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-23Update git submodulesChristian Lohmaier
* Update translations from branch 'libreoffice-7-3-1' to a19b043323a0187ac0903415305f1ba177ff827d - update translations for 7.3.1 rc2 and force-fix errors using pocheck Change-Id: I152885b2e8291a05aafc17ca5b494011d0b9af92 (cherry picked from commit e32fb9dee61f405ded4fe47ea33c0272e91ae5a8)
2022-02-23Resolves: tdf#147393 SpinButtons should be can-focusCaolán McNamara
Change-Id: I092ed9c3421267ea3b2c671020e7079c3f792e17 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130131 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit a4a8eff788919ce9a2f458e1b0e3393547be7954) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130263 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Michael Stahl <michael.stahl@allotropia.de>
2022-02-22Better handling of msiRenwa Hiwa
LIBREOFFICE-SK4E5D8N Change-Id: I44f25a47ab6ffeb9d2b679874c8c96af1319eb2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130316 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 766d0fcfcd4e3057bff1637738631b0818d4ce90) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130318 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2022-02-22configure.ac: Update kf5 include/lib check to work with KF5 >= 5.91Michael Weghorn
The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons' subdirectory in kcoreaddons commit commit d971ba9bb27a3e8f18a116692fdf98c1729ac244 Author: Ahmad Samir <a.samirh78@gmail.com> Date: Sat Jan 15 14:14:13 2022 +0200 Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/ Instead of /usr/include/KF5/kcoreaddons_version.h. For more details see: https://invent.kde.org/frameworks/kservice/-/merge_requests/79 GIT_SILENT Adapt the KF5 check to check for the 'KFileWidget' header and the 'libKF5KIOFileWidgets.so' library instead. This is more exact anyway, since we require KIOFileWidgets, and the previous check didn't ensure that. (So in case only KF5CoreAddons but not KIOFileWidgets was installed, configure would previously pass, but the build fail.) [1] https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244 Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 5fd5e42bf28a7910321c6b6d76257e7386839fbc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130007 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit a1d08b478a4f55c5e8fc08eb3cf963c2a8107221) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130106 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2022-02-22fix range checking in calls like ScDocument::GetNote()Luboš Luňák
Change-Id: I5612e765b3484b0515f4a16030ee19133ae3126a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130076 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 957d99a539df6e21fd40370938ca5dab1613cf8c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130149 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Michael Stahl <michael.stahl@allotropia.de>
2022-02-21tdf#146622 sw crash fix: don't delete already deleted rowsLászló Németh
Delete tables and rows removed also tables and table rows with tracked row deletion/insertion. This resulted not only lost change tracking, but a crashing Undo. Crash regression from commit 99059a1ececa3621c2fe46fabdd79eed9d626c42 "tdf#143359 sw: track deletion of empty table rows". Non-tracked deletion of the tracked row changes was a temporary solution for the missing UI of tracked row changes, implemented in commit 05366b8e6683363688de8708a3d88cf144c7a2bf "tdf#60382 sw offapi: add change tracking of table/row deletion". Note: UI was added in commit f348440e17debacbcba9153e238e010e8c020bdc "tdf#146120 sw: show tracked table changes with different color", commit 95c003d75e0f8b255344715a35358072b5eba99d "tdf#146145 sw: 1-click Accept/Reject of table row changes", commit 84fbb3398f7486f00e7b7dea415e1ea2510a9535 "tdf#146144 sw: add tooltip to table rows with change tracking", commit eebe4747d2d13545004937bb0267ccfc8ab9d63f "tdf#144270 sw: manage tracked table (row) deletion/insertion", commit f481c2c8e74bded11fac754e493560391229dbcd "tdf#144057 sw track changes: hide deleted table rows" and commit 23846867ea32667ccf328c36142394dd6aaee8ba "tdf#147182 sw: accept/reject all changes of a table selection". (cherry-picked from commit 95213407dfcbf34056037d60243ff915340d1a2e) Change-Id: I384b750b0d3626fa8b3f256c7eaf5b93f382e4e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130011 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 6b80222d6bc043eb78a2986e9051cee3e5ee0967) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130019 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-02-21Resolves: tdf#147398 Test Intersects() instead of Contains(), tdf#119083Eike Rathke
Regression from commit 8406139062d9ffe1daed32aefe4e261c6c55d63e CommitDate: Mon Dec 6 15:45:35 2021 +0100 process broadcasts for adjacent cells together (tdf#119083) that changed single cell broadcasts to blocks of rows broadcasts and - if (rAreaRange.Contains( rAddress)) + if (rAreaRange.Contains( rRange)) but a block of rows may be distributed over several broadcast areas so rRange is not contained within one rAreaRange and thus was not broadcasted. Testing for intersection instead fixes this. Change-Id: I10700296ebc897e4b7b7752e0e6bcb480085b487 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130027 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit a1f21d7094deb6f1ae5388718f2bc28eecd5737a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130013 Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-21Better handling of terminalsRenwa Hiwa
LIBREOFFICE-3MQTR80G Change-Id: Ifa52d7f65aae473056202b46788c5870a8ce38c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130089 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit fe0ccc2a1b03d848aa9f3378c1415461150d22c4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130100 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-21sw: fix layout loop on soffice --convert-to pdf ooo95698-1.odtMichael Stahl
For unknown reasons, this loops since commit 32902f66e7749b2d06d13f50416be5323a0c0ea9a "sw_redlinehide: make layout based Show/Hide mode the default" The problem is that when page 1 is layouted for the first time, it splits into 6 pages, and then the SwTabFrame 47 decides that it wants to move its follow flow line because it fits onto page 1. Then splitting the SwTabFrame again fails, but for this RemoveFollowFlowLine() was called a 2nd time and removed the one on page 3. The result is a layout with content on page 1, nothing on page 2, 3 and again content on page 4. This seems to reoccur every time page 1 is formatted. But the first RemoveFollowFlowLine() was wrong because CalcHeightOfFirstContentLine() returns 0 because lcl_CalcHeightOfFirstContentLine() didn't handle the case of SwSectionFrame containing SwTabFrame. This is similar to commit e024cad7c1365da6a198656c3ca0c32b28938e87 doing the same thing for text frames in section. Change-Id: I23fb4d1d56622039f461bb2d357a9c88db140605 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129800 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit b4271e028686d729189afc5e42a9c310f81144f3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129828 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 60811f97c753360393f52aa747837db15a722162) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129836 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-21libxslt: upgrade to release 1.1.35Michael Stahl
Fixes CVE-2021-30560 Change-Id: I334662ddc40955780321133be9aee23858e04dc1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130022 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5cea2f275aab10108954049819d64b6a9a29c255) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130097 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-21upgrade to expat 2.4.6Caolán McNamara
CVE-2022-25235 CVE-2022-25236 CVE-2022-25313 CVE-2022-25314 CVE-2022-25315 Change-Id: I1cb0449411fe938fe47ab47cead685fd04e137dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130157 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2022-02-14limit style export to words max style countCaolán McNamara
and use std::vector LIBREOFFICE-U78X8I5G Change-Id: I436b4c13a4ce07f5e9e5d374163bc4de55cd2cde Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129804 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 1a2f1b25e6d228dd586706584cf1c1f1d1ff069f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129833 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Tested-by: Michael Stahl <michael.stahl@allotropia.de>
2022-02-11bump product version to 7.3.1.1.0+Christian Lohmaier
Change-Id: I9919916b446dfac843fd03cf8f54c63240dfd8c4
2022-02-11Branch libreoffice-7-3-1Christian Lohmaier
This is 'libreoffice-7-3-1' - the stable branch for the 7.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.3.x release, please use the 'libreoffice-7-3' branch. If you want to build something cool, unstable, and risky, use master.
2022-02-11Update git submodulesChristian Lohmaier
* Update translations from branch 'libreoffice-7-3' to 194801068adbae2b8c84754b5d67f5b3ab298bb4 - update translations for 7.3.1 rc1 and force-fix errors using pocheck Change-Id: I908b3cd7aa687fee135329d0c6728ebf0cf21553
2022-02-11tdf#146917: docx import: better support for style with num resetVasily Melenchuk
When paragraph style is disabling numbering defined in parent style we should apply margin properties (like we already do in other numbering cases), but we should include only properties from styles not affected by numbering. In other words, only styles without w:numId are used. Unittest was extended to cover different combinations of this situation. Change-Id: Ic19e00fcfe16b2357cdfe763b4f969cc63122e89 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129701 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 96e1be11540bada172fbdbfbbe3f9b7dc3e58462) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129827 Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de>
2022-02-11sw: fix swapped inner vs outer border for Word-style right/bottom page bordersMiklos Vajna
This is similar to commit cf2690ae76b4250af32be7c8980b8d83b3611591 (sw: fix swapped inner vs outer border for Word-style bottom table borders, 2022-01-13), but that was for outer table borders, this one is for page borders. The explicit mirroring is needed because Writer will automatically mirror, but Word mirrors in its document model, so we need to "mirror back" to get the matching rendering. (cherry picked from commit 60a1f07049a817d4d3d7beb6c9b9da2571e2463b) Change-Id: I38fbf8adbc87ecd217a11b177840b0fede4cdf8c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129770 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-02-11sw: fix unexpected paragraph border inside table cellsMiklos Vajna
The bug document has a table cell, which contains a paragraph with borders. Its left/right/bottom borders are rendered in Writer, but not in Word. The reason for the left/right border is that it's outside the paragraph's frame area, which is not rendered in Word. Fix this by clipping the rendered borders so they don't go outside the paragraph's frame area. (Normally the frame area is the larger rectangle, and then margins may cause a smaller "print area", but in this case we have a negative right margin, so clipping the print area to fit into the frame area actually does something.) This is quite similar to what commit 1e21902106cbe57658bed03ed24d4d0863685cfd (tdf#117884: intersect border with paint area of upper frame., 2018-05-26) did for table borders. The bottom border is a different problem: the cell has a fixed height and enough content so the paragraph is cut off vertically. This means that technically the bottom border would be inside the frame area, but Word cuts it off, because they apply clipping on the not-yet-cut-off rectangle. Fix this by dropping the bottom margin when the frame is cut off. (cherry picked from commit 4a7281fa206c0a82cfc2ba23f25c31ae775d8777) Change-Id: I7f65b68997330b247db65839db8a484e74f78c64 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129769 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-02-11sw: fix swapped inner vs outer border for Word-style bottom table bordersMiklos Vajna
This is similar to commit fc04a84f297b78a1049182b6d8cf745f863ffe61 (sw: fix swapped inner vs outer border for Word-style left table borders, 2022-01-11), but that was for vertical borders, this is for horizontal ones. The other difference is that Word mirrors vertical lines, but not horizontal ones. This means that our horizontal line need less mirroring, while our vertical lines needed more mirroring. (cherry picked from commit cf2690ae76b4250af32be7c8980b8d83b3611591) Change-Id: Iff07adac5c53420673139d5c93ce52f6148fb977 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129768 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-02-11sw: fix swapped inner vs outer border for Word-style left table bordersMiklos Vajna
The minimal DOCX bugdoc has a single cell, the left border style is thinThickMediumGap, the right border style is thickThinMediumGap, which means the doc model already has the left/right mirroring, don't have to do it at layout time. The normal Writer way is to have a single border style and mirror the right/bottom border line. But then looking at the Writer vs Word output, inner vs outer is swapped, so at the end we have to mirror the left border line for Word-style table borders to get compatible output. (cherry picked from commit fc04a84f297b78a1049182b6d8cf745f863ffe61) Change-Id: I10fb95dfac67e466188cfc9ecf35efde806c14b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129767 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-02-11sw: fix too long inner borders intersecting with outer borders for Word cellsMiklos Vajna
This is similar to commit 66ac8e60896f6306bed8fbb34606fd14474f19ce (sw: fix unwanted long vertical border around vertically merged Word cell, 2021-03-04), but this one is about how we handle table border painting when an inner border intersects with an outer border. Previously we used to paint the full outer border and the full inner border, which looks silly in case you have e.g. double border outside and a single border inside -- the inner line stops at the edge of the thick outer border in Word. Do the same by limiting the start of a horizontal line if its start would match the X coordinate of a vertical line (and the remaining 3 combinations of hori/vert line start/end). We always limit the inner line, so this needs extending SwLineEntry if the line is an outer one or not. (cherry picked from commit 526c8bdb54eff942d5213030d1455f97720a1ba7) Change-Id: I669a271ce3a4c3c69916779d4f3167208e999f05 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129746 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-02-11MSVC -arch is independent from the ability to use CPU intrinsicsLuboš Luňák
It's possible to write AVX512 intrinsics in code compile only with -arch:AVX . So do not require -arch for being able to do so, especially since there is no -arch option for only AVX512F without other AVX512 subsets (the option enables also CD, BW, DQ and VL https://docs.microsoft.com/en-us/cpp/build/reference/arch-x64). https://crashreport.libreoffice.org/stats/crash_details/55ef825d-c323-4df9-95e2-76672c674e60 is presumably caused by this, I can see use of registers XMM0-15 in arraysumAVX512.cxx built with -arch:AVX2 but when built with -arch:AVX512 registers XMM16-31 are used too (I'm not sure if that's AVX512DQ or something else, I can't find info on it). Change-Id: I74473333a17e618327d43b920b8929d1b0e733b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129724 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Tested-by: Jenkins (cherry picked from commit 807a15bd64c1f2a57371d12e7684541293cd9791) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129765 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-02-11Remove COMPILER_PLUGINS_CXX from distro-configs/Jenkins/linux_clang_dbgutil_64Stephan Bergmann
It had originally been added with e754d0931ca75403647cc16100edd98e7e5ceadb "Remove CXXFLAGS_CXX11 from Clang plugin compilation", so "if COMPILER_PLUGINS_CXX is not set, simply default it to g++ instead of trying to construct an acceptable CLANGCXX value from CXX (which would be Clang). (The problem with using Clang without CXXFLAGS_CXX11 is that Clang, unlike GCC, typically defaults to C++03, but building compilerplugins requires C++11 at least. That would cause e.g. the Gerrit/Jenkins linux_clang_dbgutil_64 builds to fail---but which also needs COMPILER_PLUGINS_CXX to be explicitly set to 'g++ -std=c++11' as GCC on those machines is still 4.8.5 defaulting to C++03." But that should no longer be an issue with contemporary Clang, which defaults to >= C++11 for quite a while now. On the other hand, when trying to update the Clang used by <https://ci.libreoffice.org/job/gerrit_linux_clang_dbgutil/> from 5.0.2 to 12.0.1, and adding > export COMPILER_PLUGINS_CXX="ccache $LODE_HOME"/opt_private/gcc-7.3.0/bin/g++ to <https://git.libreoffice.org/lode/+/refs/heads/master/bin/linux_clang_dbgutil_64.env> (where this setting arguably belongs, rather than in distro-configs/Jenkins/linux_clang_dbgutil_64, anyway), which is needed because that version of Clang (and thus loplugin built against it) cannot be built with the baseline CentOS 7 GCC 4.8.5, that setting of COMPILER_PLUGINS_CXX got overriden by the one in distro-configs/Jenkins/linux_clang_dbgutil_64, and configure failed due to > configure:21069: checking clang/Basic/SourceLocation.h usability > configure:21069: ccache g++ -std=c++11 -c -I/home/tdf/sberg/lode/opt_private/clang-llvmorg-12.0.1/include -std=c++14 -fno-exceptions -fno-rtti -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/home/\ > tdf/sberg/lode/packages/llvm-llvmorg-12.0.1.src/clang/include -I/home/tdf/sberg/lode/opt_private/clang-llvmorg-12.0.1/include -std=c++14 -fno-exceptions -fno-rtti -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_L\ > IMIT_MACROS -I/home/tdf/sberg/lode/packages/llvm-llvmorg-12.0.1.src/clang/include conftest.cpp >&5 > g++: error: unrecognized command line option '-std=c++14' > g++: error: unrecognized command line option '-std=c++14' > configure:21069: $? = 1 Change-Id: Ic33b116090f648ef645febb4fbb28ceb6a2a7cae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129692 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit a45f057d9d2bcd28e6b4342bbdf45fec38a43ac1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129764 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-02-11tdf#137571 use XActionGuard to lock blocks that don't need updatingCaolán McNamara
so we can avoid constantly generating new TextForwarders which are the same as the one they replace. The underlying problem is that of tdf#123470 but this solution should be safe to backport Change-Id: I742f2a9ce0024adf9bd0acc5bb8edb9372fc0af5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129762 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2022-02-10remove AVX and AVX512 code from CalcLuboš Luňák
It's been a source of numerous problems since the beginning. Poor separation of C++ code causing the compiler to emit some generic code as CPU-specific, compiler optimizations moving CPU-specific code out of #ifdef to unguarded static initialization, etc. And it doesn't seem to even particularly improve performance, on my Ryzen2500U for one full column (1m cells) sumArray() takes about 1.6ms with AVX, 1.9ms with SSE2 and 4.6ms with generic code. So SSE2 code is perhaps worth it, especially given that SSE2 is our baseline requirement on x86_64 everywhere and x86 on Windows, but AVX+ is nowhere near worth the trouble. So this code removes all AVX+ code from Calc, and makes SSE2 a hardcoded option on where it's guaranteed. If we raise the baseline to AVX, the SSE2 code may be replaced by the one removed by this commit. Generic code is there for other platforms, if other platforms add CPU-specific code, they should preferably follow the same rules. This does not necessarily mean that CPU-specific code cannot be used at all. Some externals use them, for example. It just needs to be working, maintained, and worth the trouble. Change-Id: I5ab919930df9d0223db68a94bf84947984d313ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129733 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129792
2022-02-10tdf#147109: Optimize ScInterpreter::ScSubstituteMike Kaganski
Avoid multiple reallocations, making it freeze for e.g. =SUBSTITUTE(REPT(" ";1000000);" ";"") Change-Id: I269c0b06a0b3cbf9369cc47f33c2eea026b12903 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129252 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 0b397d8ef0a2615e8e6202804ca2f6cb58436fa5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129262 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-02-10tdf#146795: Make sure to use valid position hints to avoid crash.Kohei Yoshida
This commit also unifies the code path for both "skip empty cells" option is selected and when that option is not selected, which simplifies the code quite a bit. This commit is a combination of the following two commits cherry-picked from master: (cherry picked from commit 703fb7739a5e604d90e147db6f67917b8d141150) (cherry picked from commit e8032897b4a012d8e236211ee6e5ce89fb90492e) Change-Id: Ie3b1f471cd80587a3906897cccefda06a83c467c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129478 Tested-by: Jenkins Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2022-02-10tdf#113785 sc: IsDataFiltered must be normalizedJustin Luth
I can't believe this hasn't caused major issues and has survived as a bug for so long. Due to the way IsDataFiltered is coded, it is required that the range is normalized in order to get any kind of meaningful result, so lets ensure that. Change-Id: I2ede77f738fbaeb05a0f1425a2e88e59fca08e9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129735 Tested-by: Jenkins Reviewed-by: Justin Luth <jluth@mail.com> (cherry picked from commit bda200a5e9c4592bd61b7924fa171ec3265bfd24) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129761 Reviewed-by: Eike Rathke <erack@redhat.com>
2022-02-10tdf#147206 writerfilter: fix end position of hyperlink in ToXMichael Stahl
(regression from commit 58a86af36295b4fc1e07c0bd38f74530a2ce0f08) Change-Id: Ied4c26255b60f4320f38432ef5e2e27882b7a135 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129681 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 9d30e168112bc5c3c7f2dfc029f293c540ebb280) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129618 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-02-10gdb: fix SwXTextCursorPrinterMichael Stahl
m_pImpl was removed in commit cb0991e32987108d900ec7e8fcd4ce477ebc9fb4 Change-Id: I9ca0cdbca97242ace5243f140ac2e17055b3f718 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129685 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit a10a031199b36914ba14705e417efd76dbb0383a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129625 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2022-02-10ScriptForge - (SF_Utils) review optional argument of _Repr()Jean-Pierre Ledure
As from LO 7.3, optional missing arguments must not be used in assignments and comparisons. The Basic interpreter tolerated it before 7.3. Probable commit having changed Basic behaviour: https://gerrit.libreoffice.org/c/core/+/121794 A unique case of this singularity was found in the SF_Utils._Repr() method. The bad consequence was that the commonly used SF_Exception.DebugPrint() method calls above method. This broke in fact the whole ScriptForge library. Equivalent commit on master: https://gerrit.libreoffice.org/c/core/+/129728 Change-Id: I6b1a8aa9cf8e534c645d1944e75de3b73d285e1b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129771 Tested-by: Jean-Pierre Ledure <jp@ledure.be> Tested-by: Jenkins Reviewed-by: Jean-Pierre Ledure <jp@ledure.be>
generated by cgit (git 2.34.1) at 2024-05-07 09:19:40 +0000