summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-04Bump version to 6.1.7.24cib-6.1-24Thorsten Behrens
Change-Id: I8eb044d0bb91d19ccf5b3d3c2e79da8d0fa4829d
2021-02-04Revert "Improve macro checks"Thorsten Behrens
This reverts commit 7df8b437b721b25561995346abfb55dca0d500b5.
2021-02-04postgresql: try to cargo-cult MSBuild argumentsMichael Stahl
Extremely unclear to me whether these are useful or necessary, but the other MSBuild ones have them. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a) Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1
2021-02-04Revert "postgresql: try to cargo-cult MSBuild arguments"Michael Stahl
This reverts commit 02c1cd9f93e5b5da469e9d6ff8668f415965ecfc.
2021-02-03Allow opt-out from document events checkSamuel Mehrbrodt
Commit b3edf85e0fe6ca03dc26e1bf531be82193bc9627 added a warning on load when a document binds events to a macro. This adds an option to restore the old behavior, so that the warning only appears when a document actually has Macros. Change-Id: I5ad398d3d503a0954a746f4cba150f68630b820c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108141 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2021-02-03postgresql: try to cargo-cult MSBuild argumentsMichael Stahl
Extremely unclear to me whether these are useful or necessary, but the other MSBuild ones have them. Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-02-03We don't support building with Windows SDK 7.1AMike Kaganski
... it's already impossible with 6.2; and was only needed prior to 6.0, where Windows XP support was needed. Change-Id: Ia462f0b6566ae35bd68545d2d34d2987ee7907b9 Reviewed-on: https://gerrit.libreoffice.org/75334 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Conflicts: configure.ac
2021-01-29Bump version to 6.1.7.23cib-6.1-23Thorsten Behrens
Change-Id: Ice98e3e1bb542bf0eade8e9efd913b8210a752c3
2021-01-29Improve macro checksSamuel Mehrbrodt
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109552 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 1dc71daf7fa7204a98c75dac680af664ab9c8edb) Change-Id: Ie40801df8866b52c1458e020ffa9cba120720af7
2021-01-25sw: WW8 import: filter control characters in GetFieldResult()Michael Stahl
Triggers the assert in SwSubFont::GetTextSize_() on ooo58234-1.doc, which has a field result with ^G cell separators that is converted to SwInputField, which inserts the field result into SwTextNode. Change-Id: Ibdb93390862a11462d62cf744bac912d6009777e Reviewed-on: https://gerrit.libreoffice.org/81788 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 3a9d504b01c061f60a915b5681c8313859294118)
2021-01-25ofz#18526 sw: WW8 import: don't insert control charactersMichael Stahl
Sanitize string before calling InsertString(). This segfaults since: commit b522fc0646915d4da94df38dd249c88b28f25be7 Date: Tue Sep 24 18:11:45 2019 +0200 sw: maintain fieldmarks in DeleteRange()/DeleteAndJoin()/ReplaceRange() Change-Id: I9ef73d924420686f6838fa21900ec57b4d25c905 Reviewed-on: https://gerrit.libreoffice.org/81949 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7ecda38cdaa2361e8510bf3e7206863c4936deab) Reviewed-on: https://gerrit.libreoffice.org/82759 (cherry picked from commit d494a4c0ead7db481757d8d67fbce9e1b02e65df)
2021-01-25sw: WW8 import: instead of control character insert '?' for footnoteMichael Stahl
SwWW8ImplReader::ReadChar() inserts a U+0002 control character to temporarily mark a footnote anchor; this is then deleted and replaced with a real footnote hint by SwWW8ImplReader::End_Footnote(). The assumption is that it is necessary to insert a placeholder character to be able to apply formatting to it. But if the document is corrupted, the control character could survive the import, which sounds less than ideal. So either make this magic character more explicit by documenting it in hintids.hxx and removing any outstanding ones at the end of the import, or use a non-offensive character instead; since this should only affect invalid documents, choose the solution with the least effort. Change-Id: I76d396258b32e0f0fb6393942a58a4dc57912211 Reviewed-on: https://gerrit.libreoffice.org/82760 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 13ba765c444713b0b0b2f4b4231bdafcbbef6ad0)
2021-01-25writerfilter: rtftok: filter control charactersMichael Stahl
... in RTFDocumentImpl::checkUnicode(); see ooo86460-1.xls [sic] for an example. There is another caller of text() in rtfdispatchdestination.cxx:311 but it turns out that buffered text was created by text() in the first place. This shouldn't be a problem for DOCX because XML 1.0 doesn't allow the bad control characters anyway so the sax parser should report an error in that case. Reviewed-on: https://gerrit.libreoffice.org/81697 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit a6516c76c01b92f7d35bfb352b63af7de42b5707) Change-Id: Ice45e1c3c8c7db668a4cfb8364e42addea1777ce
2021-01-25sw: UNO API: do not allow inserting control characters into nodesMichael Stahl
Refuse invalid input in DocInsertStringSplitCR(). Reviewed-on: https://gerrit.libreoffice.org/81696 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 9b1e3e9bfdc0639630a367e45e4bdc2e9f22e503) Change-Id: I097c1b3a1f70b0cf1fa3fc33fc1d965ee6c96280
2021-01-25svl: HTMLParser: stop inserting control character garbage into WriterMichael Stahl
E.g. rhbz433940-1.html contains literal ^G characters that are inserted as-is into SwTextNodes. This now triggers assert about CH_TXT_ATR_FIELDSTART in SwSubFont::GetTextSize_() that was added in 19a559b0ec9b806519c405651d6d2b2e14712b4a. Change-Id: I6aa7de41a04069e15b40865fd57894dae0fc10db Reviewed-on: https://gerrit.libreoffice.org/81606 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 35d248cab1f0d4800f72abb5cb6afb56f40d9083)
2021-01-25ofz#26122 allow NINSIZE input full elementsCaolán McNamara
Change-Id: Ifbde8fc055a91e23db08508a34ce4664d2f1f96f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103906 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit fb0c3f9d8964f8c0f40238559c32d9d73cba6b55)
2021-01-25ofz#25989 cmap parsingCaolán McNamara
Change-Id: I048e5d88d5926a4afa75afab18db5ca6354e2454 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103641 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9a1202edab0cfe95572f12a8c49ef756ead49bf2)
2021-01-25ofz#25684 keep ParseCMAP within legal areaCaolán McNamara
Change-Id: Iee18b5a9390b79efa67414ea2d229d2816c84e18 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102776 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a014c82522834c972e247a28d8e5f42998ae3c0e) ofz#25696 OOM Change-Id: Ia69e9ce1ca0156e960dddb7e0bf98dfd2be2d7cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102846 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d57b14e3394b081adf0888ed8dcb7b86d66c246c) ofz#25774 keep ParseCMAP within legal area Change-Id: Ic68fadd3d63631cbccda76e7679d95bb89452d25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103017 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f8474367449a1b6b54918d2753e3a36798761839) Fix crash from broken font CMAP subtable ParseCMAP crashes on a broken CMAP subtable of a font used by the bugdoc of tdf#119074, which returns a negative offset (technically it's large positive offset turning into a wrong negative integer, which is still out of bounds of the CMAP overall size - you get the point). This simply ignores that broken subtable, checking for other existing ones. Regressed-by: c7482bc2904401e7d975b5721ec861b8589253f9 Change-Id: I95820fe3bb6bd2fe2e0cf9d4c3536abce31fd497 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103033 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9bf4c5ac49b73cc2a8c89a87ff87238c061a579d) Missing include (for std::max, since f8474367449a1b6b54918d2753e3a36798761839 "ofz#25774 keep ParseCMAP within legal area") Change-Id: I873c788577e9ec3bd54d9e637d2cf86be7c1f6e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103089 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 8cc52b05744443c64cf5eb62ebe3098cd964c437) ofz#25855 overflow in nTmpOffset we already know nLength is >= 24 so just move the calc to the other term Change-Id: Ic52f1686ccf81e6b13d7eb7e74dbd9cb51c8ea01 ofz#25868 Timeout, encoding conversion only sane in 0..SAL_MAX_UINT16 range so ignore points outside that range to avoid ludicrous ranges that aren't possible in the input encoding Change-Id: Ifb7b9b389d4a31b8820a7da661249223fe1e110c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103261 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 1e41300a9552f90b3d75d5ffadd31ae42a28d249)
2021-01-25cid#1209863 Untrusted loop boundCaolán McNamara
Change-Id: Ic8d20e92b4021dfebe01e1265c3afb2bcd509827 Reviewed-on: https://gerrit.libreoffice.org/76259 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 52b92a591943c1988fd3d660bd6fc5ac53ce0f33)
2021-01-25cid#1209863 Untrusted loop boundCaolán McNamara
Change-Id: Ie9c3672a065b9df4580559cd927c6b1524edde0e Reviewed-on: https://gerrit.libreoffice.org/76099 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a6eaacf66ccc8f83b075b775f4dfa0aace0c3e3a)
2021-01-25rename search+replaced Getsal_uInt16 result back to GetUShortCaolán McNamara
Change-Id: Ia6e35d0ca15b0ac2310ad847c6eda6db548b25f6 Reviewed-on: https://gerrit.libreoffice.org/76258 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 63922db083dc70c9b248c9eb34b24382048adf08)
2021-01-25ofz#26480 validate WW8PLCFpcd is sorted like WW8PLCF doesCaolán McNamara
Change-Id: I11393c730986585aeea229ebeec6417e4a0578d9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104510 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7f55db80c6fe42c162bbf51404e638a66b6ae9ab)
2021-01-25ofz#20622 oomCaolán McNamara
Change-Id: Id77d90197e98d29787a40966f248dd769c9dac28 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90175 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 1e95c2c17a49349caba1e62b4de3752c5f767f01)
2021-01-25ofz#25881 use std::vector with bounds checking accessorCaolán McNamara
Change-Id: Ic557e85bce5f3ebe7224b0aa2192a74969f4fce2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103194 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit f074ad34d5fbc52f4f8df4eec31ba95ee92f879b)
2021-01-25ofz#19803 check for negative valuesCaolán McNamara
Change-Id: I30036a16cf1651a7e27c7aefa086b3725d58933a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86250 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0ab8ae4d98122f7de50365a062675d001ef0ca6a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86340 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit a1c678bbb2d6b981b4c9ae346dba85d414c11c47)
2021-01-25ofz#19207 check max strlen possibleCaolán McNamara
Change-Id: I5fe9fde240ef375d9de097dda47953320ecc758d Reviewed-on: https://gerrit.libreoffice.org/84253 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3fa8ee239b9d2455c0d5dcc016ce973b7f6acf8d)
2021-01-25ofz#19010 wrong start of rangeCaolán McNamara
Change-Id: Ibf97a830932d3f153b99031abc8c4a00b54cedab Reviewed-on: https://gerrit.libreoffice.org/83266 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins (cherry picked from commit a83c4e295cd364bee949d776229f3cf17369d1cf)
2021-01-25ofz#18646 ensure we are inside valid rangeCaolán McNamara
Change-Id: Ide4d4bfad5b365a42790454cca709d175054c933 Reviewed-on: https://gerrit.libreoffice.org/81908 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit dc144f115eb2ef0945837d66fd5ebb1e5a1fa2eb)
2021-01-25Resolves: ofz#18414 drop apo anchor if it will be deletedCaolán McNamara
Change-Id: Ic9dc053582055cae717df6244873cee14f6e44c6 Reviewed-on: https://gerrit.libreoffice.org/81433 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 808da2c918e662c19618c9f4035e8c9a802bb887)
2021-01-25ofz#18467 check against end of bufferCaolán McNamara
Change-Id: Ibeed87e2e3af90219e7bbbd773d369c90f78a364 Reviewed-on: https://gerrit.libreoffice.org/81371 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 36a1942bccdf63f26ea3a4497688f367083d2f0e)
2021-01-25Don't use uninitialized memory when reading from the stream failsStephan Bergmann
Flathub arm builds (but not other arches) had often (but not always) failed when processing sc/qa/unit/data/qpro/pass/ofz14090-1.wb2 in CppunitTest_sc_filters_test (e.g., <https://flathub.org/builds/#/builders/1/builds/724>: > Test name: ScFiltersTest::testCVEs > equality assertion failed > - Expected: 1 > - Actual : 0 > - file:///run/build/libreoffice/sc/qa/unit/data/qpro/pass/ofz14090-1.wb2 ) Valgrind revealed that this was due to using unintialized memory when the various maIn.Read... in QProToSc::Convert failed, starting with the use of uninitialized nFmla[i] after maIn.ReadUChar( nFmla[i] ); At least make things deterministic by setting the relevant variables to zero. (Another approach could be returning early with some ConvErr status.) Change-Id: I4c06aa8da5f777170cdc7bbe3ca1d61b23d3f326 Reviewed-on: https://gerrit.libreoffice.org/80947 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 2704b9e3783aae9d8372f2e3ad3253a2cb49ae87)
2021-01-25ofz#13881 Integer OverfloWCaolán McNamara
Change-Id: I90dc8be47cff080bc4e8242c2ae0961c2bc92aba Reviewed-on: https://gerrit.libreoffice.org/69588 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 44c63c0ba1eb491a9a2d8842badd1a5fc49376fd)
2021-01-25ofz#12660 remove flys before removing trailing parasCaolán McNamara
Change-Id: I6c706e5a2066b4fcd4546a22de0aa6327515a0a8 Reviewed-on: https://gerrit.libreoffice.org/66877 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9b76295d03ee8d1eb19a62c55ff45804efe40f38)
2021-01-25ofz#9858 Bad-castCaolán McNamara
use a SwUnoCursor for the LastAnchorPos around here Change-Id: I9b2b18e88aa0816e3386d7b95b4fd386d13af77f Reviewed-on: https://gerrit.libreoffice.org/58927 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 8e7620584ff81813f97d24192d01830834fece4d)
2021-01-25Avoid -Werror=nonnull with glibc-headers-x86-2.32-1.fc33.noarchStephan Bergmann
...on Fedora 33: > ~/lo/core/vcl/unx/generic/app/i18n_cb.cxx: In function ‘void Preedit_InsertText(preedit_text_t*, XIMText*, int)’: > ~/lo/core/vcl/unx/generic/app/i18n_cb.cxx:149:34: error: argument 1 is null but the corresponding size argument 3 value is 1024 [-Werror=nonnull] > 149 | size_t nBytes = wcstombs ( nullptr, pWCString, 1024 /* don't care */); > | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > In file included from ~/gcc/trunk/inst/include/c++/11.0.0/cstdlib:75, > from ~/lo/core/include/sal/log.hxx:15, > from ~/lo/core/vcl/unx/generic/app/i18n_cb.cxx:25: > /usr/include/stdlib.h:937:15: note: in a call to function ‘size_t wcstombs(char*, const wchar_t*, size_t)’ declared with attribute ‘access (write_only, 1, 3)’ > 937 | extern size_t wcstombs (char *__restrict __s, > | ^~~~~~~~ (Allowing the first argument to wcstombs to be null, and in which case the third argument is ignored, is a POSIX extension.) Change-Id: Ic078623643010b7539bc5bc1b498f18977ae77ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103473 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 782d160458d319c6c77fffa4c003c519afffaa17)
2021-01-25check-elf-dynamic-objects: allow libgsttag-1.0.so.0Michael Stahl
It's linked in Fedora 33 and apparently exists in gst-plugins-base since 1.0.0. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105140 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 4ebb3eae7b4abb7ecc37df73c6f80e3fd2069ed7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109766 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 4138d724ebb9150e053f9fcdfcf47ac621672618) Change-Id: Ifc5d6a6b06e05ef4e250ac26a8588a242f21a034
2021-01-25nss: fix parallel build race in nsinstall.pyMichael Stahl
File "/home/tdf/lode/jenkins/workspace/android_aarch64/external/nss/nsinstall.py", line 112, in nsinstall os.makedirs(args[0]) File "/opt/rh/rh-python38/root/usr/lib64/python3.8/os.py", line 223, in makedirs mkdir(name, mode) FileExistsError: [Errno 17] File exists: '../../../../dist/public/dbm' ../../../coreconf/rules.mk:119: recipe for target '../../../../dist/public/dbm/d' failed Change-Id: I4273e6d3d5fa520353fff8738823ef281fe237ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109619 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 6f5186a94dcd1989cdd819e35163af0542912559) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109587 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 01fffa977e28b2a671f195daa3a1aaa4cbe3b258) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109765 Tested-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 5b809908b45b3253a1f879069410d7ca30e1cb0a)
2021-01-25fix tdf#138335 guard sidebar uno methods with SolarMutexThorsten Behrens
Wasn't threadsafe before; using vcl/gui code, so we need the SolarMutex. Conflicts: sfx2/source/sidebar/SidebarController.cxx Change-Id: I3d4407f095837d03ad492fcdf9a08746cf911d25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106169 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106211 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107137
2021-01-22postgresql: upgrade to release 13.1Michael Stahl
Fixes CVE-2020-25694, plus a bunch more CVE that don't look relevant. * --with-krb5 no longer exists, neither does --disable-shared * remove internal-zlib.patch.1: zlib is only used by pg_* tools / contrib/pgcrypto * remove postgresql-libs-leak.patch: some relic from pre-gbuild times, not clear what the point is for static libs * remove postgresql-9.2.1-libreoffice.patch: another dmake .mk file relic, and the win32 nmake build system was removed * add postgres-msvc-build.patch.1 to fix Cygwin perl and openssl * on WNT, libpq.dll is now built, no longer static lib postgresql: fix mistake in RepositoryExternal.mk Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109640 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 234833f7823a1424b62c93e145f0cfe2c6b6efd5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109698 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit 1362bf7fa2957d34a7cef18dd95ede22cc42787f) Change-Id: Ic0232a28801b2f604d9f4e33d5621ae3362defaa
2021-01-21XTextDocument::refresh should do a full reformattingSamuel Mehrbrodt
Change-Id: Ia92e10e43cb8254b6dd35db03462b87d0fe93f45 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109538 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit cbbfed893616f804cb6557185ddda26c0cef2ed6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109572 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2021-01-21"Update all" should do a full reformattingSamuel Mehrbrodt
Change-Id: I05b06e4b345c2125f4fd5272fc6a3354396a29ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109554 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit 4ecabed3ac5aff26bee6d195136ca819cbeb995c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109604 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2021-01-21Bring uno:RefreshView to CalcSamuel Mehrbrodt
Allow refreshing the document layout via UNO slot Change-Id: I956bb884b1fb4231b1f617c4aa5a80ff9a45ec92 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109269 Tested-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
2021-01-18Make uno:RefreshView redo the whole document layoutSamuel Mehrbrodt
This is useful when encountering layout problems, to refresh the doc layout from an extension. Change-Id: Ie2472f061ebea203a9d876782b3bb953477de7c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109218 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-01-15openssl_headers depends on generated opensslconf.hStephan Bergmann
...at workdir/UnpackedTarball/openssl/include/openssl/opensslconf.h, as can be seen with failed builds like <https://ci.libreoffice.org//job/lo_tb_master_mac/35209>: [...] > [build PAT] openssl > [build C ] UnpackedTarball/mariadb-connector-c/plugins/auth/caching_sha2_pw.c > [build C ] UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt.c > [build DEP] LNK:Library/libclucene.dylib > [build LNK] Library/libclucene.dylib > In file included from /Users/tdf/lode/jenkins/workspace/lo_tb_master_mac/workdir/UnpackedTarball/mariadb-connector-c/libmariadb/secure/openssl_crypt.c:21: > /Users/tdf/lode/jenkins/workspace/lo_tb_master_mac/workdir/UnpackedTarball/openssl/include/openssl/evp.h:13:11: fatal error: 'openssl/opensslconf.h' file not found > # include <openssl/opensslconf.h> > ^~~~~~~~~~~~~~~~~~~~~~~ > 1 error generated. Change-Id: Ied1dcdd0afb6099e9218671c6a06c0edaafc931e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108928 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 0f7008e91f45cf8e3cee6f372ce012b38a795e26)
2021-01-13tdf#105330 sw: fix lost cursor on undoing nested table insertMiklos Vajna
This is a regression from commit e4509eea8fc7c07ddff48edf0d4c015c2663d896 (n#751313 SwCallLink: avoid redrawing complete rows without nested tables, 2012-04-20), though manual testing shows that the underlying problem has been addressed in the meantime, so this can be reverted. Over time, some poor tests started to depend on the new behavior so adapt them as necessary: 1) Change back test added in commit 075fc0c0a34875adf2833e5933b4982b9443a373 (testcase for fdo#38414, 2014-03-18) to its original form, that was changed to an export test in commit 086550313260d9fa45b91dc705b21bb9b51ce0b8 (move round-tripables to ooxmlexport, 2016-10-07), as the export of that document still results in data loss of cell content, just happened to pass so far. 2) Explicitly calculate content of text frames in two more tests, which just hoped that by the time they assert, the layout is ready already (but now that the missing notification is restored, it happens that the first pass of the layout doesn't create them; only a later pass, invoked by Idle, which doesn't run during cppunit tests). (cherry picked from commit c56bf1479cc71d1a2b0639f6383e90c1f7e3655b) Conflicts: sw/qa/extras/uiwriter/uiwriter2.cxx Change-Id: Ie13d17266cd552f3850848ae980bcfe8776997ac Reviewed-on: https://gerrit.libreoffice.org/79043 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit d5b50e74ee822e1c8402e3044e14799e47907ff8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107679 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-01-08Bump version to 6.1.7.22cib-6.1-22Thorsten Behrens
Change-Id: I4f68131a270aac21df53835672fc54a030de3e6e
2021-01-08HTML tt -> code in JavaDoc commentsStephan Bergmann
...to avoid "error: tag not supported in the generated HTML version: tt" with JDK 11 Change-Id: I761c987257f42d01f24c88440495698cac6226d2 Reviewed-on: https://gerrit.libreoffice.org/61614 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 07721a4dea1aab898a993662a24c5ab68ecc1edf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108957 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-01-08poppler: upgrade to release 21.01.0Michael Stahl
Fixes CVE-2020-27778, CVE-2020-35702 and changelogs mention lots of fuzzing fixes. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108912 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 48e8b32a9b66722bbb28fc15840b3706a461aeb7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108904 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit fb185106492f5aabac6ab57ae90cd81d51480093) Change-Id: Ib07bdee726905e74afc13a01bbbd53f218121744 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108956 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-01-08tdf#131353: Fix build with poppler 0.86.0Martin Whitaker
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93789 Tested-by: René Engelhard <rene@debian.org> Tested-by: Jenkins Reviewed-by: Tomáš Chvátal <tchvatal@suse.com> (cherry picked from commit b42ab78fb871924896b3cc38a7b2f1257151f711) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96639 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit d40f36bf47814c324a1ec467c566255fb187444b) Change-Id: I89b4635a6a3e3a5522172d6f4c3f14e6c14994b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108955 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-01-07Fix build with poppler-0.83Martin Milata
Change-Id: I7a3684932b8f9c403a3368b42fa4d8039c67f1a9 Reviewed-on: https://gerrit.libreoffice.org/84384 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86905 Reviewed-by: Tomáš Chvátal <tchvatal@suse.com> Tested-by: Tomáš Chvátal <tchvatal@suse.com> (cherry picked from commit 035830400393e075fca364a444e04c40516730b2)