summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-04-21try to use a different timestamp servicemimo-6.2.8.2.M3Andras Timar4-4/+4
Change-Id: I0fdbe2871d74836d530a69532bf22c17f642c922
2021-04-20Fix build with poppler-0.82Rasmus Thomsen2-1/+40
Change-Id: I3b6b3faea7986f3e5a6ae4790580d03bc9c955fc 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> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94380 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2021-04-20tdf#128538: Open filesystem directories in Finder after allStephan Bergmann1-3/+10
Where option "-R" means, according to the open(1) man page: "Reveals the file(s) in the Finder instead of opening them." This appears to always reveal in Finder, even for *.app "application directories", so should not affect CVE-2019-9847.) Change-Id: I775db7bf71c09adc6570931a977b82dfee8dc95a Reviewed-on: https://gerrit.libreoffice.org/82749 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 1ff1466b055890b2ca0ff3a47262bc048ad78542) Reviewed-on: https://gerrit.libreoffice.org/82756 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114213 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2021-04-20poppler: upgrade to release 21.01.0Michael Stahl6-64/+1050
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-04-20poppler: 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/c/core/+/94381 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2021-04-20tdf#131353: Fix build with poppler 0.86.0Martin Whitaker1-1/+3
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-04-20Fix build with poppler-0.83Martin Milata3-0/+15
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) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108954 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-04-20CVE-2020-25713 raptor2: malformed input file can lead to a segfaultCaolán McNamara2-0/+34
due to an out of bounds array access in raptor_xml_writer_start_element_common use a better fix than the initial suggestion See: https: //bugs.mageia.org/show_bug.cgi?id=27605 https: //www.openwall.com/lists/oss-security/2020/11/13/1 Change-Id: Ida4783a61412ffce868eacf81310da338d3e2df1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106249 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins (cherry picked from commit 43433f42017014a472a253314a6ac58a6774dced) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107082 Tested-by: Michael Stahl <michael.stahl@cib.de>
2021-04-20openssl: add patch to fix CVE-2020-1971Michael Stahl2-0/+579
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108884 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit b4c5bd9b330068e8c550e398cf761457ec9b6aa4) Change-Id: Ia756f1fa642eeb6dcadc867cc9730732a73c11b4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108953 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-04-20python3: add patch for CVE-2021-3177Michael Stahl2-0/+176
Looks like Python 3.5 is EOL, so backport the patch. Change-Id: I9ba397b3ed7e5f4ee4f78b144d822ce260ca9fb4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111059 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-04-20Improve checkExtensionStephan Bergmann1-12/+19
Change-Id: Iff416a9c5930ad5903f7ee51a2abbc94d5f40800 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110970 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins (cherry picked from commit f456c4dacf700e064e112ef068ff7edb04239754) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110922 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-04-20Better handling of Java filesStephan Bergmann2-1/+6
Change-Id: Ifa662be39ac7d35241ee31956e2556b7ba3b5a02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106558 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 696739056f37430154d6333b8f7228d1c44d09b3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106520 Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit ec5adc39cbea6d754ef68ab3d03fb16066b27e40) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107060 Tested-by: Michael Stahl <michael.stahl@cib.de>
2021-04-20tdf#130216: normalize paths with .. segmentsMike Kaganski1-11/+23
... which obviously are rejected by SHGetFileInfoW and SHParseDisplayName that it calls internally. Change-Id: I2f5f3c675ea6aa1c2d92eef30be4399a8d600255 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87565 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87737 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-04-20Bump product version to 6.2.8.2.M3Andras Timar1-1/+1
Change-Id: I32182655ff06488a1594c5d03916cfffa9fb7ba3
2020-10-23[cp] HACK: sleep before signmimo-6.2.8.2.M2Andras Timar1-0/+1
On Windows, with 16x parallel build, build-nocheck target fails, because it tries to sign a file that is already in use (gengal). Change-Id: Ic582334f2c02f5e38f49d048fc0425025ffeee41 Reviewed-on: https://gerrit.libreoffice.org/75235 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-10-21Bump product version to 6.2.8.2.M2Miklos Vajna1-1/+1
Change-Id: Ib6d2fff5e7745987568b8c5637d6eb5406635350
2020-10-21tdf#124513 Allow to use multiple Formula dialog instancesSzymon Kłos11-76/+82
[ The 6.2 version deals with a non-welded ScFormulaDlg. ] Conflicts: sc/source/ui/app/inputwin.cxx sc/source/ui/formdlg/formula.cxx (cherry picked from commit e5f74d20c2b72b107fe719cc888d779f17e5d57c) Change-Id: Ia24556f40dd06e3acb40f24334ab972e2dada26a
2020-03-24bump product versionto 6.2.8.2.M1Jean-Sebastien BEVILACQUA1-1/+1
Change-Id: If38028f94b37570f7cc5fae69b5ea2c7e5a0ccd8
2020-03-24tdf#125901: apply color modifiers when drawing hatchAndrés Maldonado1-2/+2
With this fix, the shadow of a shape with a Hatching fill is no longer the same color as the hatching (in full screen mode) Change-Id: I979866e748b5caf2ccafc8a6084ffdb46bc8122c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/73964 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 9c64e8a2948c379c537ee0882afa57882facb26e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85864 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-03-24tdf#124824 FILEOPEN: Error rendering page break between two tables in a RTFAndrés Maldonado4-0/+11
This patch is adapted from an old unpublished Linagora patch by mderoucy@linagora.com Change-Id: I49bd9a9797ef42cd110259bd0dd4d4747300da71
2020-03-24acim#1319: Clean SQL stringBevilacqua Jean-Sebastien1-1/+2
Change-Id: Idd8735021df5f7563312821dcba9da235f93cd50
2020-03-24Fix acim#910: tdf#83248: Use the right text color when printing fieldsArnaud Versini1-2/+1
Reviewed-on: https://gerrit.libreoffice.org/84707 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 10d345faa087fa49692f38bb2ece22560f423ba7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85848 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Change-Id: I81167207a35d524660b9a1d6740cfce551489c4a
2020-03-24bump product versionto 6.2.8.2.M0Jean-Sebastien BEVILACQUA1-1/+1
Change-Id: If804ce6b996f19fdd2c8ce230f540dd860715be0
2019-10-10Version 6.2.8.2, tag libreoffice-6.2.8.2libreoffice-6.2.8.2Christian Lohmaier3-0/+0
Change-Id: I011a01def8d8112ca712a5e652d942a1f3af2e06
2019-10-10bump product version to 6.2.8.2Christian Lohmaier1-1/+1
Change-Id: I4a21f58918014425de04dcbc4dfa1d3919c5f978
2019-10-10update creditsChristian Lohmaier1-1311/+1339
Change-Id: Ib98367116f9727f6ec54372d4cd90b657258b0d7 (cherry picked from commit 70ae1da67310a596e5bc49f1053c7ff72c84f539) (cherry picked from commit 5f01fe15eb2661f1f9ce12d1d99dc2a705b462ee)
2019-10-10tdf#128013: fix Crash when linking an odp fileJulien Nabet1-4/+7
See bt here: https://bugs.documentfoundation.org/attachment.cgi?id=154847 Regression introduced by: https://cgit.freedesktop.org/libreoffice/core/commit/?id=3c86ffd8ded628e6f2b4187948a1b1056f6a0f56 Reviewed-on: https://gerrit.libreoffice.org/80500 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 1dc4c8266d45eb2f5c3de303eaa9233e3b52f058) Reviewed-on: https://gerrit.libreoffice.org/80506 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Change-Id: Id9355958b0c4a56215ff98f0e5be13a3074ce45f Reviewed-on: https://gerrit.libreoffice.org/80539 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 60f604bd06418c2a521e0b7b018c0edf7e65e9c4) Reviewed-on: https://gerrit.libreoffice.org/80563 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-10-09Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-2-8' - update translations for 6.2.8 rc2 and force-fix errors using pocheck Change-Id: I2341567f45e7f639212e55292e568bebe88dbd9b (cherry picked from commit 3e7a06d16ca2b062179f0ea9ba1d0cc573f4c4b4)
2019-10-09tdf#124391 Fix doubled menu in global menuSamuel Mehrbrodt1-2/+6
Regression from 3bedbfd9b3cee5a8d2da6ee0486859bd725979ba Change-Id: I56473a2b0620f90f23b1bcde3ae1290801021038 Reviewed-on: https://gerrit.libreoffice.org/80466 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-10-09Related: tdf#124600 sw textbox: sync left/right margin of shape to textboxMiklos Vajna3-0/+24
Writer TextFrames have a default left/right margin; sync from shape to textbox is needed to have correct layout when a DOCX shape has 0 left or right margin. The left margin of the shape was already correct. (The shape in the docx file was extended to have text.) (cherry picked from commit ff5f02b9282e19a2a8a68604c588e9487021b0b5) Change-Id: I832f1bc460f2553bd7f08252d3e21000b4906538 Reviewed-on: https://gerrit.libreoffice.org/80109 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 74fc3dd94adeaac750e4cea08281d912dc5a11ee) Reviewed-on: https://gerrit.libreoffice.org/80439 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2019-10-08Related: tdf#124600 DOCX import: ignore left wrap on left-aligned shapesMiklos Vajna5-1/+21
The DOC import does the same in SwWW8ImplReader::AdjustLRWrapForWordMargins(). This fixes one sub-problem of the bugdoc, so now the shape anchored in the header has a correct position. This made it necessary to re-visit the tdf#115719 testcases, which are minimal reproducers. The original document had from-left alignment (instead of align-to-left), but this did not matter before. Bring the test documents closer to the original large document, so the tests still pass and don't depend on LO mis-handling the above mentioned left-aligned situation. (The interesting property of tdf115719.docx, where Word 2010 and Word 2013 handles the document differently is preserved after this change.) (cherry picked from commit 4883da6fd25e4645a3b30cb58212a2f666dae75a) Change-Id: I973c13df47b0867e2c4756f0c448495257b7c9d5 Reviewed-on: https://gerrit.libreoffice.org/80041 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 6de9cff1f918b6fc3ef58d9e080388c741e84b55) Reviewed-on: https://gerrit.libreoffice.org/80106 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-10-08Resolves: tdf#127786 cache Glibc locale string in LanguageTagImplEike Rathke1-10/+20
... for non-simple @modifier strings that are constructed using liblangtag, as loading resource strings needs it over and over and over again. Change-Id: Ib6a74e5ddb44508aa41f101c200a508bfa4a13bd Reviewed-on: https://gerrit.libreoffice.org/79770 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 24c7c12224f1c1d66f335f6fe085595352137646) Reviewed-on: https://gerrit.libreoffice.org/79775 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 99782b52c3cc25a32661c382ca98a32f6ec87003) Reviewed-on: https://gerrit.libreoffice.org/79787 (cherry picked from commit e7b8101cf7643d612393079d7f1cea07d8b1c774) Reviewed-on: https://gerrit.libreoffice.org/80105 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-10-08Resolves: tdf#127873 accept ',' comma group separator in number entities againEike Rathke1-1/+6
Existing documents unwittingly may have used that as decimal separator in such locales (though it never was as this is always the en-US locale). "Regression" from commit 9336286a7ea5385541344f444e6f8702c85bdacb CommitDate: Fri Nov 30 22:15:22 2018 +0100 [API CHANGE] Resolves: tdf#42518 new KParseTokens::GROUP_SEPARATOR_IN_NUMBER Change-Id: I0ffc1b8ec7c1820fccd8277036c64093dddf82fe Reviewed-on: https://gerrit.libreoffice.org/80023 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 2caa9d7ddcff3f6e380c306b737e9b5e9cdaf4c2) Reviewed-on: https://gerrit.libreoffice.org/80046 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-08filter: XHTML: make "calc-heading-digit" a little fasterMichael Stahl1-7/+4
Exporting OpenDocument-v1.3-csd01-part3-schema.odt to XHTML fails with: runtime error: file share/xslt/export/xhtml/body.xsl line 1404 element variable xsltApplySequenceConstructor: A potential infinite template recursion was detected. You can adjust xsltMaxDepth (--maxdepth) in order to raise the maximum number of nested template calls and variables/params (currently set to 3000). Unfortunately the document contains this many headings, and the calc-heading-digit computes the value by recursively looking at every preceding heading in the document, without TCO apparently... Try to improve this by using XPath to filter early the headings that are effectively ignored in the 3rd xsl:when case anyway: the ones with a level lower than the one for which the number is requested; this limits the recursive calls to the number of headings on the same level. Change-Id: Iddf5a91664402a57a0138731ddc9cebb06b0a126 Reviewed-on: https://gerrit.libreoffice.org/79720 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 86cca6b40ced4031dec4b708ac67b5cbe70cddf9) Reviewed-on: https://gerrit.libreoffice.org/79841 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 059fff471b05c0e26589a1a621b467af5bc6a159) Reviewed-on: https://gerrit.libreoffice.org/80008 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-10-04tdf#125585 write default layer status for OLE objectsRegina Henschel1-0/+9
The layer status is taken from the active view, when saving the document. But embedded documents have no view. Error was, that for all layers value 'false' was written in that case. With this patch the defaults (visible, printable, not locked) (true, true, false) are written. Change-Id: I2388ce31cc208fba075083889ec1bb2f874ef482 Reviewed-on: https://gerrit.libreoffice.org/79701 Tested-by: Jenkins Reviewed-by: Regina Henschel <rb.henschel@t-online.de> (cherry picked from commit 12f9a9f341fd8f8a98f7cd98f296a8729d279e0d) Reviewed-on: https://gerrit.libreoffice.org/79786 Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 44c0b7416d1abee971ef0b4b17e67f6e391dd807) Reviewed-on: https://gerrit.libreoffice.org/79859 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2019-09-26bump product version to 6.2.8.1.0+Christian Lohmaier1-1/+1
Change-Id: I84adf6557e38c4b3c99b95773a4f991a80465b30
2019-09-26Branch libreoffice-6-2-8Christian Lohmaier4-1/+1
This is 'libreoffice-6-2-8' - the stable branch for the 6.2.8 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.2.x release, please use the 'libreoffice-6-2' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I30687e641cd99a90546ae916db9d4eb600598beb
2019-09-26Revert "tdf#117988 writerfilter: IgnoreTabsAndBlanksForLineCalculation"Justin Luth2-1/+1
This reverts LO 6.2 commit 49ddaad2f3ba4e17e1e41e94824fb94468d2b680. tdf#127617 proves it simply was not the correct solution. I replaced the unit test document with one that clearly demonstrates that spaces/tabs should NOT be used in line height calculations. Example document tested with Office 2003, 2010, 2016. Change-Id: I2833384a017526d665adef0cae968bc4aef0dd94 Reviewed-on: https://gerrit.libreoffice.org/79473 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 202bee1a819de7b1e8c75dd863c4154f66419400) Reviewed-on: https://gerrit.libreoffice.org/79484 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit b0c5bc47d0d170df1384dd48cee9291ce6044083) Reviewed-on: https://gerrit.libreoffice.org/79527
2019-09-25tdf#99115: add Css selector '*' style only if the element...Xisco Fauli3-14/+112
... is on top of the hierarchy Otherwise, we add it for every element on the hierarchy Adapt unittest from https://bugs.documentfoundation.org/show_bug.cgi?id=100198 Provided by Sam Yygier Reviewed-on: https://gerrit.libreoffice.org/78997 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 4007ced54d611d1397387f7329a47de5efaca32f) Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Change-Id: I72c7ae08f3ce0194eff86697b202d5553810abeb Reviewed-on: https://gerrit.libreoffice.org/79018 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-09-25tdf#127652 sw_redlinehide: don't set invalid SwTextFrame offsetsMichael Stahl1-1/+2
The obvious problem here is that if a deletion spans multiple text frames, the offset of the 2nd one must not be reduced lower than the start position of the deletion; apparently this fixes the subsequent crashes with stale text portions having now invalid indexes into the string. (regression from 0acde7514e666fc04805fd36503bd174162336ca) Change-Id: Iaf9e2c5ca06ed36dc0e8611891d19c22f7661d34 Reviewed-on: https://gerrit.libreoffice.org/79421 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 9ec2c77046901fdacca77753052b54c81e6bc82c) Reviewed-on: https://gerrit.libreoffice.org/79433 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-09-24Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-2' - update translations for 6.2.8 rc1 and force-fix errors using pocheck Change-Id: I373ede836681f1aa2f1fbf9729b52ecbe198dd79
2019-09-24Resolves: tdf#127695 IsGroupObject == true doesn't mean its a SdrObjGroupCaolán McNamara1-3/+5
but that it has a SubList Change-Id: I473464de5c6bba5c36be1ad7cbd21a3158645d66 Reviewed-on: https://gerrit.libreoffice.org/79412 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit e6c07d2018d0b6be7492664fa22f70461b1422b8) Reviewed-on: https://gerrit.libreoffice.org/79428 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2019-09-24tdf#127235 break if object is larger than pagePatrick Jaap3-2/+28
We will always have an overlap if the object is larger than the whole page. Look for the next page style: if it is missing or the same as the current, we simply stop. Change-Id: I699d5146d215f17b4775dbcb32811fa5b6ebf60d Reviewed-on: https://gerrit.libreoffice.org/78696 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/79104
2019-09-18update creditsChristian Lohmaier1-1416/+1486
Change-Id: I4d6c996cbc25053fed93ce62e261c6ae77119961 (cherry picked from commit cfcf0731c919a20387cebc56c033f9328a0af735)
2019-09-17tdf#119809: FILESAVE DOCX The combo box ActiveX control is lostTamás Zolnai5-2/+22
The problem was with the empty combobox. The implemenation before this commit imported a combobox only when the combobox had any item. Reviewed-on: https://gerrit.libreoffice.org/78024 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 3ceefe9abff98fc24ffb5e8e405f4999faddc351) Change-Id: I945098277d1ed34c65b43f0f6ad8eb361cf41b53 Reviewed-on: https://gerrit.libreoffice.org/78394 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-09-17latest expatCaolán McNamara6-15/+12
Change-Id: Ia98c9718ccd8e18b5f56851027bde944164f05c4 Reviewed-on: https://gerrit.libreoffice.org/78978 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-09-17Resolves: tdf#98844 calculate as shown with SUM() againEike Rathke1-1/+5
Change-Id: I0032bdb9a8f54baa2e599861e45691a255f45275 Reviewed-on: https://gerrit.libreoffice.org/78708 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 4321d8c8b09fd880a18b4106cdd1f90acc18a861) Reviewed-on: https://gerrit.libreoffice.org/78728 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-09-12tdf#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/78759 (cherry picked from commit 859f49294ad95d3a6596e135e550253155d6517b) Reviewed-on: https://gerrit.libreoffice.org/78790 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-09-10tdf#118710 - Report Builder Character Settings dialog Highlighting tab pageTamás Zolnai1-1/+1
doesn't set background. Regression from: 62fb96e075e79676b45912a3a8ec2702b1e3aaf2 Change-Id: Ie60a4b4d988ba00b3a425dda73ed6ffeb40394c9 Reviewed-on: https://gerrit.libreoffice.org/78340 Tested-by: Jenkins Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com> (cherry picked from commit 6cc5baa0a15014c442932c60bb60dc2a84edc25f) Reviewed-on: https://gerrit.libreoffice.org/78379 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 583425d04937c4a2842185497742608c5e7b76df) Reviewed-on: https://gerrit.libreoffice.org/78392
2019-09-06tdf#121983 cairo: fix RPATH to contain $ORIGIN, not libtool's nonsenseMichael Stahl3-1/+17
Also transmit $(verbose) to the build so it's debuggable. Change-Id: I8620fdcae2fcd34807b6b83b7c38aa5ca1ba2caa Reviewed-on: https://gerrit.libreoffice.org/78596 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit bb9c07b82f4921941112de7e545af13a24b37f5d) Reviewed-on: https://gerrit.libreoffice.org/78629 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-09 02:15:26 +0000