summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* python3: upgrade to release 3.8.19distro/lhm/libreoffice-6-4+backportsMichael Stahl8 days2-3/+3
| | | | | | | | | | Fixes CVE-2023-6597 and also CVE-2024-0450 Change-Id: Iebca2608e16a966356736201c63f1be5185430d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165053 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 0633e4b4205334dd65ec64d7f3e306ee125e31be)
* helpcompiler: suppress deprecation warningMichael Stahl2024-03-041-1/+7
| | | | | | | | | Commit 77cb90532d14d5035990d078977fce7b407c4fad removed these 2 lines but i don't want to check if the "I can find no difference in our output help dir with these removed" is true also in this older branch so suppress the warning instead. Change-Id: I35865e3accd018462ef4d65c8c11fb914f53ac38
* Use SAL_WNODEPRECATED_DECLARATIONS_(PUSH|POP)Mike Kaganski2024-03-024-77/+16
| | | | | | | Change-Id: I2810d22e8f5e1c81647b9e9b15519de65939630a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163895 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
* tdf#158302 fix build against system-libxml-2.12Miklos Vajna2024-03-0220-14/+32
| | | | | | | | | | | | | | | Seen in a fedora:40 container, using --with-system-libcmis, --with-system-liblangtag and --with-system-xmlsec. Change-Id: I9d748d3dc0b70dbfdfcb6b99c9ce8440bda6f326 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159980 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit c8f7408db73d2f2ccacb25a2b4fef8dfebdfc6cb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161661 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 764890a53cea2ccb6d2fb6d8c7edb5e1c91ecdc0) (cherry picked from commit 81cc1e539114cf826f82c3d3718fe0dfacf66a9a)
* tdf#149639 Missing #include <stdint.h> in various external codeStephan Bergmann2024-03-024-0/+43
| | | | | | | | | | | | | | | | | ...which is a problem presumably since GCC 13 trunk <https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=6f038efd93593da6e661b829d1bd3877e75550f1> "libstdc++: Avoid including <cstdint> for std::char_traits". (All the broken C++ code used unqualified uintptr_t etc. rather than std::uintptr_t etc., so I deemed it more appropriate to include <stdint.h> rather than <cstdint>.) Change-Id: Id9dfc383c5986126a425971c4557b90ac45ac963 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134760 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 1e51a325a8e21eb5f900336a0c9e1bd78ed330ab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136163 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* std::size/SAL_N_ELEMENTS also counts the null terminatorCaolán McNamara2024-03-021-4/+4
| | | | | | | | | | | | | | which libxml2 2.12 will fail on with error: 'Extra content at the end of the document' Change-Id: I9d5da9fdd826cce8462ede8c510eaea7281b760f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161627 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit cbb17a548b5cc6a99b6ed7735479bb4f2bc40f26) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161643 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* Missing includeStephan Bergmann2024-03-0216-0/+42
| | | | | | | | | (for std::unique_ptr, with recent libstdc++ 12 trunk) Change-Id: I61b7823dd740ea7cdfe0d7403a50ac73b24d1c4e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120229 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* Revert "tdf#159502 remove --without-system-libxml from LibreOfficeLinux.conf"Thorsten Behrens2024-02-271-0/+1
| | | | This reverts commit f16d1ea1c7da64022077a9c4544aa11768029a0e.
* tdf#159502 remove --without-system-libxml from LibreOfficeLinux.confMichael Stahl2024-02-221-1/+0
| | | | | | | | | | | | configure.ac explicitly excludes libxml from --without-system-libs but this distro-config "helpfully" adds it explicitly, when the system already contains a usable libxml/libxslt anyway. Change-Id: I79d65d9ed9185277ffde8624efc152b290a6ffb3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163438 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 6f6364e572a0570fb097fec098314bffadc5b474)
* libxml2: upgrade to release 2.12.5Michael Stahl2024-02-221-2/+2
| | | | | | | | | | | | | Fixes CVE-2024-25062 Change-Id: I0e98fd919328e9633a602c4872de0b06eb972cc0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163734 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 4c3ee61e3eda0cbfd812443f80af89aa3a24ac73) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163753 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit ca089311678ca6f84771c145178bf4153243ed45)
* upgrade libxml2, libxslt & liblangtagCaolán McNamara2024-02-226-10/+59
| | | | | | | | | | | | | | | | | | | | what I'm really after is some vexating not-reproducible oss-fuzz msan warnings when using libxml2 in the fodt2pdf fuzzer. So lets upgrade libxml2 to the latest, which requires bumping libxslt, and then requires a newer liblangtag because of no longer implicit includes that it depended on. xmlKeepBlanksDefaultValue and xmlSubstituteEntitiesDefault are deprecated, we should get around to updating those uses Change-Id: I8fda0dffda0a7ea65407d246a3121875cb8ad4a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161598 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 6875c975f80d8b813b1829a530162869a1e2d92e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163751 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 050a2db3964d5f02e2dd149cb7f76342457a6719)
* Fix Linux --without-system-libxml buildStephan Bergmann2024-02-221-1/+1
| | | | | | | | | | | | | | ...after 362dfc50a28a918ec73609a00d2851eb3058375d "libxslt: upgrade to release 1.1.38" Change-Id: Id0ebf5676f79c43bb4fab3a33a2a19e303881aef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153942 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit d1fc1c326470461def5ab092a311afee31950880) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154000 Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp> (cherry picked from commit 2808d5a6874d5956d99e02feb0fbf55a7343d63c)
* libxslt: upgrade to release 1.1.38Taichi Haradaguchi2024-02-222-3/+3
| | | | | | | | Change-Id: I0534d7e02c9486b3d58f56e1a26fe6846b4a20b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153874 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp> (cherry picked from commit 362dfc50a28a918ec73609a00d2851eb3058375d)
* external/libxml2: Fix missing external symbols needed by xmllintStephan Bergmann2024-02-221-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 5b42f148e206cda19467e76c2f9915fc2b6fa5f6 "ExternalProject_libxml2 still needs to build the xmllint executable" (which I had happened to prepare on macOS, so didn't originally notice the issue addressed here now), Linux builds like <https://ci.libreoffice.org/job/lo_callgrind_linux/13374/> started to fail with > CCLD xmllint > /opt/rh/devtoolset-11/root/usr/libexec/gcc/x86_64-redhat-linux/11/ld: xmllint-xmllint.o: in function `testSAX': > /home/tdf/lode/jenkins/workspace/lo_callgrind_linux/workdir/UnpackedTarball/libxml2/xmllint.c:1646: undefined reference to `xmlNewSAXParserCtxt' > /opt/rh/devtoolset-11/root/usr/libexec/gcc/x86_64-redhat-linux/11/ld: xmllint-xmllint.o: in function `myReallocFunc': > /home/tdf/lode/jenkins/workspace/lo_callgrind_linux/workdir/UnpackedTarball/libxml2/xmllint.c:357: undefined reference to `xmlMemSize' > collect2: error: ld returned 1 exit status > make[2]: *** [Makefile:1007: xmllint] Error 1 > make[1]: *** [/home/tdf/lode/jenkins/workspace/lo_callgrind_linux/external/libxml2/ExternalProject_libxml2.mk:37: /home/tdf/lode/jenkins/workspace/lo_callgrind_linux/workdir/ExternalProject/libxml2/build] Error 1 Turns out that those two functions have been introduced after the previously used libxml2 2.10.4. No idea how things are supposed to work (given that workdir/UnpackedTarball/libxml2/libxml2.syms starts off with "Retained for backward compatibility. Don't add new symbols.", it appears that there should be some other mechanism at play to make xmllint on Linux find the libxml2.so symbols it needs, but which doesn't work as intended in our build), but just add those two symbols to libxml2.syms for now. (With a new version named LIBXML2_2.11.4, even if the symbols can actually have been introduced in some other version between 2.10.4 and 2.11.4, but who cares.) Change-Id: Ib9d5c7901fe94b8014a87b049fc27ef5658fd954 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152292 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 7d9b3393e2632247624d8a1e3129365290d1b60b)
* ExternalProject_libxml2 still needs to build the xmllint executableStephan Bergmann2024-02-221-1/+1
| | | | | | | | | | | | | | | | | | No idea why fd6cbd983a3021d22321854d0414bdc42c6cb1b7 "upgrade to libxml2-2.11.4" started to only explicitly make libxml2.la (the commit message doesn't say), but that caused at least <https://ci.libreoffice.org/job/lo_ubsan/2788/> to fail with > make[1]: *** Deleting file '/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/CustomTarget/sfx2/classification/example.validated' > [build VAL] CustomTarget/sfx2/classification/example.validated > /bin/sh: /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/libxml2//xmllint: No such file or directory > make[1]: *** [/home/tdf/lode/jenkins/workspace/lo_ubsan/sfx2/CustomTarget_classification.mk:20: /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/CustomTarget/sfx2/classification/example.validated] Error 1 Change-Id: I7e7aa2bae05cf8674720cfd72c78840cd7a28919 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152256 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5b42f148e206cda19467e76c2f9915fc2b6fa5f6)
* upgrade to libxml2-2.11.4Caolán McNamara2024-02-229-7/+35
| | | | | | | | | | | | | | | | | | | 'checked' field removed with: https://gitlab.gnome.org/GNOME/libxml2/-/commit/ce76ebfd1312459951d555ad9d87fb9a89eede55 win32 'run_debug' removed with: https://gitlab.gnome.org/GNOME/libxml2/-/commit/59f2f60e3eff07324f1c7cd861a444d714be750b add libxml2-XMLCALL-redefine.patch.0 to avoid: UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): error C2220: the following warning is treated as an error UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): warning C4005: 'XMLCALL': macro redefinition UnpackedTarball\expat\lib\expat_external.h(69): note: see previous definition of 'XMLCALL' Change-Id: Ia9b1540dc1b4eccf91662c8d995c036f71de6fc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152176 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit fd6cbd983a3021d22321854d0414bdc42c6cb1b7)
* upgrade liblangtag to 0.6.3Caolán McNamara2024-02-225-53/+6
| | | | | | | | | | | | | | langtag-valencia.patch.0 merged as: https://bitbucket.org/tagoh/liblangtag/commits/fe35532a0b98d5a8179b9edee0d61ea8db9b5921 external/liblangtag/Wformat-overflow.patch redundant since: https://bitbucket.org/tagoh/liblangtag/commits/49135ef561f309078f0bfd6e1f15052769cf75b4 Change-Id: Ieeb19679837f03a6938c97f069d6fb1e6dd9a30d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123890 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3667da75208e6ccc6deb927555c861ddb3d34dd5)
* Expat: upgrade to release 2.6.0Taichi Haradaguchi2024-02-163-2/+52
| | | | | | | | | | | | | Fixes CVE-2023-52425 and CVE-2023-52426. Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp> (cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163393 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 0ba4dfa1000a9177f1ea855ec4ffaddf7fc44c19)
* nss: upgrade to release 3.98Michael Stahl2024-02-162-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes CVE-2023-5388 Also update README, and remove obsolete documentation of Debian's mangled SONAME; relevant Debian changelog: nss (2:3.13.4-2) unstable; urgency=low * debian/control, debian/libnss3*, debian/rules, mozilla/security/coreconf/*, mozilla/security/nss/lib/*/manifest.mn: Move to unversioned library. ABI compatibility is ensured upstream, and the SO version, if it needed a change at any time, would be a change in the library name. There is no reason to keep making compatibility more difficult with other distros and upstream binary releases. While previous versions were one-way compatible (binaries built against other distros or upstream nspr could work on Debian), this approach works both ways. -- Mike Hommey <glandium@debian.org> Thu, 17 May 2012 09:45:36 +0200 Change-Id: Ifc1eae68827fa88ae001a3903c8555af67b488ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163494 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit cd94b0af38d712fa6eb0e0f43ce13ac6e72535d9)
* nss: upgrade to release 3.97Andras Timar2024-02-161-2/+2
| | | | | | | | | | | Change-Id: If0eaf6a93f57239d81491c635922745bf3f38fd5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163410 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit f25b7efba56757b085f7a836f57d9c2fc8fd14b8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163408 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 85c6a7a4944efa5b91e25a35860997e254d35f4c)
* nss: upgrade to release 3.90Taichi Haradaguchi2024-02-161-2/+2
| | | | | | | | | | | Change-Id: Ic446f33abd5355886b8c8c181a088c07ea4605c1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153096 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 3f6bb9565d4edce563dbd938c655ae853926d362) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153083 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit ead11155b611a355d0f4bfa91454b345a0cd15e0)
* curl: add patch for CVE-2023-46218Michael Stahl2023-12-112-0/+49
| | | | | | | | Change-Id: I215bcc26b87d638189423eeaaa6c5b8d5b146bd4 (cherry picked from commit 2eba604fdae1bf5b8432b764b3cafe5072cc5fe6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160594 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* No FrameWeld yet on ViewFrameThorsten Behrens2023-12-071-1/+1
| | | | | | This was only added via https://gerrit.libreoffice.org/c/core/+/113795 Change-Id: Ibe7c57c83a5c6fe0fd3b6f8e7682811e3549e0bd
* CppunitTest_desktop_lib: adjust asserts so this works againMiklos Vajna2023-12-071-2/+4
| | | | | | | | | Change-Id: Id6aba3d9203e3fe4e95771a895d1de50a2030908 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159990 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit ececb678b8362e3be8e02768ddd5e4197d87dc2a)
* we can have just one LoadURL for writerCaolán McNamara2023-12-072-6/+1
| | | | | | | | Change-Id: Ia0162ee1c275292fcf200bad4662e4c2c6b7b972 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159557 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 521ca9cf6acbae96cf95d9740859c9682212013d)
* combine these hyperlink dispatchers into one callCaolán McNamara2023-12-073-3/+8
| | | | | | | | | | | | Conflicts: sw/source/uibase/shells/drwtxtex.cxx sw/source/uibase/wrtsh/wrtsh2.cxx Change-Id: Icb7822e811013de648ccf2fbb23a5f0be9e29bb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159489 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 0df175ccc6ea542bc5801f631ff72bed187042eb)
* reuse AllowedLinkProtocolFromDocument in writerCaolán McNamara2023-12-071-5/+5
| | | | | | | | | | | Conflicts: sw/source/uibase/wrtsh/wrtsh2.cxx Change-Id: Iacf5e313fc6ca5f7d69ca6986a036f0e1ab1f2a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159488 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 32535dfa82200b54296838b52285c054fbe5e51d)
* check earlier on loading ole objects if parent doc is untrusted refererCaolán McNamara2023-12-071-8/+14
| | | | | | | | | | | Conflicts: embeddedobj/source/commonembedding/persistence.cxx Change-Id: Ib1169d5c40ca87f789c71b48124754e073895fcd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158054 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 7273de2730022deb37a8c7f2fedbe7fc4551f9b5)
* retain Referer information available in OCommonEmbeddedObject ctorCaolán McNamara2023-12-072-2/+2
| | | | | | | | | | | | Conflicts: embeddedobj/source/commonembedding/persistence.cxx svx/source/unodraw/unoshap4.cxx Change-Id: I2cb901e81de3b7db73cd2088348ddad46ae603dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158052 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 267be127f2899f2e1b1f15b5a06707a9b83fcab4)
* add referer to ole objectsCaolán McNamara2023-12-077-30/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so we can identify what document is requesting their contents extends: commit 5668e73beb30b95abc6520b7432c54972ca3ab2c Date: Wed Nov 20 14:43:45 2013 +0100 avmedia: Implement "block untrusted referer links" feature See f0a9ca24fd4bf79cac908bf0d6fdb8905dc504db "rhbz#887420 Implement 'block untrusted referer links' feature" for details. This adds some further /*TODO?*/ comments, and one known problem (marked /*TODO!*/) is that movies/sounds are not blocked during a slideshow presentation. to these objects too, namely OLE2Shape and derivatives AppletShape, FrameShape and PluginShape so in paranoid mode we won't load the contents of such objects from documents considered "untrusted". Conflicts: include/svx/unoshape.hxx reportdesign/source/core/sdr/ReportDrawPage.cxx svx/source/unodraw/shapeimpl.hxx svx/source/unodraw/unopage.cxx svx/source/unodraw/unoshap4.cxx xmloff/source/draw/ximpshap.cxx Change-Id: I6d988035d0cd09fd3fade5f6885fe336c95579ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156598 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 125cf1525361c6cd699574f60b4cf12868188568)
* reuse AllowedLinkProtocolFromDocument in impress/drawCaolán McNamara2023-11-241-11/+18
| | | | | | | | | | | | | | Change-Id: I73ca4f087946a45dbf92d69a0dc1e769de9b5690 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159843 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit f0942eed2eb328b04856f20613f5226d66b66a20) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159759 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159884 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org>
* reuse AllowedLinkProtocolFromDocument in writerCaolán McNamara2023-11-245-52/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reorg calc hyperlink check to reuse elsewhere Change-Id: I20ae3c5df15502c3a0a366fb4a2924c06ffac3d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159487 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit e6a7537762e19fde446441edd10d301f9b37ce75) reuse AllowedLinkProtocolFromDocument in writer Change-Id: Iacf5e313fc6ca5f7d69ca6986a036f0e1ab1f2a0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159488 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 32535dfa82200b54296838b52285c054fbe5e51d) combine these hyperlink dispatchers into one call Change-Id: Icb7822e811013de648ccf2fbb23a5f0be9e29bb0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159489 Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 0df175ccc6ea542bc5801f631ff72bed187042eb) we can have just one LoadURL for writer Change-Id: Ia0162ee1c275292fcf200bad4662e4c2c6b7b972 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159557 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 521ca9cf6acbae96cf95d9740859c9682212013d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159858 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit e32b8601dbd63cf01497889601d6c9c1241106d6)
* default to ignoring libreoffice special-purpose protocols in calc hyperlinkCaolán McNamara2023-11-249-7/+59
| | | | | | | | | | | | Change-Id: Ib9f62be3acc05f24ca234dec0fec21e24579e9de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158911 Tested-by: Jenkins Tested-by: Caolán McNamara <caolan.mcnamara@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit b6062623b4d69c79e90e9365ac7c5e7f11986793) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159045 Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 672716d09c54cb6fdd59baa7da4b8393cf104cd2)
* warn about exotic protocols as wellCaolán McNamara2023-11-244-4/+5
| | | | | | | | | | | Change-Id: I50dcf4f36cd20d75f5ad3876353143268740a50f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151834 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 1305f70cff8a81a58a5a6d9c96c5bb032005389e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159034 Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 2e1bcbb550d54278b366ec619cc5280d44d6aba4)
* add some protocols that don't make sense as floating frame targetsCaolán McNamara2023-11-243-1/+17
| | | | | | | | | | | Change-Id: Id900a5eef248731d1184c1df501a2cf7a2de7eb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158910 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit 11ebdfef16501c6d35c3e3d0d62507f706557c71) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158900 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit bab433911bdecb344f7ea94dbd00690241a08c54)
* escape url passed to gstreamerCaolán McNamara2023-11-241-5/+9
| | | | | | | | Change-Id: I3c93ee34800cc8563370f75ef3ef6f8a9220e6ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158894 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit f41dcadf6492a6ffd32696d50f818e44355b9ad9)
* curl: fix socks return error if hostname too long for remote resolveThorsten Behrens2023-10-122-0/+135
| | | | | | | | | This fixes https://curl.se/docs/CVE-2023-38545.html Change-Id: Id70486c8ec4e7754e7a07d81b22702e435ce6727 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157830 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* poppler: upgrade to release 23.09.0Michael Stahl2023-09-274-20/+19
| | | | | | | | | | | | | | | | | Fixes CVE-2023-34872 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157247 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 3d31dfa9b99d0df5e400c1a6d7e8df6c46129b3c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157253 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 6d1c0e802eaefa1c42051c1456be61cef2dc2e86) Change-Id: I289b3016695a01aff7d393cb09d66cd726d9b592 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157293 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* poppler: upgrade to release 23.06.0Taichi Haradaguchi2023-09-277-39/+132
| | | | | | | | | | | | | | | | | | | | Add external/poppler/disable-nss-and-gpgmepp.patch.1 to get rid of some code that requires NSS or GPGMEPP. Update external/poppler/inc/pch/precompiled_poppler.hxx. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153097 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp> (cherry picked from commit 27e1c198a504deb4634f5f6673a77b5944c9f8cc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157252 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 038bd4f5bd878bedda8cfee9cad2c28dba482d79) Change-Id: I5e61371776c64962452022516446b5079c3840e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157292 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* poppler: upgrade to release 23.03.0Taichi Haradaguchi2023-09-275-32/+129
| | | | | | | | | | | | | | | | | * Upgrade poppler-data to 0.4.12 * Update poppler-config.patch.1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148842 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 79e60bb93f69370f23010adb078b5a5de5a1e7b2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157251 (cherry picked from commit 8aa3645801c48f0db4a7fe4f126c4e4e7691cb08) Change-Id: Ic2a3e8d4f801d52d1568210d0df064cacb51290f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157291 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* poppler: upgrade to release 22.12.0Taichi Haradaguchi2023-09-273-10/+10
| | | | | | | | | | | | | | | | | | | | | | | Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143977 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 1ec7f8b5b21bf74f684095b97a2b9900a71a0979) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144066 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit b0c879d8f43f3266ce33eb5f20c08cf33c9734aa) fix poppler build * Update POPPLER_VERSION in poppler-config.patch.1 Change-Id: Iba770e6a3036a091925997025d4528f1d855da5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149795 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 36034a942ad90e9bde04b5d4172e5541bbc58563) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157290 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* libtommath: upgrade to release 1.2.1Michael Stahl2023-09-271-2/+2
| | | | | | | | | | | | | | | Fixes CVE-2023-36328. Change-Id: I1193f5df789c7dd10855e35936fc2697697c464e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157246 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 3daab618c759be2b93ad337061ef347c76229a22) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157249 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 00839def1c1d28067653a738e04d586bb9778433) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157289 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* LibTomMath: upgrade to release 1.2.0Taichi Haradaguchi2023-09-275-33/+3
| | | | | | | | | | | | | | | | * external/libtommath/clang-cl.patch: removed "typedef unsigned __int128 mp_word" from tommmath.h * external/libtommath/libtommath-msvc.patch: fixed upstream Change-Id: I38fe730ff0e9649c6a0ad8d64b723a27e3434012 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153871 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001722@ymail.ne.jp> (cherry picked from commit 13bc0489d98b1f49a4f82fccb89d640439db4f4e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157248 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit c2f87ac01cad03e286ebb304a32b785f1dac7b60) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157288 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* python3: upgrade to release 3.8.18Michael Stahl2023-08-282-3/+3
| | | | | | | | | | | | Fixes CVE-2023-40217 Change-Id: Ie08af471009b7f5c42aa6875dd4f9d886ad1d617 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156183 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit c1586ef57b5770f80ef200ab38ff4538c2dfb145) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156202 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#156551 tdf#150606 sw: layout: only invalidate SwTabFrame if it...Michael Stahl2023-08-103-3/+29
| | | | | | | | | | | | | | | | | | | | | | ... wants to move back. In this document, the table 1709 splits across 3 columns of the section 1702 with 1 row each, and when its follows are invalidated in CalcContent(), the later SwTabFrame::MakeAll() of the 1st follow joins the 2nd follow and invalidates the size of the section frame, causing a loop. So only invalidate if that actually looks necessary. (regression from commit 59987d3c77ec7dbf59fbea9f47cc226f4e8903f9) Change-Id: I360c8f697a7666a19a08d8ebcabbcfa3a7cdf844 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155452 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit a9b19f78f3cdcbf5c949a85b45877e903114cc54) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155456 Tested-by: Michael Stahl <michael.stahl@allotropia.de>
* tdf#104382 - Menus should be disabled when they have no enabled submenusBalazs Varga2023-07-313-2/+46
| | | | | | | | | | | | | | | Disable menu elements if they only have disabled submenu elemets. TODO: GTK3 cherry-pick from commit: 630303ad8e94bd634b98e691935a1f4c19582a3a Change-Id: I83cdc58846afd61719ceeba9f993df894ce6fd01 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154938 Tested-by: Jenkins Reviewed-by: Balazs Varga <balazs.varga.extern@allotropia.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155010 Tested-by: Gabor Kelemen <kelemeng@ubuntu.com> Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>
* tdf#137972: when correcting PaMs, move them to the endMike Kaganski2023-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The cursor position is pushed in SwView::ExecSpellPopup, and popped in the end, to restore the changed position e.g. when the action is cancelled. In the replacement, the PaM of the pushed cursor is updated in DocumentContentOperationsManager::ReplaceRangeImpl, likely to avoid several updates during the further processing. The stated goal is to move all PaMs out of the deleted range, but the direction is not stated explicitly. If this correction is removed, the cursor PaM gets corrected anyway, and arrives at the end of the replaced text. So, to fix the bug, and to be compliant with the default case, let's correct to the end of the range, instead of the random direction (GetPoint() may return a position at either end, depending how PaM was created). Change-Id: I83bcf01bcc0bf7277a9a34263b524b1212785814 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151462 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 4f93995f2262cde0b16bacc83f4ba3c6161ada7f)
* tdf#156077 sw: layout: call AssertFlyPages() in Init()Michael Stahl2023-07-173-0/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The bugdoc has 3 pages, and there are at-page flys anchored to the 3rd page, and these are not displayed - simply missing from the layout. In LO 6.1, this worked because the layout-cache was read from the file, and 3 pages were created in SwRootFrame::Init() calling InsertCnt_(). But now this creates only 2 pages, and later SwLayAction creates the 2nd page between the existing ones on some MoveFwd(), but despite page nr 2 becoming page nr 3 nothing attaches the at-page flys to the now-page-3. If a document is loaded containing at-page flys, then all pages that have flys anchored to them should be created in SwRootFrame::Init() already. (regression from commit 7e8b4756d95057f069467b34e7849f9354856578) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153720 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit ff8ec4cfe5df1e15c3e9f6adc843dfe31358e097) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153699 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit c34e72ff817b07403f908a9098dd513b96c30ad1) Change-Id: I4792c483a7620efd81211e6ad0d9220152367d68
* tdf#152983 sw: layout: fix crash in SwContentFrame::Cut()Michael Stahl2023-07-173-2/+9
| | | | | | | | | | | | | | | | | | | Surprisingly, SwContentFrame::Cut() is called in a situation where the frame is not connected to any SwPageFrame yet - it is in a follow fly of a fly chain that is anchored in a footer, and SwFlyFrame::ChainFrames() removes it. (regression from commit b9ef71476fd70bc13f50ebe80390e0730d1b7afb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152510 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit d3b64de9581bd5e36ced007ff2e9139bd0343a35) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152533 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> (cherry picked from commit ce863cf085e093e7385818a7d6d598a161e33a28) Change-Id: Iad84b7b422126e050493dc3b181d47c4dca2fae2
* sw: fix null derefs of GetCurrShell()Xisco Fauli2023-07-171-2/+3
| | | | | | | | | | 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)