summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-06-08comphelper: fix build against CentOS6 baselinedistro/lhm/libreoffice-5-2+backportsThorsten Behrens1-2/+2
Change-Id: Ice8a27dc92c923b3d2c62a6989e13720ff044749 (cherry picked from commit 25e7d4a47171ec68202269a8f94fae002b7715c9)
2020-06-08external/python3: Drop nis.cpython-*m.soStephan Bergmann1-1/+0
At least Fedora 28 glibc-2.27-8.fc28 no longer provides the nis development headers and libraries. (It only still contains some binaries for backwards compatibility, in the libnsl sub-package: "This package provides the legacy version of libnsl library, for accessing NIS services.") There is probably no real need to have nis.cpython-*m.so contained in external/python3/ExternalPackage_python3.mk (it probably just happened to build fine when that list was originally created, so was included). Change-Id: Ic6128fd872432005c0ded76640c5b56781ca69a1 Reviewed-on: https://gerrit.libreoffice.org/52535 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 93e6a823bd8543d30621769c7b34d6261ea5cb01)
2020-06-08tdf#129096: Document Recovery: Use TypeDetection on loadVasily Melenchuk1-0/+32
Loading of recovered document happend before via XFilter::filter is not updating media descriptor of document. But this is important for password protected documents to store entered password and used encryption type. To avoid this problem let's use TypeDetection which during its work will ask user for password and store all the info in modified media descriptor before actual recovery attempt. Change-Id: Ide2ebf0955e0937cdc7c9d7165593b71f904649b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88844 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Jenkins (cherry picked from commit 8461127750e1fe92a615409505256132e54fb8e8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89789 Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> (cherry picked from commit b05c87f00433987b10542866696f0b4aaad015cc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93835 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-08tdf#93389: keep encryption information for autorecovered MS formatsMike Kaganski5-6/+67
The autorecovery data is stored in ODF, regardless of the original document format. When restoring, type detection generates ODF data, which is stored in the media descriptor attached to document, even after real filter was restored (see AutoRecovery::implts_openDocs). If real filter is not ODF, then at the save time, it doesn't find necessary information in encryption data, and makes not encrypted package. This patch adds both MS binary data, and OOXML data, to existing ODF data for recovered password-protected documents (regardless of their real filter). TODO: only add required information to encryption data: pass real filter name to DocPasswordHelper::requestAndVerifyDocPassword from AutoRecovery::implts_openDocs. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86201 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit dd198398b6e5c84ab1255a90ef96e6445b66a64f) Conflicts: comphelper/source/misc/docpasswordhelper.cxx Change-Id: I4717f067ad3c40167312b99eefef5584a467bfed (cherry picked from commit 6017cdff264afc3b98beeba1330d6df28102fe7a) Conflicts: package/source/xstor/xstorage.cxx sfx2/source/appl/appopen.cxx
2020-06-08tdf#118639: store ODF encryption data for autorecoveryMike Kaganski2-8/+40
When saving autorecovery information, ODF is used. If the original document is password-protected, its autorecovery is also generated password-protected (since ef87ff6680f79362a431db6e7ef2f40cfc576219). But when the stored encryption data for non-ODF document does not contain "PackageSHA256UTF8EncryptionKey" value, following ZipPackage::GetEncryptionKey fails, so the whole save fails. So just generate and append ODF encryption keys where we still have user password. Reviewed-on: https://gerrit.libreoffice.org/84052 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 63634738dd03cc74806ce6843c16ff5e51a371a0) Reviewed-on: https://gerrit.libreoffice.org/84133 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit e569dc9824e95617d921bb8f115d243aea0125b9) Reviewed-on: https://gerrit.libreoffice.org/84232 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit d1450f5bddd0f108078e0dfb11c9f130175fafe7) Conflicts: comphelper/source/misc/docpasswordhelper.cxx Change-Id: I776e28de784489521e4941d1075690f90c056014
2020-06-08tdf#124776: don't use SearchPathW to get full path of executableMike Kaganski1-2/+2
... use GetModuleFileNameW() for that. We call SetDllDirectoryW and SetSearchPathMode to improve security of the process, and exclude some paths (including current directory) from search when using API that looks for binaries whose names are not fully qualified. So the sequence is this: 1. Program is started using relative executable path like "instdir\program\soffice"; 2. sal_detail_initialize is called, which calls the two mentioned hardening functions; 3. sal_detail_initialize calls osl_setCommandArgs, which in turn calls osl_createCommandArgs_Impl; 4. The latter uses SearchPathW with empty path and first program arg "instdir\program\soffice" to find fully qualified program path. That now naturally fails, because current path is not searched. But to find the process name, we need no search: we can simply use GetModuleFileNameW() with NULL passed as module handle. Let's use that. Note that we can't use _wpgmptr/_get_wpgmptr, because we don't use wide entry point like wmain. LHM-Stuff --------- Dieser Patch löst das Problem wenn Symbols eingeschaltet ist, danach konnte LO nicht mit scalc.exe, swriter.exe, .. gestartet werden den es ist damit abgestürzt. (Dumpfile war im LO-Verzeichnis) Reviewed-on: https://gerrit.libreoffice.org/70844 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit c650217cc543080928a26de4bfc07ebb0be5c6ca) Change-Id: I7a0013a0505f7bdd38164b09b045bfade9686664 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89689 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Conflicts: sal/osl/w32/process.cxx
2020-06-08limit forms to http[s]Caolán McNamara2-0/+9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93993 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5d101a65c31e6c2f8dd0edffe05f69055cbd481c) Conflicts: forms/source/xforms/submission.cxx Change-Id: I3ed0bc626f693ec03f610dc7361f93cad914c9d8
2020-06-08put load of html images (to measure dimensions) under referer controlCaolán McNamara1-2/+17
Change-Id: I1de4a5214ef48394dcafa97e4ea12bb460f2fba2 Reviewed-on: https://gerrit.libreoffice.org/57566 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
2020-06-08sw HTML import: use GraphicDescriptor to determine default sizeMiklos Vajna4-0/+52
Rather than the hardcoded HTML_DFLT_IMG_WIDTH / HTML_DFLT_IMG_HEIGHT defines. Change-Id: I4ed2207ce3fdcd247054941d91eb67a679fb370c Reviewed-on: https://gerrit.libreoffice.org/53081 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> Conflicts: sw/qa/extras/htmlimport/htmlimport.cxx
2020-03-25icu: add patch to fix CVE-2020-10531Michael Stahl3-1/+42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90971 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 002d1152dc418f7d624409e76cd9d4ac0b42c7f8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90975 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 63b573faf984875cda7a879e696ea75fae81df57) Change-Id: I0aca4af1bd79f28bf1c920a4d05e80948106aaac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91046 Tested-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-03-25add checked_addCaolán McNamara1-0/+124
Reviewed-on: https://gerrit.libreoffice.org/43779 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9cfb27ae6cb94f0a853ff70e9ad9f3109d305a94) android:update safeint header to use the else implementation with clang Clang toolchain does not defines the __builtin_mul_overflow for 32-bit ARM. So, fallback to else implementation of checked_multiply when building Android with Clang Reviewed-on: https://gerrit.libreoffice.org/39005 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 2149d4a88e9dc88c30e7475f8ea317e5c7b78529) Change-Id: If7582005ff6eacf8d9ee846c895776a60709f7a4 Reviewed-on: https://gerrit.libreoffice.org/49485 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91045 Tested-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-02-07Remove a fragment from a file URL early onStephan Bergmann1-2/+4
...as ShellExecuteExW would ignore it anyway Change-Id: I969db094bb7d2ea230ac8c36eb23d71a90fbe466 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86868 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 14b36a16b225bf7c988f118d499a7287c47cd83e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86877 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 51da0d22ff42b20ab38130b7874651ef136ecceb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88208 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2019-11-27nss: upgrade to release 3.47.1Michael Stahl7-25/+13
Fixes CVE-2019-11745. Remove nss.fix-freebl-add-lcc-support.patch.1, fixed upstream. Reviewed-on: https://gerrit.libreoffice.org/83673 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit a6238c3fba80889f9090d997e2a4979b78b34ac7) Change-Id: I72e35c90fabb0a83f547a787dbaee774e35f9c08 Reviewed-on: https://gerrit.libreoffice.org/83756 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2019-11-25poppler: upgrade to release 0.82.0Michael Stahl6-39/+185
fixes CVE-2019-9903 CVE-2019-9631 CVE-2019-9545 CVE-2019-9543 CVE-2019-14494 CVE-2019-12293 CVE-2019-11026 CVE-2019-10873 CVE-2019-10872 CVE-2019-10871 CVE-2019-10018 remove obsolete 0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 Reviewed-on: https://gerrit.libreoffice.org/83308 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 28e52c49452320ac76489d0f93ca5692456e5331) Reviewed-on: https://gerrit.libreoffice.org/83336 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit f3b2d61376c6d7ae262f58406d89ef0caa8b0aaf) Change-Id: I72b3bf89b294ed3e24157c7e75fd58d4f68d9f35 Reviewed-on: https://gerrit.libreoffice.org/83529 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2019-11-25Fix build with poppler-0.82Rasmus Thomsen2-0/+39
Reviewed-on: https://gerrit.libreoffice.org/81545 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 2eadd46ab81058087af95bdfc1fea28fcdb65998) Reviewed-on: https://gerrit.libreoffice.org/83363 Reviewed-by: Rasmus Thomsen <oss@cogitri.dev> (cherry picked from commit 928a372775a0758aa76eb10e568d5c106a8586eb) Change-Id: I3b6b3faea7986f3e5a6ae4790580d03bc9c955fc Reviewed-on: https://gerrit.libreoffice.org/83528 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2019-11-25libxslt: upgrade to release 1.1.34Michael Stahl6-136/+85
Fixes CVE-2019-18197. Remove obsolete e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1. Reviewed-on: https://gerrit.libreoffice.org/83312 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit e9ea24cc004a8b9a5856f2f268bd40433c504db1) Reviewed-on: https://gerrit.libreoffice.org/83377 (cherry picked from commit d19b32c779bfeb51ef9570c3de8ed1925ec44473) Change-Id: I95cf498e245083528f98bfef8cdd240bbe2211b9 Reviewed-on: https://gerrit.libreoffice.org/83527 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2019-11-25libxslt: upgrade to release 1.1.33Michael Stahl1-2/+2
Change-Id: Ifc64dae74df341e107857e43223ead04b9c1061e Reviewed-on: https://gerrit.libreoffice.org/66309 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3f720ac5ff65ddb2c0a06e48d0e2e9bec29f3a43) Reviewed-on: https://gerrit.libreoffice.org/66364 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit efe7b735104343e5e0182e1b004aca9c7b79a901) Reviewed-on: https://gerrit.libreoffice.org/83526 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2019-11-25upload libxslt 1.1.32David Tardon4-10/+11
Reviewed-on: https://gerrit.libreoffice.org/44422 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit c110dabbf0fcddf9da2e61d66ca093cf6e6c57a1) l10ntools: try to fix Win64 build failure in uimerge.cxx by moving libxslt includes first: Change-Id: I445919e1eeb188bb35da38c4b3a5007c1ae48e0a C:/PROGRA~2/WI3CF2~1/10/Include/10.0.17763.0/um\winnt.h(637): warning C4005: 'DECLARE_HANDLE': macro redefinition D:/cygwin/srv/Jenkins/workspace/04-LO-Win64/include\sal/main.h(87): note: see previous definition of 'DECLARE_HANDLE' C:/PROGRA~2/WI3CF2~1/10/Include/10.0.17763.0/shared\minwindef.h(250): error C2371: 'HINSTANCE': redefinition; different basic types D:/cygwin/srv/Jenkins/workspace/04-LO-Win64/include\sal/main.h(89): note: see declaration of 'HINSTANCE' Change-Id: Idee2f18dccdf309027142137683ac86735f575cc Reviewed-on: https://gerrit.libreoffice.org/83525 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2019-11-25libxslt: upgrade to release 1.1.30Michael Stahl5-68/+18
* drop most of libxslt-internal-symbols.patch, fixed upstream Reviewed-on: https://gerrit.libreoffice.org/41947 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 1d7b3cbe1f08319eddf88aac04923ae44873f246) Change-Id: I59cf57a4d3139ad5fa0e5ce1a6cdaaa568ae3a40 Reviewed-on: https://gerrit.libreoffice.org/83524 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2019-11-22libxml2: upgrade to release 2.9.10Michael Stahl3-39/+13
... which is, surprisingly enough, required to build the latest libxslt. Reviewed-on: https://gerrit.libreoffice.org/83311 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit d1bf39a78ed239d4493f0470ca937852265e79d6) Reviewed-on: https://gerrit.libreoffice.org/83347 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit e9dc4662d4ba3bde91407911f1bc1a7aa25fa0ce) Change-Id: Ifbb36ed61b8f68185f9c788f63a8edeb58899f94 Reviewed-on: https://gerrit.libreoffice.org/83427 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2019-11-22python3: upgrade to release 3.5.9Michael Stahl6-99/+5
Fixes CVE-2019-9948 CVE-2019-9740 CVE-2019-10160 CVE-2019-16056 and expat CVE-2019-15903. python-3.3.5-pyexpat-symbols.patch.1 fails to apply, and it's a mystery why --with-system-expat is used everywhere but on MacOSX, where 292af048ace2d4b455b2da3a22c784cb05db1d09 disabled it for no obvious reason, so try to remove the special case and get rid of the patch. Reviewed-on: https://gerrit.libreoffice.org/83117 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit b0930d56130fdddfe65e92b081a8afad77974076) Reviewed-on: https://gerrit.libreoffice.org/83189 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 0d4b1f624349361e5bf11b58ccc9e0e295c0e4aa) Remove external/python3/python-3.5.7-c99.patch.1 - was apparently reverted upstream. Change-Id: I5ba4532eb6e7c2fb90daba95d132dcc7c9013d96 Reviewed-on: https://gerrit.libreoffice.org/83426 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2019-11-22tdf#106780 xmloff: import ODF 1.2 attribute table:name in addition to...Michael Stahl1-1/+3
... the historic wrong attribute text:style-name in XMLTableTemplateContext. 3 lines cherry-picked out of commit 40fba0f4418084d50cc5c388cb0b6e1abe395d61 "GSoC Writer Table Styles Import". Change-Id: I6228263ba2eb3a6d63809efcea673fe4f89dba38 Reviewed-on: https://gerrit.libreoffice.org/83425 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2019-09-21Return correct length for Authority tokenMatteo Casalin1-17/+16
Regression from f4fd558ac9d61fe06aa0f56d829916ef9e5ee7b9 Take the chance to calculate token prefix just once. Change-Id: I19ce5cb037198cb918e79c760a92b285f9b725f1 (cherry picked from commit 34b98af8e5a4e568d8316700bea1ce604d825ce8) Reviewed-on: https://gerrit.libreoffice.org/52621 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit c6e8460a5b47fa6fa971dde2a89e80662b6e97ae) Reviewed-on: https://gerrit.libreoffice.org/52626 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit df041d902eafb1e273eb360103252994bbd2cde2) Reviewed-on: https://gerrit.libreoffice.org/79276 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-09-21latest expatCaolán McNamara6-15/+12
Reviewed-on: https://gerrit.libreoffice.org/78978 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 4436a29401beffd0893ecae70cd09c7a49f49f22) Change-Id: Ia98c9718ccd8e18b5f56851027bde944164f05c4 Reviewed-on: https://gerrit.libreoffice.org/79275 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-09-21upload expat 2.2.5David Tardon2-3/+3
Reviewed-on: https://gerrit.libreoffice.org/44552 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 34a7a9fd7649655256a85b5701d461af5ccc2016) Change-Id: Ic92002ec4f5edc48ca1bb3ac84836c4e6d19833c Reviewed-on: https://gerrit.libreoffice.org/79274 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-09-19Improve osl_getLocalHostname on WindowsStephan Bergmann1-3/+16
...returning a non-dotted result obtained from gethostname in case trying via osl_createHostAddrByName doesn't work either. The code had been like this ever since its introduction with 74f3ed51f1e3fa7a199210fd6ffc69d78a535c08 "made socket and pipe refcounted, added blocking read write methods, added direct access methods for struct sockaddr", but there appears to be no good reason not to return the non-dotted gethostname value as a fallback (and it may just have been an oversight not to do so; and on e.g. Linux we simply return whatever a successful call to gethostname provides, be it dotted or not, ever since at least ebd00f5c46707e0dfcdd074f581ae86c0576e69b "socket.cxx -> socket.c", too). (Calls to osl_getLocalHostname are few across the code base, so this change in behavior is unlikely to cause any regressions. I came across this wile looking into <https://bugs.documentfoundation.org/show_bug.cgi?id=107461> "Does not support 'file://' scheme with actual hostname", but this change is unrelated to any potential fix for that issue. It just felt right to get this fixed in passing.) Reviewed-on: https://gerrit.libreoffice.org/67390 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 3be2a53ee1a34fd4bc96e7817191fc3e0eb3c917) Change-Id: I78e59140579b9d37ee435a8f121e58544d2235eb Reviewed-on: https://gerrit.libreoffice.org/79012 Reviewed-by: Ilhan Yesil <ilhanyesil@gmx.de> Tested-by: Ilhan Yesil <ilhanyesil@gmx.de>
2019-09-09tdf#126184 Use max paper dimensions to calculate clip regionMichael Weghorn1-3/+7
Assuming at least A4 for the page size isn't enough if e.g. A2 or larger is used, so too much was clipped in that case. Therefore, use the the maximum paper width/height instead, which is 6 m by default. This is still far from the 19 km that caused tdf#63955 and I cannot reproduce tdf#63955 with that new limit. A big thanks to Regina Henschel for the great analysis in tdf#126184! (Side note: Comments 18 and 19 in tdf#63955 suggest to do the whole clipping elsewhere, so if anybody wants to take a look at this...) Change-Id: Iccacad621675df6c7b4477182d7332c4a3d67139 Reviewed-on: https://gerrit.libreoffice.org/78690 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 1dccd6814f1fe7a06f3168d01d18d347269cd3c1) Reviewed-on: https://gerrit.libreoffice.org/78760 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 28c6ddf65593dab16657a0907e38bf409b73f3c3) Reviewed-on: https://gerrit.libreoffice.org/78772
2019-08-27Improve check for absolute URIStephan Bergmann1-1/+1
Change-Id: I4dee44832107f72f8f3fb68554428dc1e646c346 Reviewed-on: https://gerrit.libreoffice.org/77706 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit c79efeb66f7951305d0334bc288aee1c571a8728) Reviewed-on: https://gerrit.libreoffice.org/77724 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 52f7aa318722bd17c77ee5c4fa8307936e7b53af)
2019-08-27Improve checkStephan Bergmann1-1/+1
Change-Id: I8280a81eef2ced0ff0ace51ea9f094421abafe13 Reviewed-on: https://gerrit.libreoffice.org/78108 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 761e6dd25782420bf06e4a2ff3205a79b6cbb136) Reviewed-on: https://gerrit.libreoffice.org/78129 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit ffad51e9e625a22f1efab3da7886baf4134b444f) Reviewed-on: https://gerrit.libreoffice.org/78152 Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-08-27an absolute uri is invalid inputCaolán McNamara1-0/+5
Change-Id: I392be4282be8ed67e3451b28d2c9f22acd4c87fc Reviewed-on: https://gerrit.libreoffice.org/77564 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 3c076e54f736980e208f5c27ecf179aa90aea103) Reviewed-on: https://gerrit.libreoffice.org/77572 Tested-by: Jenkins (cherry picked from commit 5445f7ffd09e891b220dabb19cd013bcf591fc08) Reviewed-on: https://gerrit.libreoffice.org/78150 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-08-13Support Java vendors "Ubuntu" and "Private Build" on LinuxMichael Weghorn2-0/+11
Updated OpenJDK 8 package in Ubuntu bionic and thus walhalla has vendor "Private Build" and current OpenJDK 11 package has "Ubuntu" as vendor. This leads to Java not being found unless those vendors are supported. This has been made to work on master with c4aa8b366fb879b0dd37241e70c5842825305620 ("tdf#124503: Support JRE installations with unknown java.vendor property"), which was backported to distro/lhm/libreoffice-6-1+backports as well. However, to keep the change small for LO 5.2 and avoid conflicts while backporting, just add the two vendor strings actually being used on this branch. Change-Id: I0c4ae1db2b92a47512fe86ce73934813cfc26185 Reviewed-on: https://gerrit.libreoffice.org/77417 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-08-13Support AdoptOpenJDKhimajin1000006-8/+19
Reviewed-on: https://gerrit.libreoffice.org/66634 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 61c4f96d6ae6a80370774e53287edb27cbce8067) Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml Change-Id: Idcfd542c6caede3d987e9b8219cf48114800daa5 Reviewed-on: https://gerrit.libreoffice.org/77416 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2019-08-13construct final url from parsed outputCaolán McNamara1-2/+10
Change-Id: Ifd733625a439685ad307603eb2b00bf463eb9ca9 Reviewed-on: https://gerrit.libreoffice.org/77373 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 87959e5deea6d33cd35dbb3b8423056f9566710e) Reviewed-on: https://gerrit.libreoffice.org/77377 (cherry picked from commit c03acb9b8a97254cfcf7c45ef920b93b7f1dd344) Reviewed-on: https://gerrit.libreoffice.org/77407 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-08-07expand pyuno path separatorsCaolán McNamara1-1/+2
Change-Id: Ic97649ed6d4be595b308922c7bdc880cbb60b239 Reviewed-on: https://gerrit.libreoffice.org/77102 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 75903a0298218f89a199a5ac151ee0166f4469d7) Reviewed-on: https://gerrit.libreoffice.org/77120 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-07Properly obtain locationStephan Bergmann2-11/+19
Change-Id: I9fb0d883a3623394343cd54ef61e5610544198c8 Reviewed-on: https://gerrit.libreoffice.org/77019 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit a9cde2557242a0c343d99533f3ee032599c66f42) Reviewed-on: https://gerrit.libreoffice.org/77023 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 28c6af3ddc283ca9c5712359a9abcb385c1575b4) Reviewed-on: https://gerrit.libreoffice.org/77097 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-07keep name percent-encodedStephan Bergmann1-1/+3
Change-Id: I470c4b24192c3e3c9b556a9bbb3b084359e0033b Reviewed-on: https://gerrit.libreoffice.org/77006 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 315c51731384230194af26b86a976bf5d06c9dcc) Reviewed-on: https://gerrit.libreoffice.org/77096 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-07tdf#126641: don't fail on file URLs with fragmentMike Kaganski1-1/+3
This only fixes part that the URL refuses to open the target file. Honoring fragment isn't fixed here, since it's the system call to ShellExecuteExW that in this case internally converts the file URL into a system path, and strips the fragment from it. Regression from commit d59ec4cd1660410fa1b18c50d2d83b1417a82ddc. Change-Id: I6c9ed27e9a5bd7f2780dd3be96f816a6e825e043 Reviewed-on: https://gerrit.libreoffice.org/76778 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 2207269a84c7c9920af3385b837ce67978c720b4) Reviewed-on: https://gerrit.libreoffice.org/76848 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit dd2b7919058fc0e23a7117d39110d3ecaaad1fb2) Reviewed-on: https://gerrit.libreoffice.org/76881 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 72861eaf7cf9af3e7764b13d9e74edc5548806d2) Reviewed-on: https://gerrit.libreoffice.org/77095 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-07tdf#126222 Headers/footers are at correct position after scrollingIlhan Yesil1-0/+12
After scrolling, the positions of headers and footers of the previous pages have to be updated, else these headers and footers could get visible at a wrong position. Change-Id: I25508cc0fc0bb7a6e59aeb996e2e7e0a0e23511f Reviewed-on: https://gerrit.libreoffice.org/75118 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 80ae85d89866e501496189b2749071869ab6e98c) Reviewed-on: https://gerrit.libreoffice.org/76966 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-05ofz#10198 reset uncommitted fly stuff & pams before applying redliningCaolán McNamara1-0/+3
Change-Id: I2a2587ec4590926f7cffc2a4d58a22d9d5f19c99 Reviewed-on: https://gerrit.libreoffice.org/59947 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins (cherry picked from commit 887ee9111f42847406c5ffc85a0ba635080de3de)
2019-08-05ofz#9908 validate no negative editengine selection positionsCaolán McNamara1-1/+3
Change-Id: I37dace2051518224c55756362facd3edba4a9571 Reviewed-on: https://gerrit.libreoffice.org/59059 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit ca3038a05188084b012dd3c799494f30bc5c47ef)
2019-08-05ofz#4837 Null-dereference READCaolán McNamara1-0/+11
Change-Id: I7e4cb934aeac32fa1170beb116e4600b5eb9389a Reviewed-on: https://gerrit.libreoffice.org/47197 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9f8dd17b1e6ab5d5d07b61e0f85edea233f03d71)
2019-08-05forcepoint#67 detect cairo surface creation failureCaolán McNamara1-0/+10
if e.g. too large Change-Id: I7de8748a5ed695c1b3ddc8c1358414f3acd68c94 Reviewed-on: https://gerrit.libreoffice.org/58454 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 36bee88834f90818c5475b460c729186ef6c9229)
2019-08-05sw: fix use after free on tdf117215-1.odtMichael Stahl2-1/+3
Move the fix from 6d0ea082889c89eb8b408779f2de08da7441ff54 to SwFlyFrame::DestroyImpl() so we unregister every SwFlyFrame. ==1550==ERROR: AddressSanitizer: heap-use-after-free on address 0x615000383f56 at pc 0x7efcd70d5ab9 bp 0x7ffeb7ac7c40 sp 0x7ffeb7ac7c38 WRITE of size 1 at 0x615000383f56 thread T0 0 SwAnchoredObject::SetTmpConsiderWrapInfluence(bool) sw/source/core/layout/anchoredobject.cxx:743:32 1 SwObjsMarkedAsTmpConsiderWrapInfluence::Clear() sw/source/core/layout/objstmpconsiderwrapinfl.cxx:53:23 2 SwLayouter::ClearObjsTmpConsiderWrapInfluence(SwDoc const&) sw/source/core/layout/layouter.cxx:387:84 3 sw::DocumentLayoutManager::ClearSwLayouterEntries() sw/source/core/doc/DocumentLayoutManager.cxx:497:5 4 sw::DocumentStateManager::SetModified() sw/source/core/doc/DocumentStateManager.cxx:45:39 5 sw::DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM&) sw/source/core/doc/DocumentContentOperationsManager.cxx:3942:36 0x615000383f56 is located 342 bytes inside of 504-byte region [0x615000383e00,0x615000383ff8) freed by thread T0 here: 1 SwFlyAtContentFrame::~SwFlyAtContentFrame() sw/source/core/inc/flyfrms.hxx:159:7 2 SwFrame::DestroyFrame(SwFrame*) sw/source/core/layout/ssfrm.cxx:389:9 3 SwFrameFormat::DelFrames() sw/source/core/layout/atrfrm.cxx:2624:17 4 SwUndoFlyBase::DelFly(SwDoc*) sw/source/core/undo/undobj1.cxx:161:19 5 SwUndoDelLayFormat::SwUndoDelLayFormat(SwFrameFormat*) sw/source/core/undo/undobj1.cxx:403:5 6 SwHistoryTextFlyCnt::SwHistoryTextFlyCnt(SwFrameFormat*) sw/source/core/undo/rolbck.cxx:538:20 7 SwHistory::Add(SwFlyFrameFormat&, unsigned short&) sw/source/core/undo/rolbck.cxx:1083:50 8 SwUndoSaveContent::DelContentIndex(SwPosition const&, SwPosition const&, DelContentType) sw/source/core/undo/undobj.cxx:1020:39 9 SwUndoDelete::SwUndoDelete(SwPaM&, bool, bool) sw/source/core/undo/undel.cxx:229:9 11 sw::DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM&) sw/source/core/doc/DocumentContentOperationsManager.cxx:3939:55 Change-Id: Ia0c28c9d5792615cbb566e502374efd0f4056daf Reviewed-on: https://gerrit.libreoffice.org/75857 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit dea72ef111ee8a0b1b178f8cd48757514d5ca831) Reviewed-on: https://gerrit.libreoffice.org/75941 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4b9324b93dcbd72c8c8949309d45790dd8f7d5fd)
2019-08-05forcepoint73 deleted SwAnchoredObject still referenced in TmpConsiderWrapInflCaolán McNamara7-19/+43
Reviewed-on: https://gerrit.libreoffice.org/58760 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6d0ea082889c89eb8b408779f2de08da7441ff54) Change-Id: If255723834d049865fcf6fd0eac7768dfcbad2a1 Reviewed-on: https://gerrit.libreoffice.org/58768 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit de765158b372d5f7bbb1b37c7d6be695ab6104ac)
2019-08-05Resolves: tdf#124142 don't deref nullptrCaolán McNamara1-1/+2
Change-Id: Ie14600e9f9a1e1c4e99c7a872f5d677453481888 Reviewed-on: https://gerrit.libreoffice.org/69666 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ac7ce7a64ef903bad1476f5635a7b2a1e951a7a3) Reviewed-on: https://gerrit.libreoffice.org/69694 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit cdef6e5f4053adf5413781a9282285eab3923373)
2019-08-05fix assert seen on opening attachment from tdf#123163Caolán McNamara1-1/+2
I imagine it should have been seqPos-(idPos+2) seems to be like this since the initial commit of commit 091fe76b6329b4bb974987554369cbfadd8f2401 Date: Tue Jun 30 12:55:18 2015 +0300 tdf#87348 implement mso-next-textbox vml-style textbox chaining import Change-Id: Ic2f527ede2102c01c8589d58d8c705d59b0a6ffe Reviewed-on: https://gerrit.libreoffice.org/67454 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 45510866fedac63014a3120a1130dbea9fd803ee)
2019-08-05Resolves: tdf#123163 avoid null derefCaolán McNamara1-3/+4
one RemoveDrawObjFromPage is already null-deref protected, do the same for the other Change-Id: Ica5bb2df4a8dbffd8397df76b673adab75bb7aef Reviewed-on: https://gerrit.libreoffice.org/67457 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit e6e8f02407ea781a3634fd2669ad6467e9587db4)
2019-08-05tdf#119126 forcepoint#76 avoid deleting footnote that would delete ...Caolán McNamara5-4/+34
... undeletable page (cherry picked from commit 0005b330eaed0b5559042d2597fb45e0c9125d7e) Conflicts: sw/qa/extras/layout/layout.cxx Change-Id: I4622569eb9c757c6dcbdda32081ddc94e53db919 Reviewed-on: https://gerrit.libreoffice.org/66393 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 558f01a29cb640760e73724f6efdc0a1be20c8e3)
2019-08-05crashtesting: bubble surface creation failure notification upwardsCaolán McNamara1-0/+5
e.g. on converting moz858095-2.svg to odg Change-Id: I1a222f1745cff9c4cb225f6c0c216072fb17b4f7 Reviewed-on: https://gerrit.libreoffice.org/58587 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit dbf34be458a2b5723084d1ed99390b744cee6053)
2019-08-05tdf#121005 forcepoint#44 merge into isDeleteForbiddenCaolán McNamara2-0/+2
Reviewed-on: https://gerrit.libreoffice.org/55355 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c6222fb6b8b429fa2e767c73ad616147f95ab1b9) Change-Id: If7ce44786975c5f9bdc9e64d16274728b03bed32 Reviewed-on: https://gerrit.libreoffice.org/62629 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit ba4861a0dfdf97448925130995d69b4c516f0644)