summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-07-17sw: fix null derefs of GetCurrShell()Xisco Fauli
See https://crashreport.libreoffice.org/stats/signature/SwContentFrame::Cut() Change-Id: I00267b480d9c123f68996572d2e6fdebc4fb383f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136834 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit f5ca3291e4f2c25fbff49301d6f3a7ed0017a708)
2023-07-17tdf#150606 sw: layout: leave follow SwTabFrame invalid in columnsMichael Stahl
With the minimised bugdoc, on Undo, some 12 or so pages are created, and the end of the deleted table is shown in the document view. So first the last pages are layouted, and then once those are done layout proceeds from page 1. The problem is that on page 9, a table remains in the 2nd column of the section, and there is nothing in the 1st column and on pages 5-8. This is because ::CalcContent() is the last thing that formats the table on page 9, and it explicitly disables MoveBwd() for follow tables via m_bLockBackMove. That appears to be intentional but because it's already been there since initial CVS import it's unclear why; it might be based on the assumption that a previous column would have moved over rows from the follow table already. Try to encourage the table to try to MoveBwd() at a later time, when it's being formatted from the SwLayAction::FormatContent_() loop, which appears to help. (somehow regression from commit 723728cd358693b8f4bc9d913541aa4479f2bd48) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152485 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 5a739d98d0efa5be2130b7d758d494012abc87b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152446 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 560b94971b656914d17c9d1befdad2dbd3f1119a) Change-Id: I421525269948aa58888f5302e6db234c89230f00
2023-07-14tdf#144494 sw: fix layout loopMichael Stahl
There is a pre-existing loop here, where page 1 is layouted, the text frame splits due to the fly taking up space, page 2 is layouted, the fly moves to page 2 (invalidating page 1) and thus the text frame splits again, page 1 is layouted, happy to see all the free space, and joins all its follows. Previously this was eventually terminated by layact.cxx:639 calling SwLayouter::LoopControl() and this force-validates page 1, resulting in page 1 having the fly (which is actually anchored at the end of the text frame, on page 2). Now the CheckPageDescs() discovers that page 3 doesn't have any content, and deletes it; this causes it to be re-created on every iteration of the loop and somehow the SwLayouter now doesn't detect the loop. But the call that deletes the page 3 is actually unnecessary: the text frame does have a SwPageDescItem - but it is itself a follow, where break items doesn't matter anyway - so just check for this to get back to the previous layout result. (regression from commit b9ef71476fd70bc13f50ebe80390e0730d1b7afb) Change-Id: If15c31278bd36e51c64090a288e8bd1ab6753dd7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151680 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit ac9500105cc72d84ce120fd1dc125329aadb63a0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151618 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 5af29292af4564357b18610467d69ac35ad8271c)
2023-06-26Update pdfium to 5778Miklos Vajna
- external/pdfium/abseil-trivial.patch is no longer needed, upstream does what we did previously - external/pdfium/build.patch.1: re-generate with 'patch -p1' + 'git diff' - external/pdfium/include.patch is no longer needed, upstream does what we did previously Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152244 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit dc69e7c52f12f57197f26b56c968139186d4ed5b) Change-Id: I39a6f721e436aa53914bbf43b78ac7d86e5eac59
2023-06-26Update pdfium to 5636Miklos Vajna
Some changes in the bundled libtiff, but it seems that would be for XFA which we disable, so it doesn't affect us. Change-Id: Ibadeecf20daec342fbfef6d1e89bd17f5f0095e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148652 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 47afcad0d599009c38b4597c27558ec2af58b7f8)
2023-06-26Update pdfium to 5522Miklos Vajna
The internal libpng 1.6 is now dropped, but that doesn't really affect us. Change-Id: I777c024c76c17689c20bbe6453467ba5fb22baba Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145417 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 04fd7d0f53faa08c608034707ca4a459a162712d)
2023-06-26Update pdfium to 5408Miklos Vajna
- drop cg-instead-of-carbon.patch.1, no longer needed after https://pdfium-review.googlesource.com/c/pdfium/+/99753 - drop AndroidNDK19.patch.1, no longer needed after https://pdfium-review.googlesource.com/c/pdfium/+/96530 - drop gcc-c++20-comparison.patch, no longer needed after <https://pdfium.googlesource.com/pdfium/+/065698acf82962a3168a0d56bb1d5964bc593d00> "Fix interaction between RetainPtr<T> and transparent comparisons" since chromium/5321 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142474 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 5a69fd3052bb638857f30a4cfd5913634275d23d) Change-Id: I1f861dd8a3d490400bb39c108bd4e767a2f45d30
2023-06-26external: update pdfium to 5298Miklos Vajna
pdfium_arm64.patch.1 is now upstreamed as <https://pdfium-review.googlesource.com/c/pdfium/+/96010>. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139876 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit c97c60f70e9e6de594f7e0e0b85f17944c640dcf) Change-Id: Iafb1ba480161429094db5446ab50314068ae4cfc
2023-06-26external: update pdfium to 5187Miklos Vajna
build.patch.1 is extended to avoid: > C:/lo/master/workdir/UnpackedTarball/pdfium/third_party/libopenjpeg/openjpeg.c(438): error C2491: 'opj_decoder_set_strict_mode': definition of dllimport function not allowed and also is extended to avoid: > /opt/rh/devtoolset-7/root/usr/include/c++/7/bits/stl_tree.h:2028:5: note: no known conversion for argument 1 from ‘std::pair<fxcrt::RetainPtr<CPDF_Object>, std::unique_ptr<CPDF_PageObjectAvail> >::first_type {aka fxcrt::RetainPtr<CPDF_Object>}’ to ‘const CPDF_Object* const&’ Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137238 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit 92914312cfb36a86ceb6308a2966f033152fd927) Change-Id: Icacc05627a8612b33d6445685d26470e7c757b8e
2023-06-26external: update pdfium to 5058Miklos Vajna
Which started to use require __builtin_is_constant_evaluated(), which our baseline doesn't have, so patch that out for now. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134648 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 6a599ff57fb878c07353d93b476706acda6058f3) Change-Id: Idd1923291a933209d18bb677d011c9353c8f8c4d
2023-06-26external: update pdfium to 4933Miklos Vajna
Stop tracking build_config.h in our repo, it can be now part of the release tarball. It was a mistake in the past to think that this is generated code, it's just external code. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131695 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit 71b952340726190d1f178ef0dadfa89677f2c1dd) Change-Id: Ife2fed362e28c53859399244e2f1247efb1efe86
2023-06-26external: update pdfium to 4818Miklos Vajna
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128353 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit b24ef22fee1196a89750b92463cb0b7a541e83c9) Change-Id: I68751a7b6ca2c8c86a412a0fd401e0d0f172297b
2023-06-26pdfium: remove MSVC version checkMichael Stahl
Change-Id: Icbcaa159a317ad2701cfa3fb586d9d62c5a1690c
2023-06-26external: update pdfium to 4699Miklos Vajna
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125068 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit d4f0281f3127255b792a9ec492ba4a14d5ee64c2) Change-Id: I545adce0491e48fad2bfc4003695bd96cc911f22
2023-06-26svx: replace FPDFTextObj_GetFontNameMichael Stahl
Change-Id: Ib4e11f8aeee932160862d1b9a2b56068a90e9895
2023-06-26pdfium: missing includeMichael Stahl
Change-Id: I27091093dadc699317141a4dd3d5c80b51e56be6
2023-06-08vcl: yet another missing stdintMichael Stahl
Change-Id: Ie12eef1d47628f1fc36cce7d1a5767e89b415a97 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152715 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-06-08python3: upgrade to release 3.8.17Michael Stahl
Fixes CVE-2023-24329 and a few more obscure security issues. Change-Id: I4b073ce02c0377e2791e4593d20f2b756de0c8cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152696 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 734d53534a6ca023e9c2eb819cde889b01818f1b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152714 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
2023-05-02assume IFrame script/macro support isn't neededCaolán McNamara
seems undocumented at least Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151020 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit a10a5994bddf7646196ff45f6af598420d8663ad) Change-Id: I316e4f4f25ddb7cf6b7bac4d856a721b987207a3
2023-05-02put floating frames under managed links controlCaolán McNamara
like we do for sections and ole objects that link to their content individual commits in trunk are: extract a OCommonEmbeddedObject::SetInplaceActiveState for reuse no behaviour change intended Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150341 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 183e34a3f8c429c0698951e24c17844e416a3825) use parent window as dialog parent it makes no odds, but is more convenient for upcoming modification Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150342 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f93edf343658abd489bde3639d2ffaefd50c0f99) adjust IFrameObject so it could reuse mxFrame for a reload of content Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150343 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3a727d26fd9eb6fa140bc3f5cadf3db079d42206) query getUserAllowsLinkUpdate for the case of content in a floating frame similarly to how it works for the more common "normal" embedded objects Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149971 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 52aa46468531918eabfa2031dedf50377ae72cf7) add a route to get writer Floating Frame links under 'manage links' Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150349 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 8b8a2844addbd262befb1a2d193dfb590dfa20be) allow SvxOle2Shape::resetModifiedState to survive having no SdrObject Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150538 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 02379929bd0e1d1676635f0ca1920422702ebb7c) create the FloatingFrameShape in a separate step to inserting it this is derived from the path taken by the AddShape(const OUString&) function for this case. No change in behavior is intended. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150526 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit bafec47847a0b9697b3bbe9358e53f8118af3024) add a route to get calc Floating Frame links under 'manage links' much harder than writer because the organization and ordering of properties and object activation etc is different. This ended up ugly, but functions. We set FrameURL before AddShape, we have to do it again later because it gets cleared when the SdrOle2Obj is attached to the XShape. But we want FrameURL to exist when AddShape triggers SetPersistName which itself triggers SdrOle2Obj::CheckFileLink_Impl and at that point we want to know what URL will end up being used. So bodge this by setting FrameURL to the temp pre-SdrOle2Obj attached properties and we can smuggle it eventually into SdrOle2Obj::SetPersistName at the right point after PersistName is set but before SdrOle2Obj::CheckFileLink_Impl is called in order to inform the link manager that this is an IFrame that links to a URL Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150539 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 07179a5a5bd00f34acfa8a3f260dd834ae003c63) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150755 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit b91ea614c0b753ab3d378acd0e2db8262e9dbd72) bc5333b137d2da089b3b701ff615c6ddf43063d0 7eec3132a23faafd9a2878215a0a117a67bc9bf2 83e38dfa2f84907c2de9680e91f779d34864a9ad f90ff71d6a96342574799312f764badaf97980eb ea059262c124e3f44249e49b4189732310d28156 d09ae0c65a55a37743ad7c184070fb8dd97d8a7f 67fc199fef9e67fa12ca7873f0fe12137aa16d8f Change-Id: Ia1d12aa5c9afdc1347f6d4364bc6a0b7f41ee168
2023-05-02loplugin:flatten in sw/core/ole..sw/core/table [sw/source/core/ole/ndole.cxx]Noel Grandin
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99886 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit c9edb99bdc74715e7d952b2b95a4d75a73300207) Change-Id: If74f1cfca114d52566164656c34a0764cfbaad43
2023-05-02loplugin:flatten in svx/svdraw [svx/source/svdraw/svdoole2.cxx]Noel Grandin
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100233 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit bfc298d02ca6275588d5897d97ced9498a3e91aa) Change-Id: I8379e5ebaee2090d2b4dbd05d55b55000915cd7c
2023-05-02set Referer on loading IFramesCaolán McNamara
so tools, options, security, options, "block any links from document not..." applies to their contents. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150221 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150751 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit acff9ca0579333b45d10ae5f8cd48172f563dddd) Change-Id: I04839aea6b07a4a76ac147a85045939ccd9c3c79
2023-04-19libxml2: upgrade to release 2.10.4Michael Stahl
Fixes CVE-2023-29469 and CVE-2023-28484. Also: SAX2: Ignore namespaces in HTML documents which is probably the reason why one test fails, so switch it to parsing XML: HTML parser error : Tag reqif-xhtml:div invalid <reqif-xhtml:div> HTML parser error : Tag reqif-xhtml:table invalid <reqif-xhtml:table cellpadding="2" cellspacing="2"> ... reqif-table.xhtml: C:/cygwin/home/tdf/jenkins/workspace/gerrit_windows/test/source/xmltesttools.cxx:195:testReqIfTable::Import_Export equality assertion failed - Expected: 1 - Actual : 0 - In <file:///C:/cygwin/home/tdf/jenkins/workspace/gerrit_windows/tempdir/lu134607bxu8q.tmp>, XPath '/html/body/div/table/tr/th' number of nodes is incorrect Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150544 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit b28fd940ca46828be624679863364b4db89dd38c) Change-Id: Icc161b39515c996193366bc777a67eca79e4e892 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150635 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-04-19sw: disable testN830205 on this branchMichael Stahl
The problem is that since commit de49e1c55dc10ce1b59345af5cc49fde3adf65b7 "tdf#149548 sw: don't rely on binary search in SplitRedline()" the test asserts, but only with --enable-dbgutil: sw/source/core/doc/DocumentRedlineManager.cxx:110: void {anonymous}::lcl_CheckRedline(IDocumentRedlineAccess&): Assertion `std::is_sorted(rTable.begin(), rTable.end(), CompareSwRedlineTable())' failed. The elements 237/238 are not sorted by end position as they should be. They were disordered by a TextToTable() via SplitRedline(). This was not asserting before the commit was backported, but that was probably an accident. It's not obvious what fixed this because it doesn't happen on 7.4 or later. Change-Id: I866aee29ac58bd224c86ee29e020bf65d75355cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150634 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-03-22curl: upgrade to release 8.0.0Michael Stahl
Fixes CVE-2023-27535. Also hopefully fixes excessive storage consumption during build: o build: drop the use of XC_AMEND_DISTCLEAN [62] Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149153 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit bbe0d0534abe6480c4502ce8fb543a736d3399d8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149105 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 38b54a4d86e05bbbbdbf2a38771395579d1b005a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149108 Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 383128f262ea7fef7b6e372dc364a32d6cb0a7da) curl: upgrade to release 8.0.1 Apparently 8.0.0 had a serious regression. Change-Id: Icc761f5e5e01b5d9bebecc13f7cba608f5834f54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149204 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit e5005c76bd60a004f6025728e794ba3e4d0dfff1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149112 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit f2d935242665774f080bb13a2814988ad615f6e1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149321 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
2023-03-01curl: upgrade to release 7.88.1Taichi Haradaguchi
Fixes CVE-2023-23916, 2 CVEs that probably don't affect LO. Reference: https://curl.se/docs/security.html Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147977 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 6074d16b8c631e679a67364837d4ca9799731152) Change-Id: If9b3fc7c5ce66bfe1027caff39ea2c1cf55df7ad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148044 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-03-01curl: upgrade to release 7.87.0Taichi Haradaguchi
Fixes CVE-2022-43551 and CVE-2022-43552. https://curl.se/docs/CVE-2022-43551.html https://curl.se/docs/CVE-2022-43552.html Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145116 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 181806115a694ade32c7bba1abd9aa931b1a93b9) Change-Id: I979ed11c212aef226ad9f26420462e5f9dbe15e5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148043 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-03-01postgresql: upgrade to release 13.10Taichi Haradaguchi
Fixes CVE-2022-41862 Reference: https://www.postgresql.org/support/security/CVE-2022-41862/ Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147834 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit efff34d7bdccf210a5e878bd9bc4d35ec72b71ab) Change-Id: I6075838972fec1c091f3150b19c5da4dc80ad6d3
2023-03-01Always push a result, even if it's only an errorEike Rathke
PERCENTILE() and QUARTILE() if an error was passed as argument (or an error encountered during obtaining arguments) omitted to push an error result, only setting the error. Fallout from commit f336f63da900d76c2bf6e5690f1c8a7bd15a0aa2 CommitDate: Thu Mar 3 16:28:59 2016 +0000 tdf#94635 Add FORECAST.ETS functions to Calc Change-Id: I23e276fb0ce735cfd6383cc963446499dcf819f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147922 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147959 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2023-02-28Underflow assert also in already calculated pathEike Rathke
Change-Id: I7bd1c4960280a6526bb82e5b95c5253775df1e1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147937 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147958 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2023-02-28Teach symstore more duplicated DLLsThorsten Behrens
Amending commit b4dfba947768834ffecc09056992019878711c8b with adding the copied DLLs here, too (symstore complains otherwise) Change-Id: If5cc155cf2fe11b0f97cd152993609fd2c835316 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120686 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 133352645a8c10fc0d13795480a3c2f93c36a61f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147974 Tested-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2023-02-28Check iframe target for allowed document URLsSamuel Mehrbrodt
Change-Id: I00e4192becbc160282a43ab89dcd269f3d1012d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147921 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2023-02-21nss: upgrade to release 3.88.1Michael Stahl
Fixes CVE-2023-0767 CVE-2022-3479 Change-Id: I688dc7d0785ed3344c33e331c7e9ef37baa720ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147387 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 538975a0e511ad79a7dd3c71300b993d1554cd03)
2023-02-21nss: upgrade to release 3.86.0Taichi Haradaguchi
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143038 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a2969884af71e88d2541bd2bfdebea222876fef4) Change-Id: Ia236c7124d920785f7a2856db5ee1ccbef7a2d68
2023-02-21nss: update to release 3.83Taichi Haradaguchi
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140231 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 06c9e1d27093ca7bbe38a1eb93fbb85b80f75f75) Change-Id: Ic1cb36b3a56cde40296fd46ef356dea286932692
2023-02-21Stack check safety belt before fishing in muddy watersEike Rathke
Have it hit hard in debug builds. Change-Id: I9ea54844a0661fd7a75616a2876983a74b2d5bad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147205 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 9d91fbba6f374fa1c10b38eae003da89bd4e6d4b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147245 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 166a07062dd4ffedca6106f439a6fcddaeee5eb5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147391 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-02-21Obtain actual 0-parameter count for OR(), AND() and 1-parameter functionsEike Rathke
OR and AND for legacy infix notation are classified as binary operators but in fact are functions with parameter count. In case no argument is supplied, GetByte() returns 0 and for that case the implicit binary operator 2 parameters were wrongly assumed. Similar for functions expecting 1 parameter, without argument 1 was assumed. For "real" unary and binary operators the compiler already checks parameters. Omit OR and AND and 1-parameter functions from this implicit assumption and return the actual 0 count. Change-Id: Ie05398c112a98021ac2875cf7b6de994aee9d882 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147173 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit e7ce9bddadb2db222eaa5f594ef1de2e36d57e5c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147129 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d6599a2af131994487d2d9223a4fd32a8c3ddc49) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147390 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-02-15disable script dumpCaolán McNamara
Change-Id: I04d740cc0fcf87daa192a0a6af34138278043a19 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146986 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147051 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2023-02-08openssl: upgrade to release 1.1.1tMichael Stahl
Fixes CVE-2023-0286 CVE-2023-0215 CVE-2022-4450 CVE-2022-4304 Change-Id: I93ce0362b17bd07b0644564a0676daaa56bc8b50 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146653 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit f9229fdadbd205a8953577efc72a6e43717c764e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146660 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-02-08add three static lines beween tarballs to ease cherry-pickingMichael Stahl
Change-Id: Ieb79d58796e38c5ba67ee0c7ae4e1edeafef3345 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146659 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-02-08don't export entries from download.lst - only used by makeChristian Lohmaier
no need to plant that into the environment of every recipe. some Jenkins Windows builders already run into "environment is too large for exec" issue just by attempting a "xargs --show-limits </dev/null" from a dummy rule within the make environment Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144217 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit ec4409a911fd4a67eb1bc74aae33081ae8510339) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144325 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 70f0cf457bdd36e914f3e98cf027ee25a75df448) Cherry-pick part of commit d9617d5529e0da23bd8602d07ce459cc42746e02 to fix make module.clean. Change-Id: I321fa9075532eef62a7d4e33a08c272276de717e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146658 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2023-01-13Show LHM own BuildVersion without link to websiteIlhan Yesil
As the LHM specific build version has no valid link to the build website, the link to the website will be hidden. Change-Id: Id3da6a9fdf83348eae0b23d9ec7b5e141005b081 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145318 Tested-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2023-01-04tdf#135590 rotated paper sizes reported as portrait size they are notCaolán McNamara
since... commit ff4896a2af1df6138e9246fe1588dfe8c3748f1a Date: Fri Jun 29 11:36:03 2018 -0300 Sets paper sizes listbox in print dialog see as the above commit added some uses of doSloppyFit to vcl I imagine the calls there want to be able to match rotated paper sizes, but in the cases of tdf#135590 we don't want that behaviour because it doesn't match what the user is presented with, the width and height are swapped. So drop matching against swapped height/width by default, but let calls added in 'Sets paper sizes listbox in print dialog' continue to match rotated sizes. Change-Id: I34aeddf12a7ca22234fbc6394487d3c8da7772ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109792 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 9355d020e0b6bec6c6e08bd5155ed1428df5f674) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143696 Tested-by: Ilhan Yesil <ilhanyesil@gmx.de> Reviewed-by: Ilhan Yesil <ilhanyesil@gmx.de>
2023-01-04tdf#148109 Paint background color in listboxIlhan Yesil
The combobox described in 148109 is indeed a listbox. If drop down list is not open and only the selected item is shown without having the focus, the background color will be paint either it's defined as native control or not. Change-Id: I210916fbe07f74aaa5835bf2c88e764b010c6d61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131904 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit ff7e00e12ff80bd708f31a1d886d000907ceb31a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144991 Tested-by: Ilhan Yesil <ilhanyesil@gmx.de> Reviewed-by: Ilhan Yesil <ilhanyesil@gmx.de>
2023-01-02tdf#152508 Initiate container request size after call of createPageIlhan Yesil
As the container's request size of wizard pages can't be changed directly by the UNO call setPosSize, the UNO caller can set the size in the callback function createPage, this size will then taken as request size. This doesn't solve the problem entirely as descriped in tdf#152508, but the most important is, that the wizard page can be initialized with an appropriate size at startup. Change-Id: I1899da9c018681291559eb7c0de25a3e2e8af14e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144287 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit aef2ee893c7b76794bc9db869f08bbbea60606a8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144809 Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2022-12-30tdf#146875 sw: move also at-frame flys off SwPageFrameMichael Stahl
The bugdoc contains an at-frame anchored fly on page 77, which is anchored to an at-page anchored fly. While layouting page 74, the fly is moved to page 77, and the content on page 74 invalidated. Unexpectedly, calling RegisterAtPage on a SwFlyLayFrame does absolutely nothing, as it calls the base class SwFlyFrame, so the fly stays on page 74. Thus, page 74 never actually becomes valid, and later pages are never layouted. (regression from commit eb85de8e6b61fb3fcb6c03ae0145f7fe5478bccf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144631 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit abef9ea8aa99561e6f84451acf387abde4ec14ab) Change-Id: I4fcbed4daf83f9e554de5a877a40b2c2419c0f2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144759 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2022-12-16tdf#149548 sw: add unit testMichael Stahl
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144249 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 4cc101bfc362d4aea1ecc9136b20b73910fa0041) Change-Id: Ibb4eadc15f539ee2d4f030c6366c9abd92bc3823 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144290 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-12-16tdf#149595 sw: fix showing of fly at start/end of single-para deleteMichael Stahl
... with change tracking enabled. Corner case where there are no extents for the node but the deletion is in a single node (i.e. delete from node start to node end). Make this consistent with what happens without change tracking. (regression from commit 28b77c89dfcafae82cf2a6d85731b643ff9290e5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144109 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 80f4abfea971cf66259b65fe09366d31ed41809d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144133 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit db29e834d1a2859492a61c57fe1a5131c8ea10eb) Change-Id: Ib63c4108c86c36508e1a378824ab3511dc46ae47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144289 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2022-12-16(related: tdf#149595) sw: also re-sort SwSortedObjs on SwPageFrameMichael Stahl
... if SwTextNode content changes; for the unit test here we get: Error: elements in iterator range [first, last) are not partitioned by the predicate __comp and value __val. Also, the SwTextNode may have multiple text frames on multiple pages. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144108 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit c684301352bcca709bc8d1c99e0f08e7096e9716) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144131 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 2033a23379c0eb9d6de41c7b1473769fda2cc632) Change-Id: I05d4276e4b4b94fe3cd2cdfda3418ad51fa08f5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144288 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>