summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-09forcepoint#98 don't delete SwFrame flagged as IsDeleteForbiddenCaolán McNamara
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
2022-05-09forcepoint#91 fix crash on layout of specific htmlCaolán McNamara
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
2022-05-09forcepoint#99 SwTextFormatter unaware that FirstOfBorderMerge was deletedCaolán McNamara
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
2022-05-09forcepoint#93 fix crash on layout of specific rtfCaolán McNamara
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)
2022-05-09forcepoint#90 fix crash on layout of specific rtfCaolán McNamara
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
2022-05-09forcepoint#94 fix crash on layout of specific htmlCaolán McNamara
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)
2022-05-09forcepoint#92 fix crash on layout of specific docCaolán McNamara
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
2022-05-09forcepoint#89 don't remove page with footnote continuation frameCaolán McNamara
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)
2022-05-09forcepoint#96 sw: delete fieldmarks in DelFullPara()Michael Stahl
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)
2022-05-09sw: prevent footnote frame against delete while it's movedMichael Stahl
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130439 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit fe5d3fbfe63fe8b433776bd3a0508dd712b868b0) sw: really prevent footnote frame against delete while it's moved This reverts commit fe5d3fbfe63fe8b433776bd3a0508dd712b868b0 It turns out that checking a single column's IsMovingFootnotes() is not enough - as frames can move both forwards and backwards the entire chain of columns would need to be checked. (Most callers of MoveLowerFootnotes() move forwards, but one place in tabfrm.cxx moves from a follow to master.) But it turns out that this is probably the wrong way in any case: most likely the intention in FormatAnchorFrameAndItsPrevs() is to format previous frames in the same layout environment, so if there is a section or column inside a footnote then this upper should be formatted, while if the footnote is inside a section or column this upper should not be formatted; this should make calls during MoveFootnotes_() safe as it should prevent the formatting of frames in the footnote boss moving a footnote that is already being moved. So tweak the fix in commit fa1bcc22921941b2cd8a0b32fe0d15655d12d607 a little to make it more general. Also it was previously possible that for a section with columns, both the section branch and the column branch was taken, which seems supperfluous. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130544 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 3f569ffc9238e6bf2915e78bf21c844ca5f1270d) add a layout test to exercise UXTSOREL Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130493 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 10d46c0498b89350645cf45e744a528d3d8f1ac1) use Bitstream Vera Sans for consistent results with LIBREOFFICE-UXTSOREL.rtf instead of Palatino Linotype which will typically get substituted Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133460 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ff27c0e35ebfdbe998c372b7a36df8b5577e1fd4) Change-Id: I39487640322339fe4d511e845d9c6bced2ba9dad
2022-05-09tdf#122894 skipping anchor in column in footnoteCaolán McNamara
a trawl of crash testing document didn't show up another example and it doesn't seem possible to create this scenario directly in out UI Change-Id: Ie65a51bf609e8bacd261f368f0b8037431c116ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112567 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit fa1bcc22921941b2cd8a0b32fe0d15655d12d607)
2022-05-09an inconsistent SwTextFormatInfo index, len, text length caseCaolán McNamara
seen on loading sw/qa/python/testdocuments/TESTMETA.odt maybe since: commit 2f3684b2289a8c46dc6144064a452cc529400f28 Date: Tue Jul 31 16:00:02 2018 +0200 [API CHANGE] add some more asserts to the string functions but probably an underlying issue since conversion from UniString to OUString Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131407 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit eb7fbe1f3a37d89b97bd8976bdc006099578c204) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132860 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 177589cb4f8ef20ff84dbfc141b145b28e57be83) Change-Id: If731163fbc5e05b813ccd21df65164fe476cba9a
2022-05-09forcepoint#100 drop SwBorderAttrAccess to allow cache entry to be removedCaolán McNamara
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)
2022-05-09liborcus: forcepoint#83/84/87/95Caolán McNamara
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)
2022-05-09forcepoint#82 back() called on empty vectorCaolán McNamara
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)
2022-05-09forcepoint#86 RES_TXTATR_UNKNOWN_CONTAINER item put at invalid indexCaolán McNamara
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)
2022-05-09forcepoint#85 Conditional jump or move depends on uninitialised valueCaolán McNamara
==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)
2022-05-05sw: avoid EXCEPTION_INT_DIVIDE_BY_ZEROXisco Fauli
Seen in https://crashreport.libreoffice.org/stats/signature/SwBookmarkPortion::DoPaint(SwTextPaintInfo%20const%20&,rtl::OUString%20&,SwFont%20&,int%20&) Introduced by 4ce8120f1e53f7b81e653b01d141643013bc69ab "tdf#45589 sw: create and paint text portions for bookmarks" Change-Id: I7d025878164e1f97b86f9d129af9ba93e93b6ba3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133562 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 7c8b9fa98f4c5f7f5620e797dbbe24081e252548) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133602 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit e2ee797ebba6ee52387cbbd662ee35d84943f0ce)
2022-05-05libxml2: upgrade to release 2.9.14Michael Stahl
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
2022-05-05nss: depend on zlibMichael Stahl
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)
2022-04-22ucb: webdav-curl: put user name from config into LOCK requestMichael Stahl
... so that the dialog in SfxMedium::LockOrigFileOnDemand() can show something more useful than hard-coded URL, which has been used since commit 99bdd887a6141883878978bad9beb35e7b326cd1 in 2009 when locking was added. This is half of the user info that is put into LO's own lock files (see svt::LockFileCommon::GenerateOwnEntry()). Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133186 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 70bea73ffbe815c2d5b7067f20d3eebbb98df61f) ucb: webdav-curl: check UseUserData before sending user name Hope this should be acceptable. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133188 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 6d7c3848560883034a4ff12ac1ef52d2d1d28606) Change-Id: Iefac724644a536fc37c3c79ce862e25bd9be38af
2022-04-22ucb: webdav-curl: fix getting DAV:lockdiscovery propertyMichael Stahl
commit b4576f3da4d90139fc5140962d13cb91dab98797 "tdf#82744: fix WebDAV lock/unlock behaviour - part 3" added a call to get the DAV:lockdiscovery property. But WebDAVResponseParser puts lock related properties into a separate return value maResult_Lock that is only returned for LOCK requests. Just add it as a normal property too, then PROPFIND can get it, and the dialog in SfxMedium::LockOrigFileOnDemand() no longer displays "Unknown user". Change-Id: Icee920588ea40b6e203b18287d75484528cfdebb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133185 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 68f41f4e2dcec65e8885cdfa658c0568a26182a9)
2022-04-22sfx2: do reload on SID_EDITDOC in SfxViewFrame::ExecReload_Impl()Michael Stahl
commit b505ca5b9c31b3d9c639406d03a25bea4e914242 "Switch to read-only mode: do not force reload document if possible" replaced "true" with "bNeedsReload" here - but this is a problem when switching from read-only to editable. 1. Start LO and load a document from WebDAV editable 2. Start other LO and load the same document from WebDAV read-only 3. In first LO, edit document, store it and close it 4. In second LO, click "Edit Document" button 5. LO doesn't reload the document and shows stale content It's not clear what problem that commit was trying to solve, but let's assume that it intended to change only what happens when switching from editable to read-only. Change-Id: I69c779c5c0c5c2ccda677ea8cb353c8716916861 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133171 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit c929c563e2029bbb969dc417a688cca8934e69b0)
2022-04-22tdf#146460 tdf#148429 ucb: webdav-curl: censor "curl" in UserAgentMichael Stahl
This is now the second bug filed because a server replies with 403 if the UserAgent contains the string "curl". Change-Id: I25ca2d255af76a7ff4e64dad900b1bf0b78de59f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133212 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 8d9c56e8f42428fd6695942c673bffb985d22ad5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133146 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 3fe6a03426a86ec6b18a9b712588619f19a72897)
2022-04-21Prevent save interception when un-sharing Calc docSamuel Mehrbrodt
Follow-up to bfc43aad0e8eb90e9d3495b940bc2283081f04c6 Change-Id: I0b4562e8a41377839e78c5e471f36eed0a52d5bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133216 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit 8ac35ace9fca1e0d348e5f9c1ee777458661338c)
2022-04-14binaryurp: create instances with uno constructorsNoel Grandin
See tdf#74608 for motivation Change-Id: Ide39715f83b0183f560e16fa69fcb3112496936d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97933 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 9be078ae0d4cc4e4c01952bb42c9bb5943bbde86) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132945 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2022-04-14Prevent save interception when sharing Calc docSamuel Mehrbrodt
Using the dispatch mechanism means that this can be caught by the dispatch interceptor which we don't want in this place. Change-Id: Ie7e5f92e6043e2aff98d4887829a3573c12c6d08 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132946 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2022-04-14ucb: webdav-curl: only allow system credentials for auth oncecib-6.4-7Michael Stahl
... and in any case abort authentication after 10 failed attempts. Apparently some PasswordContainer can turn this into an infinite loop. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132974 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 2bc4d1d22fdbd9d97c66bb53762b4b4bf7b61b47) ucb: webdav-curl: oops, increment after checking Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132982 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins (cherry picked from commit ab65a74998b498ff49c15db87fc14a9afa89d8bf) Change-Id: Ib2333b371a770999e8407ce7e1af21512aadb70d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132867 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 6b54e6a8e64233de63b826211b81a8ed6767483f)
2022-04-12Bump version to 6.4.0.7Thorsten Behrens
Change-Id: Ib2312b5b49571e0202c2edc5d14eb6a067f9eab6
2022-04-12tdf#131025 swtable: don't apply number format to non-number textJustin Luth
Applying a numbering style to text causes export to save that out as a number (valued as zero). That is not good because the ODF spec says that a number overrides a string. So don't accept a numbering format on non-number text. Why is this change good? -the cell previously had no direct formatting (by definition). -the cell's previous old format was text (tested). -any numbering format applied obviously isn't correct (by definition). -any previous formatting has already been overwritten with numformat. -the default numbering is appropriate for text. -empty cells still get the numbering format (tested). -odd human-designed formats are accepted as intentional (tested). What are the concerns? -the scope of this change is HUGE, way beyond this bug. -on both my dev box and patch box I saw occassional crashes. -the bug was "fixed" by a different import commit that ensured different languages were treated consistently. So this patch is no longer critical, just nice to have to avoid exporting out-of-spec content. Change-Id: Id3dc5f803c3cf4875bc0cab52d1019a18679da77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123904 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 546e7d14b397cfd1210b891c8dc4a195c25f3876) Conflicts: include/svl/numformat.hxx svl/source/numbers/zforlist.cxx sw/source/core/table/swtable.cxx Change-Id: I94db018babf0323d84809accaaa898a9caf8edbe
2022-04-01nss: build with zlib module on WNTMichael Stahl
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
2022-04-01zlib: upgrade to release 1.2.12Michael Stahl
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)
2022-03-18tdf#145842 canceling remote file delete makes file disappear from treeviewcib-6.4-6Caolán McNamara
we remove the selected entries from the treeview, so the user cancel's the deletion of an entry we should unselect it from the candidates to remove. and... Related: tdf#145842 fix a crash after deleting an entry delete an entry in remote files dialog and go one level up and crash, ownership of the SvtContentEntry is not with the entry, but belongs to mpImpl->maEntries Change-Id: Ieb2258960fc647ad15d8f315a18454a0dae8a420 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125793 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins (cherry picked from commit 9d13202243b26d507b61eb4a787d1df2ce037e21)
2022-03-18Resolves: tdf#145840 call ToggledDavsHdl on setting checkbox stateCaolán McNamara
Change-Id: Ia2a735255b94fd3a097081950e2145e07b4b3b63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125723 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit b23a16ff513369b6bf1f534a387d911b6336c9c8)
2022-03-18hwpfilter: why isn't that path string null terminatedMichael Stahl
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)
2022-03-18ofz#45524 string is presumed to be at least length 1Caolán McNamara
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)
2022-03-16Bump version to 6.4.0.6Thorsten Behrens
Change-Id: Ibeef3d390985232ea12bbbf6df5478323201a923
2022-03-11ofz: Too many hatch pointsCaolán McNamara
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>
2022-03-11clamp and add some logging like SvmReaderCaolán McNamara
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>
2022-03-11compare authors using ThumbprintCaolán McNamara
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>
2022-03-10ucb: add webdav configuration settingMichael Stahl
Change-Id: Ifc98baec69e32d231e44b389a870e90debd5a389
2022-03-10Fix Python deprecation warningsStephan Bergmann
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)
2022-03-10desktop: rr --ignore-nested was renamed to --nested=ignoreMichael Stahl
Change-Id: Id1c1789c24b8eec27db0b24e1e43e2eb7d562509 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106291 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins (cherry picked from commit 1ab938155c875e65470b9f6b3b3ef65885462f7a)
2022-03-10ucb: webdav-curl: add sources to Library_ucpdav1.mkMichael Stahl
Change-Id: I040e18ae4ddca11d1ed7303fce5d343d36c1c3b0
2022-03-10ucb/neon: create instances with uno constructorsNoel Grandin
See tdf#74608 for motivation. Change-Id: Ia86a4cc06819ce5820ab44d293790f7bd9a03711 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99224 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit f3f0d05f72d8dbd9717910b4d6b42c54be3e106f)
2022-03-10expand out an UNO macroNoel Grandin
to make the ongoing convert-to-UNO-constructor work easier Change-Id: I99596561832b10538505cf4dfdabaf11d6e4d7cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98664 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 15f44cb6fbf2459dca522e4f5b7f525fd1d6c5e7)
2022-03-10ucb: webdav-curl: demodernize code so it buildsMichael Stahl
Change-Id: Ic12c38be4426d7cb3c4134585df34a7107e8f4ce
2022-03-10Revert "TODO: does it need own component file?"Michael Stahl
This reverts commit 06e4c6fd51f60f1f7d474ede321fe031cde0b3ca.
2022-03-10Allow making SAL_LOG based output fatalJan-Marek Glogowski
This introduces the [+-]FATAL marker for SAL_LOG. This way you can set part of the matching SAL_LOG string to std::abort on match. The example "SAL_LOG=+FATAL+WARN.vcl.scheduler-FATAL+INFO" will abort for any "+WARN.vcl.scheduler" match, but will just print all additional "+INFO" logs. Change-Id: Ib77f194a78f5165e6c885c82374ae41293815ee9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97651 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit b9d93fc47b2489764e251a11572fccef872df4e9)
2022-03-10Introduce o3tl::string_view.hxx approximation of C++17 <string_view>Stephan Bergmann
...and use it in configmgr/source/writemodfile.hxx Change-Id: Ie683dc21010ed45cc454ff89bea0376994b351f2 Reviewed-on: https://gerrit.libreoffice.org/36270 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 50057a37a877213d935958d5c643fde1434d680c)
generated by cgit (git 2.34.1) at 2024-06-22 04:31:37 +0000