summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* curl: upgrade to release 7.83.1distro/lhm/libreoffice-6-4+backportsMichael Stahl33 hours4-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CVE-2022-27774 CVE-2022-27775 CVE-2022-27776 CVE-2022-27781 plus 6 more CVEs that shouldn't affect LO. Remove obsolete configure-eval-fix.patch.0. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134225 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 58a3bf5199818e30ef4207213f29692d81b519c6) upgrade to curl-7.81.0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128783 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 40a84af1bdd7b3c414a8a78ca32b0951c03f9976) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134246 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f668663d63d5b0f37d4727b54585c3b67ab92162) Change-Id: I0a34239bfb16bf19e25bf374c7f36c4cdf1776c1 fbd7ff5acf390df1d95d6b8be0dc7751e4753bbe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134393 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* upgrade curl to 7.79.1Caolán McNamara33 hours3-13/+13
| | | | | | | | | | | | | | | | includes: CVE-2021-22945: clear the leftovers pointer when sending succeeds CVE-2021-22946: do not ignore --ssl-reqd CVE-2021-22947: reject STARTTLS server response pipelining Change-Id: I0047bdaa7e6e3aed1317eb014d2051a4d5ac5964 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123883 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a08d1dc4ee904428ef6f78208cc2508d3fc3717b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134392 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* add Initialization Vectors to password storageCaolán McNamara37 hours3-49/+151
| | | | | | | | | | | | | | | | | | old ones default to the current all zero case and continue to work as before Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131974 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 192fa1e3bfc6269f2ebb91716471485a56074aea) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132306 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit ab77587ec300f5c30084471000663c46ddf25dad) Change-Id: I6fe3b02fafcce1b5e7133e77e76a5118177d77af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133907 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* add infobar to prompt to refresh to replace old formatCaolán McNamara37 hours3-0/+43
| | | | | | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131976 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit bbd196ff82bda9f66b4ba32a412f10cefe6da60e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132307 Reviewed-by: Sophie Gautier <sophi@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit c5d01b11db3c83cb4a89d3b388d78e20dd3990b5) Change-Id: Id99cbf2b50a4ebf289dae6fc67e22e20afcda35b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133906 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* make hash encoding match decodingCaolán McNamara37 hours4-4/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seeing as old versions of the hash may be in the users config, add a StorageVersion field to the office config Passwords section which defaults to 0 to indicate the old hash is in use. Try the old varient when StorageVersion is 0. When a new encoded master password it set write StorageVersion of 1 to indicate a new hash is in use and use the new style when StorageVersion is 1. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132080 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit e890f54dbac57f3ab5acf4fbd31222095d3e8ab6) svl: fix crash if user cancels/closes master password dialog (regression from d7ba5614d90381d68f880ca7e7c5ef8bbb1b1c43) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133932 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit bbb8617ece6d946957c2eb96287081029bce530f) Change-Id: I3174c37a5891bfc849984e0ec5c2c392b9c6e7b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133905 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* ofz#46905 Null-dereferenceCaolán McNamara37 hours1-0/+2
| | | | | | | | | | Change-Id: I26427ee1e010ce79e40c550459d9f53598570a7b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133291 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 5f1d341779b9a773e3147542f6b80d4b3547bb43) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133930 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* ofz#47042 previous use of static variable affecting later runsCaolán McNamara37 hours1-6/+6
| | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133453 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 24c7741adcb373b4de508b16deef56343119df26) Change-Id: I64fb184e43fb025798781c85c9a0a8e0354b21b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133929 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* ofz#46526 AbrtCaolán McNamara37 hours1-1/+1
| | | | | | | | | | Change-Id: Iaec536b0989c4ec11b39b1534c7798e46715d7a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132710 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 67851564d74bc8108e4802abfeb4fb88f4adf71d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133928 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#104 sw: do not delete fieldmark chars in MoveNodeRange()Michael Stahl37 hours12-21/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that SwXTextTableCursor::mergeRange() wants to move some nodes, and the deleteMarks() deletes a fieldmark creating a SaveBookmark but it contains the positions relative to the CH_TXT_ATR_FIELD* still in the text, while deleting the fieldmark of course removes these. The SaveBookmark would need to adjust the indexes and store the separator position too and the vector would need to be restored in reverse order. But every time the SaveBookmarks are created, they are restored as well, so it looks simpler to just suppress deleting the CH_TXT_ATR_FIELD* in this case, and inserting them too (latter is already done when copying text). Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132531 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 5d41c2461642364b7159398024acccbee12f6e3e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132589 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit c489920f6f497a5bc4a9932eaa8408209b54294c) Change-Id: I690c6432a38eab6dec10adff74e638f0e52cca55 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133955 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#102 refetch pPara if it might have been destroyedCaolán McNamara37 hours3-1/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by SwTextFly::Relax READ of size 8 at 0x616006d9ab08 thread T0 #0 0x7f5c56a0fbe5 in Size::Height() const include/tools/gen.hxx:213:52 #1 0x7f5c56a0fb98 in Size::getHeight() const include/tools/gen.hxx:219:55 #2 0x7f5c56a040f0 in SwRect::IsEmpty() const sw/inc/swrect.hxx:306:21 #3 0x7f5c56dbb018 in SwRect::HasArea() const sw/inc/swrect.hxx:302:13 #4 0x7f5c58571d04 in SwTextFrame::Prepare(PrepareHint, void const*, bool) sw/source/core/text/txtfrm.cxx:2986:45 0x616006d9ab08 is located 136 bytes inside of 608-byte region [0x616006d9aa80,0x616006d9ace0) freed by thread T0 here: #0 0x4fe1f7 in operator delete(void*) (instdir/program/soffice.bin+0x4fe1f7) #1 0x7f5c584602c5 in SwParaPortion::~SwParaPortion() sw/source/core/text/porlay.cxx:2557:1 #2 0x7f5c5850b997 in std::default_delete<SwParaPortion>::operator()(SwParaPortion*) const /usr/bin/../lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/unique_ptr.h:85:2 #3 0x7f5c5850b826 in std::__uniq_ptr_impl<SwParaPortion, std::default_delete<SwParaPortion> >::reset(SwParaPortion*) /usr/bin/../lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/unique_ptr.h:182:4 #4 0x7f5c5850b630 in std::unique_ptr<SwParaPortion, std::default_delete<SwParaPortion> >::reset(SwParaPortion*) /usr/bin/../lib/gcc/x86_64-redhat-linux/11/../../../../include/c++/11/bits/unique_ptr.h:456:7 #5 0x7f5c5850960d in SwTextLine::SetPara(SwParaPortion*, bool) sw/source/core/text/txtcache.hxx:45:17 #6 0x7f5c58509e7d in SwTextFrame::ClearPara() sw/source/core/text/txtcache.cxx:113:24 #7 0x7f5c5855606e in SwTextFrame::Init() sw/source/core/text/txtfrm.cxx:758:9 #8 0x7f5c585735c4 in SwTextFrame::Prepare(PrepareHint, void const*, bool) sw/source/core/text/txtfrm.cxx:3090:17 #9 0x7f5c57ecafb4 in lcl_NotifyContent(SdrObject const*, SwContentFrame*, SwRect const&, PrepareHint) sw/source/core/layout/frmtool.cxx:3367:15 #10 0x7f5c57ec968b in Notify_Background(SdrObject const*, SwPageFrame*, SwRect const&, PrepareHint, bool) sw/source/core/layout/frmtool.cxx:3443:9 #11 0x7f5c57958669 in lcl_NotifyBackgroundOfObj(SwDrawContact const&, SdrObject const&, tools::Rectangle const*) sw/source/core/draw/dcontact.cxx:951:13 #12 0x7f5c579556bc in SwDrawContact::Changed_(SdrObject const&, SdrUserCallType, tools::Rectangle const*) sw/source/core/draw/dcontact.cxx:1233:21 #13 0x7f5c57953b8d in SwDrawContact::Changed(SdrObject const&, SdrUserCallType, tools::Rectangle const&) sw/source/core/draw/dcontact.cxx:1009:5 #14 0x7f5c96008baf in SdrObject::SendUserCall(SdrUserCallType, tools::Rectangle const&) const svx/source/svdraw/svdobj.cxx:2767:22 #15 0x7f5c9601befa in SdrObject::Resize(Point const&, Fraction const&, Fraction const&, bool) svx/source/svdraw/svdobj.cxx:1561:5 #16 0x7f5c57da650c in SwAnchoredDrawObject::GetObjBoundRect() const sw/source/core/layout/anchoreddrawobject.cxx:733:22 #17 0x7f5c57dae236 in SwAnchoredObject::GetObjRectWithSpaces() const sw/source/core/layout/anchoredobject.cxx:569:31 #18 0x7f5c5853c39e in SwTextFly::InitAnchoredObjList() sw/source/core/text/txtfly.cxx:900:48 #19 0x7f5c58537b0c in SwTextFly::GetAnchoredObjList() const sw/source/core/inc/txtfly.hxx:311:44 #20 0x7f5c58532a5d in SwTextFly::ForEach(SwRect const&, SwRect*, bool) const sw/source/core/text/txtfly.cxx:1067:56 #21 0x7f5c58533eec in SwTextFly::IsAnyFrame() const sw/source/core/text/txtfly.cxx:405:12 #22 0x7f5c5832ccbe in SwTextFly::Relax() sw/source/core/inc/txtfly.hxx:337:17 #23 0x7f5c58571af5 in SwTextFrame::Prepare(PrepareHint, void const*, bool) sw/source/core/text/txtfrm.cxx:2976:48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132480 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f49d218a671df5f7a956ccb219dc46a5c8d0a53c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132485 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 1c4ebab83edb8fe70282f6467700a56c3aff6c1b) Change-Id: Ibd0d4af69d2a8d74ad538afba7da53c864fa27b6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133954 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#98 don't delete SwFrame flagged as IsDeleteForbiddenCaolán McNamara37 hours3-1/+10
| | | | | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132435 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3644508aceee6019842bea1fee6c177eabd61681) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132484 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit ff6ca44405e0f472441bfa3902f6a3d614028029) Change-Id: I1ac2db4bf96afc4bdc8e0646576f5fa0bcd9e410 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133953 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#91 fix crash on layout of specific htmlCaolán McNamara37 hours5-2/+29
| | | | | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132129 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit be04a8072e4af30ca6ead36aa92d5f380cd9feb9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132483 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 4abce69fca83f5c98bb1fc0678cc1ce9cedd4750) Change-Id: I145649e18f382c67ea34290f44fa219b7926127f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133952 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#99 SwTextFormatter unaware that FirstOfBorderMerge was deletedCaolán McNamara37 hours5-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | READ of size 8 at 0x606000a49e50 thread T0 #0 0x7f7ab6214bf5 in SwPosSize::Height() const /home/caolan/LibreOffice/core-asan/sw/source/core/text/possiz.hxx:49:37 #1 0x7f7ab636c311 in SwTextFormatter::MergeCharacterBorder(SwLinePortion&, SwLinePortion const*, SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:2807:43 #2 0x7f7ab636ae08 in SwTextFormatter::InsertPortion(SwTextFormatInfo&, SwLinePortion*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:354:13 #3 0x7f7ab6371db1 in SwTextFormatter::BuildPortions(SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:709:9 #4 0x7f7ab638b2ac in SwTextFormatter::FormatLine(o3tl::strong_int<int, Tag_TextFrameIndex>) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:1701:9 #5 0x7f7ab62a8ad1 in SwTextFrame::FormatLine(SwTextFormatter&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1212:44 #6 0x7f7ab62af1cc in SwTextFrame::Format_(SwTextFormatter&, SwTextFormatInfo&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1571:23 #7 0x7f7ab62b1f17 in SwTextFrame::Format_(OutputDevice*, SwParaPortion*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1743:5 #8 0x7f7ab62b5260 in SwTextFrame::Format(OutputDevice*, SwBorderAttrs const*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1932:17 #9 0x7f7ab5dbdabd in SwContentFrame::MakeAll(OutputDevice*) /home/caolan/LibreOffice/core-asan/sw/source/core/layout/calcmove.cxx:1514:17 0x606000a49e50 is located 16 bytes inside of 56-byte region [0x606000a49e40,0x606000a49e78) freed by thread T0 here: #0 0x4fe1f7 in operator delete(void*) (/home/caolan/LibreOffice/core-asan/instdir/program/soffice.bin+0x4fe1f7) #1 0x7f7ab6486d35 in SwTextPortion::~SwTextPortion() /home/caolan/LibreOffice/core-asan/sw/source/core/text/portxt.hxx:26:7 #2 0x7f7ab63da0c9 in SwLineLayout::CalcLine(SwTextFormatter&, SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/porlay.cxx:430:21 #3 0x7f7ab6435413 in SwMultiPortion::CalcSize(SwTextFormatter&, SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/pormulti.cxx:75:15 #4 0x7f7ab6457749 in SwTextFormatter::BuildMultiPortion(SwTextFormatInfo&, SwMultiPortion&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/pormulti.cxx:2090:16 #5 0x7f7ab636f12c in SwTextFormatter::BuildPortions(SwTextFormatInfo&) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:550:21 #6 0x7f7ab638b2ac in SwTextFormatter::FormatLine(o3tl::strong_int<int, Tag_TextFrameIndex>) /home/caolan/LibreOffice/core-asan/sw/source/core/text/itrform2.cxx:1701:9 #7 0x7f7ab62a8ad1 in SwTextFrame::FormatLine(SwTextFormatter&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1212:44 #8 0x7f7ab62af1cc in SwTextFrame::Format_(SwTextFormatter&, SwTextFormatInfo&, bool) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1571:23 #9 0x7f7ab62b1f17 in SwTextFrame::Format_(OutputDevice*, SwParaPortion*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1743:5 #10 0x7f7ab62b5260 in SwTextFrame::Format(OutputDevice*, SwBorderAttrs const*) /home/caolan/LibreOffice/core-asan/sw/source/core/text/frmform.cxx:1932:17 #11 0x7f7ab5dbdabd in SwContentFrame::MakeAll(OutputDevice*) /home/caolan/LibreOffice/core-asan/sw/source/core/layout/calcmove.cxx:1514:17 similar seen in the past as: commit 96acebb72211b4718eb3038c427df37b55b17b0b Date: Tue May 14 01:49:03 2019 +0800 tdf#124937 reset m_pFirstOfBorderMerge before truncate. commit ecd855794b22c0f7e6fb2f362b566c4d9c5f624a Date: Mon Jan 15 22:29:31 2018 +0100 tdf#114536 sw: fix use-after-free in SwTextFormatter::MergeCharacterBorder() Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132439 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit b46baea4d1cce81c56ee0d82fbdc352921445fa7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132380 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 0a34ac386187c5ca328aebc27851c2a2ff38f293) Change-Id: Iad855f382a0daf50dac2537d4a91bfeaa9ff3799 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133951 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#93 fix crash on layout of specific rtfCaolán McNamara37 hours6-7/+15
| | | | | | | | | | Change-Id: Id81729de2efd6f65f1b51bdb437ca21a260eaf6e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133481 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 5277b953b29845555cba8f867c9c750e8bc510a5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133950 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#90 fix crash on layout of specific rtfCaolán McNamara37 hours4-2/+26
| | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132046 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 416cb37acae460b6ae8b175b5c5caf1601f030d4) Change-Id: I17c227ab278ed5a2cc60449d1d005212f00ded89 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133941 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#94 fix crash on layout of specific htmlCaolán McNamara37 hours3-0/+11
| | | | | | | | | | Change-Id: I1874a431d5af9d56248a695e08a2f95b5292ba9a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132179 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 3b6ea366796f7f7e04fb60b9394c91e4790b5c72) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133940 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#92 fix crash on layout of specific docCaolán McNamara37 hours4-1/+102
| | | | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132142 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132148 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 0d0cee5e48ca523f11540e9ae0ff022692fd9dca) Change-Id: Id40d25d05d10d641d071cddd2e1c84594ac777a6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133939 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#89 don't remove page with footnote continuation frameCaolán McNamara37 hours1-1/+2
| | | | | | | | | | | | in browse/html/web mode Change-Id: Ic821dd7f2cc1f47305b5fe2ced16d5168aedc0b9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132045 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit e672a8351df5e9fcbdafa34857a16f2bd547ebd6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133938 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#96 sw: delete fieldmarks in DelFullPara()Michael Stahl37 hours2-0/+39
| | | | | | | | | | | | | | | | | | | | | | | The problem is that CorrAbs() will move any position of a fieldmark that's in the deleted SwTextNodes to a different node that doesn't have the CH_TXT_ATR_FIELD*. Then it will inevitably crash later when it can't find its chars. The other problem is that if there's only a CH_TXT_ATR_FIELDSEP in the deleted nodes, that fieldmark would then be missing it. Just delete fieldmarks with positions in deleted nodes, that should work fine for the usual cases where DelFullPara() is called. Change-Id: I8dfac9a315d74025dbe1ed5ccb95b7c9121fb569 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132379 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 542673c0d4c6a992113999101f2c1bf21e0c5c22) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133937 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#100 drop SwBorderAttrAccess to allow cache entry to be removedCaolán McNamara37 hours1-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SwBorderAttr which gets deleted during this call also includes... Related: forcepoint#100 we don't need pAttrs for the duration of the full scope similar to the case of commit 6b1eae0334ba8bad7656a859695551ce51b62f95 Date: Fri May 18 08:26:14 2001 +0000 Fix #87058#: Locked boraderattribut the SwCache object cannot be deleted if its locked, leading to a leak, we don't need pAttrs for the entire scope here so we can defer to the end of the scope the reacquire the lock to set pAttrs and also includes... Related: forcepoint#100 don't reacquire after every release instead release when we have to, and only reacquire if necessary before use of pAttrs Change-Id: Ie52aab7e5933d76b0c055389798104e4d93f39e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132462 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins (cherry picked from commit 37f39a4156069ba5f099045ce93370507d9ba215) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133901 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* liborcus: forcepoint#83/84/87/95Caolán McNamara37 hours5-0/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | forcepoint#83 Invalid read of size 1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131989 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 7cccd1f732db8d451e9036800c9947509105a60a) forcepoint#84 Invalid read of size 1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131991 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d6a02a99eaa3690c0aa5c33fea3a4c710813a0de) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132315 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 59ce428e794eb4874e8be337e31a2a14aef4593a) forcepoint#83 forcepoint#84 update to upstream fix Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132055 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2323fa29617e4919226517d50abbb9ad33b320ca) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132412 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 3e57f46c67ae06c30ec2da2c37c602d34af24dab) forcepoint#87 Assertion 'mp_char <= mp_end' failed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132097 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 32019baffa19a8f79cacf93d5dd5a95c7d416657) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132413 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit efed5861b51cd54182e2c173a0fc98dee2a7742f) Change-Id: I434928cb2425a2e8eb9440dff67f52cda241b2d9 forcepoint#95 read past end of malformed document Change-Id: I8b2c558c733af3d7662f668af47e962e252ee339 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132311 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0b9892fee990b7f6d0457ab6191f87c3991580e6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132414 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 50f0dc8d49d52a9c8bc2079c69bd5feb150cd71a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133900 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#82 back() called on empty vectorCaolán McNamara37 hours2-0/+30
| | | | | | | | | | Change-Id: I8017777a58f1fef41d1545899868e333c2184c5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131867 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 848ba18f3196a2fc64d08573eb9d1aeda074e758) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133899 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#86 RES_TXTATR_UNKNOWN_CONTAINER item put at invalid indexCaolán McNamara37 hours1-1/+1
| | | | | | | | | | | | | RES_CHRATR_BEGIN is 1, presumably RES_TXTATR_UNKNOWN_CONTAINER should be stored in the last index Change-Id: Id37fff41cbbccbc26fe5ccce6027014af7362729 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132040 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit f5ff8e0feb218a001e2ce5ced9ec4e13f2bff73d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133898 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* forcepoint#85 Conditional jump or move depends on uninitialised valueCaolán McNamara37 hours1-1/+2
| | | | | | | | | | | | | | | | | | | | ==398461== by 0xCDC7960: (anonymous namespace)::CopyUntil(char16_t*&, char16_t const*&, char16_t, bool) (strhelper.cxx:88) ==398461== by 0xCDC839F: psp::WhitespaceToSpace(rtl::OUString const&, bool) (strhelper.cxx:294) ==398461== by 0xCB54980: vcl::PDFWriterImpl::setOutlineItemText(int, rtl::OUString const&) (pdfwriter_impl.cxx:9875) ==398461== by 0xCB547FF: vcl::PDFWriterImpl::createOutlineItem(int, rtl::OUString const&, int) (pdfwriter_impl.cxx:9851) ==398461== by 0xCAF39B0: vcl::PDFWriter::CreateOutlineItem(int, rtl::OUString const&, int) (pdfwriter.cxx:383) ==398461== by 0xCABD7C8: vcl::GlobalSyncData::PlayGlobalActions(vcl::PDFWriter&) (pdfextoutdevdata.cxx:250) ==398461== by 0xCAC0628: vcl::PDFExtOutDevData::PlayGlobalActions(vcl::PDFWriter&) (pdfextoutdevdata.cxx:616) ==398461== by 0x3D06EA0F: PDFExport::Export(rtl::OUString const&, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&) (pdfexport.cxx:1004) Change-Id: I6bc086997851ee06531a4a9ae263e2b26edfba84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132036 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 9d5703aa0b7d11db3568a2e0aaa462fe2dd98867) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133897 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* libxml2: upgrade to release 2.9.14Michael Stahl37 hours1-2/+2
| | | | | | | | | | | | | | | | | Fixes CVE-2022-29824. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133813 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit f670422a01e7336ba8a554331f3781ec7f5c4e8c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133831 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit e2104950ccd738cde5865ace63af5b3501df7362) Change-Id: I31d6ec794b01dee0bb17022ef2e18d2acd8255df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133889 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* nss: depend on zlibMichael Stahl37 hours1-0/+4
| | | | | | | | | | | | | | | | | Required on WNT since 1c748fefc3c5b42e3548a1a7f5017a579982005a, may be needed on other platforms if using --without-system-zlib. Change-Id: Ib8e544d81881f425d257514fc475e272ca2e53ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132648 Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Tested-by: Jenkins (cherry picked from commit b11a5d3900e3c19e94833c1b1e5218288320c3e3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132609 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 37340124d29f77683fdbe6a3e10c4d80f5d4a499) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133887 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* Revert "trac#34262 Revert "Do not count pages for initial page breaks, ↵Michael Weghorn2022-04-054-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tdf#124983 follow-up"" The actual root cause of the WollMux mail merge issue (too little Java heap space) has been identified in the meantime. In addition, when reverting, I was confused by the fact that the commit msg was only that of the follow-up commit commit 129c680f02564c8bee93930dec9f2ad80980cc1c Author: Eike Rathke <erack@redhat.com> Date: Wed Aug 18 23:42:45 2021 +0200 Do not count pages for initial page breaks, tdf#124983 follow-up but the second version of the underlying fix commit 86e300df241312f6152da1cfa3cb2b8c668d1df5 Author: Ilhan Yesil <ilhanyesil@gmx.de> Date: Fri Mar 6 13:40:59 2020 +0100 tdf#124983 In calc make printable page borders initially visible as well as a cherry-pick of the follow-up commit 3d7007ef8784e92bb56a91c40e7bdff812251677 Author: Eike Rathke <erack@redhat.com> Date: Tue Jun 29 14:31:19 2021 +0200 maShowPageBreaksTimer.Stop() in ScGridWindow::dispose(), tdf#124983 follow-up were actually all already contained in that single commit as well, without being mentioned explicitly. This reverts commit 1f966bb3e38a028c82cee40f6c5a17fe9619b53c. Change-Id: Ib42a2612843bd78ecb9aa538ab64f2a953a3c093 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132572 Tested-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
* nss: build with zlib module on WNTMichael Stahl2022-04-012-2/+7
| | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132367 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 1c748fefc3c5b42e3548a1a7f5017a579982005a) Change-Id: Ie875b4a8df1697de83a8f22cb1170a49792c47e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132423 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* zlib: upgrade to release 1.2.12Michael Stahl2022-04-013-17/+2
| | | | | | | | | | | | | | | | | Fixes CVE-2018-25032 external/zlib/ubsan.patch: remove, fixed upstream Change-Id: I2aa9a9008b9cf7efd970c5fff0df7029204204f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132358 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit bfb6c4c65781a610d21409d974227d73f264f41a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132191 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit b91ebecaaa1582a7cbeda519eb6097a6a866135f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132405 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* trac#34262 Revert "tdf#144565 sw_redlinehide: fix mailmerge when flys ↵Michael Weghorn2022-04-011-8/+13
| | | | | | | | | | | | | | | | | | | | anchored at last node" Causes significant performance regressions with WollMux mail merge, so revert for now. Mail merge with the test doc from tdf#144565 at least already fails with LO 6.1 (Build-ID 2103) on moviA as well, so for now, better live with an existing bug than introducing a new one in our LO 6.4 based releases. This reverts commit beae7a08c30f2f368708dbc7a9988ecfad08af60. Change-Id: I6271ffe3f3036df6e16d93389ad21419b541e03e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132394 Tested-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
* trac#34262 Revert "Do not count pages for initial page breaks, tdf#124983 ↵Michael Weghorn2022-04-014-97/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | follow-up" Analyzing trac#36262 showed that the issue with WollMux mail merge using wrong data record count when a large amount of records is involved starts with this commit. (The issue was not reliably reproducible on all systems, though; I can e.g. only reproduce issue about wrong data record count on my LHM Win client, not on Linux or my non-LHM Win client.) Other tdf#124983-related commits are missing on this branch, which might be related. There is the initial fix commit caeb7b141280a65e60525f11a7e6514b76e12e11 Author: Ilhan Yesil <ilhanyesil@gmx.de> Date: Wed Jul 10 15:41:27 2019 +0200 tdf#124983 In calc make printable page borders also initially visible with follow-up commit 8728eddf938c9c843ab72929cfd3947735ca8da2 Author: Miklos Vajna <vmiklos@collabora.com> Date: Mon Jan 6 10:31:50 2020 +0100 tdf#129552 sc: avoid infinite invalidation loop when the print range is empty and the revert of the initial fix in commit b3e302b98dd7b992b7aa5a7f6756980d3edafc83 Author: Xisco Fauli <xiscofauli@libreoffice.org> Date: Thu Feb 13 17:06:58 2020 +0100 tdf#130640: Revert "tdf#124983 In calc make printable page... and the commit reverted now in this commit commit 129c680f02564c8bee93930dec9f2ad80980cc1c Author: Eike Rathke <erack@redhat.com> Date: Wed Aug 18 23:42:45 2021 +0200 Do not count pages for initial page breaks, tdf#124983 follow-up without the second version of the fix being present at all (master commit commit 86e300df241312f6152da1cfa3cb2b8c668d1df5 Author: Ilhan Yesil <ilhanyesil@gmx.de> Date: Fri Mar 6 13:40:59 2020 +0100 tdf#124983 In calc make printable page borders initially visible ) after the revert, so maybe having the follow-up without the underlying fix is not a good idea. And there would be another follow-up commit on master that we don't have either: commit 3d7007ef8784e92bb56a91c40e7bdff812251677 Author: Eike Rathke <erack@redhat.com> Date: Tue Jun 29 14:31:19 2021 +0200 maShowPageBreaksTimer.Stop() in ScGridWindow::dispose(), tdf#124983 follow-up Revert this for now to unbreak WollMux mail merge. This reverts commit 129c680f02564c8bee93930dec9f2ad80980cc1c. Change-Id: I74c93ab7cd27eba347b78a198e3d8fbe5fdeb0e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132370 Tested-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
* tdf#148235 Restore toolbar item to switch XForm to design modeMichael Weghorn2022-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 45b6f096e7ae86d0692ecdfd5b7069622d8a6efa Date: Sun Oct 28 17:02:34 2018 +0100 sw toolbars sync context toolbars between different apps had replaced the "Form Design" toolbar item to switch a complete XForm to design mode with an entry that switches the form controls to design mode instead. (The former one is labelled "Design Mode On/Off", the latter one just "Design Mode" in the English UI.) This meant that the XForm could no longer be switched to design mode from there, unless the toolbar was manually customized to add the entry back. This brings the previous toolbar item back. It also removes the one to switch the form controls to design mode again, since that one is already contained in the "Form Controls" toolbar, where it fits better. (And having two different toolbar items with almost identical labels but different functionality would probably be rather confusing.) Change-Id: Ia4c98dfa6ad8372eba08a9f08920153133a7f88d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132207 Reviewed-by: Andreas Kainz <kainz.a@gmail.com> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Jenkins (cherry picked from commit 4f9bf4201bb706cd19142f0805cfc4c859186cd4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132176 Tested-by: Michael Weghorn <m.weghorn@posteo.de>
* ofz#45524 string is presumed to be at least length 1Caolán McNamara2022-03-191-1/+5
| | | | | | | | | | | Change-Id: If8a86e399109b414cf53f6e2bffdd3c7c6faa490 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131468 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit eca150aeb9254a3c04d15be5a6278c2c65bf3fb0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131622 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#139687 sw: invalidate text frame in footnote when moving itMichael Stahl2022-03-191-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | The problem (which only reproduces here on copy/paste with SAL_USE_VCLPLUGIN=kf5, not with gtk3) is that on SwTextFrame 2638 in a footnote on page 19 containing "Saeed, 100–101." there should be a top margin of 0 but it's actually 144. The footnote was initially created on a previous page with another footnote with SwTextFrame 2635 before it, that's how it got this top margin. Invalidate the print area in SwFootnoteFrame::Paste(), which is called when the footnote is moved to a different container. (somehow regression from commit 723728cd358693b8f4bc9d913541aa4479f2bd48) Change-Id: I7346fd03fccad3eddccbbcd56c4b50127a337b24 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131217 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 86081afc3021fa0ae6c2b32d11b4b20cc8a190a3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131201 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 3d8533cb894614394f1ecf05b3d6dc60f3bf6dd6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131629 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#147414 sw_redlinehide: fix cursor position after AutoCorrectMichael Stahl2022-03-182-0/+36
| | | | | | | | | | | | | Change-Id: Ia06cd4e1a74a21788e4d0ddb5f0481e8a144d863 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131147 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit e2076b31a91d3882f3deeaa5d3d4659da0e4b17c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131134 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit ab0756c1b7509a034d0bb74251c519a090dedc7c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131628 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#147310 sw_redlinehide: recreate frames for whole table deletedMichael Stahl2022-03-182-1/+50
| | | | | | | | | | | | | | | | | | SwUndoDelete calls MakeFrames with end being end node of the table, but it needs to be the following node (with a frame). (regression from commit 723728cd358693b8f4bc9d913541aa4479f2bd48) Change-Id: Id0974c8349be5aef9630822738eae9462bbcb4f0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131112 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 6f20bcb152948a24dbe40ca2e6c4ecef2bebf853) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131131 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit d65b07c42206476ab471320c8261a96adad4d515) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131627 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#147416 sw_redlinehide: fix spell checking popupMichael Stahl2022-03-181-4/+15
| | | | | | | | | | | | | | | | | | | | | | The problem is that SwEditShell::GetCorrection() uses the SwTextNode text without filtering redlines. Using ExpandMode::ReplaceMode should work as it will replace CH_TXTATR_INWORD with nothing and CH_TXTATR_BREAKWORD with ZWSP. Unfortunately there isn't yet a mode that can handle fieldmarks as they are displayed in the layout. Change-Id: Ia243d90309fdd7b6ca159c5df2f4d98725400c5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131210 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit e07b9c5142af838648a4d03a0bdce76612cf7535) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131198 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit c29caa41f826e0f3f7850d6276407a937c512957) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131626 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* sw_redlinehide: more issues with SwEditWin Surrounding functionsMichael Stahl2022-03-186-19/+80
| | | | | | | | | | | | | | | | | | | | .. and SwEditWinUIObject. These need to work with TextFrameIndex. Add some functions to SwCursorShell to make it possible. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131042 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 112592ac580108998a2cd99ae9bbf376c80c10d8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131109 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 26830d91d2f2a2d50f989fa3f36d18d55ea0eafd) Change-Id: I884c4822a0e7ecf254ea09a893762e1e6d539534 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131625 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* Fix copying range when it doesn't contain a numberSamuel Mehrbrodt2022-03-171-6/+20
| | | | | | | | | | | | | | | | Copying a range named "aaa" resulted in a new range named "1". Now it will be named "aaa2". Also, when range is named "my_range", the new range is now "my_range2" instead of "my_1". Change-Id: Ib6356454d70244b76de50816e7902852290c3270 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129198 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit 690e4852809ea21b5fd909298c5fa2a053fa0458) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129708 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#98000 docx export: blank paragraphs don't affect page breaksJustin Luth2022-03-166-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Umm, how could that ever have possibly made sense? And why wasn't it found and fixed earlier? This goes way back to when first/follow page styles were first being handled in tdf#66145, where a blank line skipped calling OutputSectionBreak. Then in LO 4.3, tdf#74566 adjusted that a bit more, and tdf#77890 decided to do the same thing for a previous blank line. These all have unit tests to "prove" it too. But none of that makes any sense, and by reverting all of that garbage, all the unit tests still pass. I also looked at the original bug documents, and they also look fine after the revert. So I think it is safe to kill this nonsense, but I don't plan to backport it, just in case... Change-Id: I4aaca0435fbf030fe9c3113b068ea3370eccd889 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99171 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131653 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* sw_redlinehide: fix crashes in SwEditWin Surrounding functionsMichael Stahl2022-03-161-6/+4
| | | | | | | | | | | | | | | | | | | | | | These foolish functions write into the shell cursor! But the shell cursor's node isn't necessarily the same as before with merged paragraphs, so could crash with out of bounds indexes. Better use Push()/Pop(). Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131041 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit aac9bd235e65b27faf63e64bba3ecd94837381d6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131127 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 08690fe5c4e5028ccaebc80145be650caf62ea76) Change-Id: I4fd0e2aa915b6c5448772a2c766848607bbf5aaa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131624 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* hwpfilter: why isn't that path string null terminatedMichael Stahl2022-03-161-0/+1
| | | | | | | | | | | | | | | Change-Id: Iaedc23bd91d0d46e34d55dcc65760b73c5772b7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131559 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 4c86ed851bc1c0a2414e254082064760c99437f1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131589 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit dc566a7f687a728311490b5f4f624897f0aefd1d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131623 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* clamp and add some logging like SvmReaderCaolán McNamara2022-03-111-0/+20
| | | | | | | | | | | | LIBREOFFICE-OWMTGGWJ Change-Id: I8f744e1ab2684a0f0995abcc3e753a684a3b970a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130982 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 19add15932e579c931480eed42eeea52d0551897) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131369 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* ofz: Too many hatch pointsCaolán McNamara2022-03-111-0/+7
| | | | | | | | | | Change-Id: I08cb9d09a9bb48ab31763f50bc2fa23cf723330f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131014 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit bee0950a4c5bd996a8df0185b03c0f98e7a3de9c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131370 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* compare authors using ThumbprintCaolán McNamara2022-03-111-3/+12
| | | | | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130929 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 65442205b5b274ad309308162f150f8d41648f72) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130866 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit a7aaa78acea4c1d51283c2fce54ff9f5339026f8) Change-Id: I338f58eb07cbf0a3d13a7dafdaddac09252a8546 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131368 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* Fix Python deprecation warningsStephan Bergmann2022-03-112-2/+2
| | | | | | | | | | | | | | | | I noticed these "DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated since Python 3.3, and in 3.9 it will stop working" now when running tests with CPPUNITTRACE='gdb --args' on Fedora 32. Change-Id: If263dacb9df5c1fffd2be2418e13e69b96070c77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103294 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 4a899a5f8a72ea29a6919316afe3627de9f33e95) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131344 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#140077 sw_redlinehide: fix crash on SplitNode()Michael Stahl2022-03-082-2/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that CutImpl() was called with nLen=0 and so returned without sending any hint to SwTextFrame. Then the MergedPara gets recreated, but the problem is that the SwParaPortion is never invalidated so it still contains the portions of the previous merged paragraph, and painting it will crash. But it turns out that there isn't a hint that would actually work here; instead, generalise a condition in SwTextNode::SplitContentNode() to simply throw away the portions. (regression from commit eb92dc08f2abf5ed088da0d736266f213adf00de) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131039 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 6518c45dc0c2fb67500af85b97ed40466fd1d1e0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131026 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit c85863a3b4c632cdf6b6a7448fcf49ffb6bb5f11) Change-Id: I06091ca695ea9180b32e61ddb88ce64fbf20443e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131113 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#143239 sw: layout: invalidate fly position when moving off pageMichael Stahl2022-03-073-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible that flags on the fly are all valid when it is moved off page when SwLayAction::FormatContent() returns and then it may not be positioned again, keeping its (wrong) position on the old page and will appear to be invisible unless you click on it. (regression from commits c799de145f7e289f31e3669646e5bd12814e6c5e and eb85de8e6b61fb3fcb6c03ae0145f7fe5478bccf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130535 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit b14bb255199e7d6db6ec9155b5d9237cb35fdba7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130548 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 2bed04d49fda2e2005699b3ef884c5295e56d8ca) Fix flaky test on Win64 Obviously the left values are unstable; they were excluded on macOS, and they fail exactly on the same lines for me locally on Win64 build. So just test that the values are restored after delete and undo. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130738 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit da77aec27e3121c895a6c6c287225216489cc8bc) Change-Id: If07d5af7b47eb288bef71d1b9e3459197b50fdc9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130972 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* ofz: don't register style if hbox load failedCaolán McNamara2022-03-031-6/+12
| | | | | | | | | | Change-Id: I4d9d5d76f0c2385871003720e933ed1926f66c70 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130771 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins (cherry picked from commit 3ac009bfec614ece98313c6444b4c1183ff14954) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130918 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* ofz: measure maximum possible contoursCaolán McNamara2022-03-021-2/+8
| | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130774 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 26abdb564dad2011a298fc1253279232cb8b59cf) Change-Id: Ie039abd835fef06514edde12b99e17360f5481a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130873 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>