summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-22Nested list L must be a child of parent's LBodyfeature/cib_contract139Katarina Behrens
Implement this as https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf#G13.2259746 describes. The example implementation in Annex H8.2 https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf#G21.1021285 where nested L is a sibling of its parent LI contradicts the specification and is prolly wrong Change-Id: I2bd4a6692ac0cbe02ff6f1746656f104de3fe1f2
2019-03-22Fix pdf validation error 'glyph width in dict and font inconsistent'Thorsten Behrens
Previous code was writing hard-coded '1000' as glyph width for any type1 font subsetting - since actual type2 width info only became available during subsequent convertOneTypeOp() parsing. Catch was, that loop sometimes already modifies the output buffer (whenever glyph path info was given), so we fix that by first padding out 5 bytes for the width (size of integers are sadly variable), then parsing Type2 glyph code, and in the end putting in the actual width value we then know. Can't put hsbw type1 op last, since standard requires that to be first (and can only be given _once_). Could be re-done nicer by buffering Type2 glyph data, then writing it. Left as an exercise for the reader. Conflicts: vcl/source/fontsubset/cff.cxx Change-Id: I64ffaa32ded2f0a7c06311d1e0426cf358308a0a
2019-03-12Close all opened List elements at the end of the pageKatarina Behrens
Change-Id: I7c1e11ec57537441417f6b1cebe137587883d8c1
2019-03-12Limit tagging of background objects to imagesKatarina Behrens
i.e. don't tag background custom shapes and other than bitmap background fills Change-Id: I1d42012420f59e1e7b62affb8aca5a8c85688423
2019-03-12For now, skip tagged PDF export of background objectsKatarina Behrens
This reverts commit 9d5eceaaa5705bddd687db8b4e7aef91591dd5fc and bf978a527fb0bba27cd2c83443e70ad86a63d819 until a better solution is found because exporting them as either Figure or Artifact screws up document structure badly Change-Id: I6c0f28a29653aa294362c6249ad16e48f603707a
2019-03-12Tentative fix of tagged PDF export of artifactsKatarina Behrens
quote PDF standard, chapter 14.8.2.2.2: " ... to aid in text reflow, artifacts should be defined with property lists whenever possible." So instead of 'Artifact BMC ... EMC', we export 'Artifact BDC propertyList ... EMC' where property list is empty This is also how an example at https://www.w3.org/WAI/WCAG20/Techniques/working-examples/PDF4/decorative-image.pdf implements things Change-Id: I06e9a9119dd28ee80136393528fdd59d75f16951
2019-03-12Correct hierarchy of L, LI structure elementsKatarina Behrens
in particular, don't terminate LI prematurely Change-Id: Iaf642f547b072b12ccbf861536825a2526b8798a
2019-03-12Don't include shape/object name when exporting to tagged PDFKatarina Behrens
most of the time shapes have generated names such as 'Shape 42', those have ~no added value so let's not include them in Alt text Change-Id: I30314d5e901e11722e609dbf7ceddf74c5ed9707
2019-03-12PPTX import of shape descriptionKatarina Behrens
Change-Id: I7fcd5608a8cdbeea9ea15c9c9aa32c9020154750
2019-03-12Export background images provided by master page as artifactsKatarina Behrens
so that screenreaders don't announce them. To make this happen, pass them as NonStructElement to PDF writer Change-Id: I94d52ee0207cd6362edabfb9b891faa7fe341543
2019-03-12Process entire list item (Lbl + LBody) in tagged PDF-compliant wayKatarina Behrens
implemented as described in https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf#G21.1021281 Change-Id: I943c35cb8ee833ff46ff594e6b6c1025450b9ca4
2019-03-12Different way to determine if paragraph is within a listKatarina Behrens
pptx import seems little flaky in this regard, EE_PARA_OUTLLEVEL isn't always set (no such problem with odp). Instead, we'll query paragraph's depth and visibility of bullets/numbering Change-Id: Ia8cf6b7bb0e065a1378875442a99d79b006e2d77
2019-03-12fix crashThorsten Behrens
Change-Id: Ia0332b62daad878dd3af939a15a9947562b8ed0d
2019-03-12loplugin:returnconstant in svl,svtoolsNoel Grandin
Change-Id: Id297a513f3313e10531f0ccd99a16277e4e37fa1 Reviewed-on: https://gerrit.libreoffice.org/58111 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 928dfebe109794eb079469a46f549e25b3b1e89d)
2019-03-12call System.runFinalizersOnExit by reflection, since it was removed in jdk11Fridrich Štrba
Change-Id: I542c87bc1de21727a035cc6ac3b3e20c0ccfb5f7 (cherry picked from commit 983035cc974faf9a2dcc1ecdf01391e618970a7f)
2019-03-12Enhance TaggedPDF export (accessibility)Armin Le Grand
The current tagged PDF export does not well support quite some internal structures. This includes all apps (Draw/Impress/Writer/Calc) and some areas. Area AlternativeText ('/Alt'): Only writer currently at least adds Title information, but we also have Description (MS does add) and Name. Target is to add this information when available to content frames. Writer did that by manually adding that tag using PDFExtOutDevData::SetAlternateText, but only used Title so far. To make this work as broad as possible, better add this to primitives. There is already a primitive called ObjectInfoPrimitive2D that encapsulates any content adding Name/Title/Description using GroupPrimitive functionality. Changed Writer to use that way. Draw/Impress already uses it, all apps now use graphic paint using primitives, so we have a natural target to encapsulate. Add support to VclMetafileProcessor2D to interpret it and add - if mpPDFExtOutDevData->GetIsExportTaggedPDF() - that data using a combination of Name/Title/Description and add using mpPDFExtOutDevData->SetAlternateText. This works for Draw/Impress/Writer, but not for Calc because Calc does not create more complex data structures, so SetAlternateText does not work (see PDFWriterImpl::setAlternateText for more infos). Area Tagged ListContent (use 'L', 'LI', 'LBody' PDF tags): To support this in Draw/Impress, we can also use a similar way to support in primitives. For this I evaluated how to add needed OutlineLevel information to the existing (and already used to write 'P') TextHierarchyParagraphPrimitive2D. Added this and now ready to use in VclMetafileProcessor2D ::processTextHierarchyParagraphPrimitive2D. Added now using the OutlineLevel information at the TextHierarchyParagraphPrimitive2D. Made sure there are fallbacks to unchanged old behaviour when no PDF export or no Tagged-PDF used. Creating now '/L', '/LI' and '/LBody' statements as tagged PDF wants us to do. Exported PDF still works well while additionally a verifier as 'PAC 3' shows the expected and wanted structure. This will work now for any text in Draw/Impress and for Draw-Objects using Lists in Calc. Need to check for direct text in Calc cells and Writer - and guess how big the effort would be for these to make it work there, too. Area '/Artifact': Target is to avoid too much ScreenReader hassle when Impress uses Pictures/FillPatterns etc. in Background - what means on MasterPage in Impress. Experimented with different possibilities. Decided to use existing StructureTagPrimitive2D and extend for info if encapsulated data is 'Background' data -> on MasterPage. Can be created in ImplRenderPaintProc in method createRedirectedPrimitive2DSeque as needed by checking for MasterPage member (remember: primitives need to be as independent from model data as possible, never include e.g. a SdrObject reference in any way). Tried different ways to use this in VclMetafileProcessor2D processStructureTagPrimitive2D, see comments there. Current best solution is to just *not* create StuctureTag information for these objects. Change-Id: Ib2a578b02c1256758cda6d15ce37799803d8205c
2019-03-12crashtesting: stack exhaustion exporting moz1253590-2.svg to odgCaolán McNamara
happens on the crashtesting box, but not locally, comparing the stack frames its clear that the stack used on the crashtester for VclPixelProcessor2D::processBasePrimitive2D is over double that used locally... comparison on > objdump -S workdir/CxxObject/drawinglayer/source/processor2d/vclmetafileprocessor2d.o |less gives... void VclMetafileProcessor2D::processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) gcc-4.8.2-3.2.mga4 has... sub $0x5b0,%rsp vs... gcc-8.1.1-5.fc28.x86_64 has... sub $0x2e0,%rsp lets split up this method Change-Id: I6d84f555a01b5c58f530adb9b9b8cb8803c985bf Reviewed-on: https://gerrit.libreoffice.org/58364 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit aa2e694e8d9e22de94dbf21f81883f9af0e34ce9)
2019-03-12crashtesting: stack exhaustion exporting moz943243-4.svg to odgCaolán McNamara
happens on the crashtesting box, but not locally, comparing the stack frames its clear that the stack used on the crashtester for VclMetafileProcessor2D::processBasePrimitive2D is over double that used locally... comparison on > objdump -S workdir/CxxObject/drawinglayer/source/processor2d/vclmetafileprocessor2d.o |less gives... void VclMetafileProcessor2D::processBasePrimitive2D(const primitive2d::BasePrimitive2D& rCandidate) gcc-4.8.2-3.2.mga4 has... sub $0x11e8,%rsp vs... gcc-8.1.1-5.fc28.x86_64 has... sub $0x4c0,%rsp lets split up this method Change-Id: I73ef1eb0280224988176986918a2d025344197d0 Reviewed-on: https://gerrit.libreoffice.org/58362 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2a4b054b3685aaeca5bdcb2969bcfc25365421d9)
2019-03-12loplugin:returnconstant in ucbhelper,drawinglayerNoel Grandin
Change-Id: I4e84c570fe0e555a3aeb1f11632715de466d6e0e Reviewed-on: https://gerrit.libreoffice.org/58192 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 53491f8a66d72176aab332983f9aff47ecd3d654)
2019-03-12tdf#116195 sw: remove DisableOffPagePositioning handling from ODF importMichael Stahl
SwXMLImport::SetConfigurationSettings() needs to handle only those settings for which the default is different vs. old OOo/LO versions; DisableOffPagePositioning however defaults to false, so we can just rely on that default. The inverted bDisableOffPagePositioning check is wrong. (regression from fe3d5766fa3c42f6cf8d1ea47af820e0b1c1cf48) Change-Id: I300fa597f58b586b49089bb555a00a6923862abe Reviewed-on: https://gerrit.libreoffice.org/68801 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 8f3df3a5a1570eea4d931f737c474df8601377ec) Reviewed-on: https://gerrit.libreoffice.org/69037 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-03-11tdf#123772 Add testSamuel Mehrbrodt
Reviewed-on: https://gerrit.libreoffice.org/68701 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 9c2cf30333a3d1434c4184ed7a1e824c9fa3abb5) Change-Id: Id46bf2b293c4465f5c58f503c75904639d59f168 Reviewed-on: https://gerrit.libreoffice.org/68900 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-03-10Check svg URLs before exportingSamuel Mehrbrodt
Reviewed-on: https://gerrit.libreoffice.org/68668 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 34ec46571701d639d9bc542b2d19f87a21a83648) Change-Id: I3b86b6b82318b0d201c3d7db516664520eb47bed Reviewed-on: https://gerrit.libreoffice.org/68733 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-03-08tdf#121686: fix assert in SvxAutoCorrect::FnChgToEnEmDash (editeng)Julien Nabet
See https://bugs.documentfoundation.org/attachment.cgi?id=149773 Change-Id: I1696984a8df1b38a359a8177a5f3670526d2696e Reviewed-on: https://gerrit.libreoffice.org/68832 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 67d170868401335434772f1be23d565d23c1fbea) Reviewed-on: https://gerrit.libreoffice.org/68882
2019-03-07tdf#123452 EMF Re-enable compression for image/x-emf filesBartosz Kosiorek
Change-Id: I9fd801d5eef6c65f8e68e30723415da7b493d767 Reviewed-on: https://gerrit.libreoffice.org/68716 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit df22e97db5b7608b6d53b15b86b5a83610f9c87b) Reviewed-on: https://gerrit.libreoffice.org/68729 Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> (cherry picked from commit 36f027769ea6aaabb5e993a321d7a56775d4bee1) Reviewed-on: https://gerrit.libreoffice.org/68730
2019-03-06tdf#123829 Respect CollapseEmptyCellPara setting when reading odf docsSamuel Mehrbrodt
Commit 56b2cf0c10d9caa01ebae1d80465e342d046a85c introduced a "feature" which would hide an empty line after a table and only make it visible when the cursor is in it. So when loading an ODF doc, only enable this feature for which have the CollapseEmptyCellPara setting set. Change-Id: Ib4dfbbe8d45eb57547c51c7eee2f81331fc5300e Reviewed-on: https://gerrit.libreoffice.org/68742 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 0d2da0acfaa610c690bce552c0ed5df62d4c35cb) Reviewed-on: https://gerrit.libreoffice.org/68790 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-03-06Resolves: tdf#123815 null terminator included in stringCaolán McNamara
regression from... commit 18d636063fd7be165e7888af49372a6e2b851776 Author: Caolán McNamara <caolanm@redhat.com> Date: Mon Jun 19 09:46:31 2017 +0100 ofz: use OString instead of bare char* this is no use to the reporter though, as the document format is 10 and 11 is the oldest the filter will open Change-Id: I4cdfe92e37f047493a6eab95f0e8e9f5dced1a35 Reviewed-on: https://gerrit.libreoffice.org/68747 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-03-04Related: tdf#117761 oox smartart: backport fixes related to picture stripMiklos Vajna
This is a combination of 7 commits. This is the 1st commit: oox smartart, picture strip: handle bitmap fill of pres nodes There were two problems here: 1) We did not import bitmap fill from presentation nodes. 2) Presentation nodes contained properties with reference semantics, so if you set a bitmap fill for a first and a second shape, then at the end both shapes contained the second bitmap. With this, both bitmaps are imported exactly once. (cherry picked from commit 333e9ea15bb57cf1c87ac2ea150de1e3fd79cfcb) This is the commit #2: oox smartart, picture strip: fetch # of children only once in snake algo No functional changes intended. (cherry picked from commit 90372d52fdcc378473b89f4e6f2de0e206c110ef) This is the commit #3: oox smartart, picture strip: expose aspect ratio of children for snake algo The aspect ratio request of the Shape is not yet used in AlgAtom::layoutShape(), though. The heavy-lifting is needed, because the number of cols/rows in the snake algorithm depends on the aspect ratio request from the child algorithm, so need to transfer the aspect ratio from child algorithm -> layout node -> shape -> parent algorithm. Still no functional changes intended. (cherry picked from commit a1e10b7968fbf4dba962349be8a6dfb0cb1d3176) This is the commit #4: oox smartart, picture strip: fix too many columns with aspect ratio request The bugdoc has 3 items in the picture strip and PowerPoint laid this out as a single column with 3 rows (as a snake algorithm). We used to put the first two items to the first row and the third item to the second row. Improve out layout by taking into account what aspect ratio the child algorithms request: this way it's obvious that we should use a single column in case we have a large enough aspect ratio and few enough items. (PowerPoint also uses multiple columns without the aspect ratio request.) (cherry picked from commit 159e33ec661b2ce038b2642b2f30600ce7901d1b) This is the commit #5: oox smartart, picture strip: fix lack of spacing around the picture list The snake algorithm in PowerPoint seem to interpret spacing as follows: if you have N elements, then there should be the requested amount of spacing between the elements, and also double amount of spacing around the actual list of elements. With this, the SmartArt and the title shape in the bugdoc no longer overlaps. (cherry picked from commit 0a29c928afa74123bca05dc089c751603d368467) This is the commit #6: oox smartart, picture strip: fix lack of margin in text shapes Shape text has two kind of spacing inside the shape's bounding box: the shape-level margin and the paragraph-level one. Only the second was handled in the tx algorithm so far, add support for the first. The margins taken from constraints were way large by default: the only explanation I found for that is that SmartArt layout sometimes calculates in MMs, sometimes in Points, and the ratio between the two is exactly the Impress / PowerPoint margin. So assume that indeed that unit difference is the reason for the smaller in-PowerPoint margin values and do the same on our side. (cherry picked from commit 279c7f83a57c4d3991930ee80e9d9c287c21270a) This is the commit #7: oox smartart, picture strip: fix too wide child shapes Once the constraints determine the size, the aspect ratio may shrink one dimension to achieve the requested ratio. Implement the case where a >1 ratio shrinks the width, so the container of the image-text shape pair has correct aspect ratio. (cherry picked from commit f4fbb127897ea6afe27055d3b6cfcb0441080902) Change-Id: I7bac764c031e80bac532c4f97ebd5b5096401096 Reviewed-on: https://gerrit.libreoffice.org/68687 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-03-04tdf#123772 UnoControlDialogModel: Don't ignore property "Sizeable"Samuel Mehrbrodt
which is supposed to make the dialog resizable, but was silently ignored. Change-Id: Ifa2d2ea70c769f7785ac044ab2b681802c54bc17 Reviewed-on: https://gerrit.libreoffice.org/68515 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit e55c7ff6df82c597763d2eb551f7ccdaa95cd0a9) Reviewed-on: https://gerrit.libreoffice.org/68529 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-03-04tdf#121440 writerfilter: do not use imported style for foot/endnotesVasily Melenchuk
Extra style is causing editing problem near footnote/endnote references. This behavior is a side effect of eaa9cf6a3069fba3d82c046f0041bfb537d9e648, allowing emission of these "technical" styles. Change-Id: I1885b92814746e7b5cd19f3ddd7bc22eb691615e Reviewed-on: https://gerrit.libreoffice.org/68304 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 691ca4e1a3e510d54894a1e7df7fa4ad9f9cba11) Reviewed-on: https://gerrit.libreoffice.org/68583
2019-03-04tdf#123481 jurt: Avoid thread deadlockingSamuel Mehrbrodt
Change-Id: I7b6454090aeb1046a814520166a5b8c39b716f6d Reviewed-on: https://gerrit.libreoffice.org/67861 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit ea3c25358e3136cf900bc4e7d1bd6387dcca7883) Reviewed-on: https://gerrit.libreoffice.org/68660 Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-03-01tdf#116382 Replace old dialog in header and footer drop-down menuAditya
Remove the Background tabpage in "Border/Background" dialog accessed from Border and Background menu item in Header/Footer drop-down list and replace it with the tabpages "Area" and "Transparency" of the dialog accessed from Page Style > Header > "More.." button. The old dialog does not have the tabpages "Area" and "Transparency". In simpler words, the patch is to match both the dialogs when accessed in two different ways. Change-Id: Ib84435854389360eba41aecb8578a9a67a92ca1e Reviewed-on: https://gerrit.libreoffice.org/67483 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit 55042cb54fea5f7ad777c03af9bf8197127b6736) Reviewed-on: https://gerrit.libreoffice.org/68546 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-03-01tdf#123728 Always print on main thread to avoid deadlocksSamuel Mehrbrodt
Using lambda doesn't work on this branch, thus code differs from master commit. Reviewed-on: https://gerrit.libreoffice.org/68421 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 110803068b75ffd895a9b1139aee2248d30f085b) Change-Id: Ia8c2600aee42c3063e18032d1e485ad417ec4639 Reviewed-on: https://gerrit.libreoffice.org/68483 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-03-01fix LockCorruptQueryBox titleNoel Grandin
regression from commit 082e69fefb7439fd4f3d543f0c402039e94c1e9c Date: Mon Feb 26 16:53:37 2018 +0000 convert various MessBox to weld::MessageDialog Change-Id: Ia9cef4de4ae9c13201c838f20f0ba6b6cff7f35d Reviewed-on: https://gerrit.libreoffice.org/68505 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-02-28fix "doc will be saved" dialog messageNoel Grandin
looks like a copy/paste error in commit 942f05996bc287923cdbcae12c64e57adf8ec975 Author: Caolán McNamara <caolanm@redhat.com> convert remaining ErrorBox to weld::MessageDialog Change-Id: I52d38311b1e276fd799128e058ea0b9c902aef06 Reviewed-on: https://gerrit.libreoffice.org/68491 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit e76203f45a4c645447f8379ee2123f518a8aca77) Reviewed-on: https://gerrit.libreoffice.org/68503 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-02-28openssl: upgrade to release 1.0.2rMichael Stahl
Fixes CVE-2019-1559, plus a couple low-severity CVEs. Change-Id: Icb6849ca5f33cb1169ce303505b2e32636e3b25b Reviewed-on: https://gerrit.libreoffice.org/68430 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit e3b6c3ec9fd795601b0749675903fb49c72718fd) Reviewed-on: https://gerrit.libreoffice.org/68441 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-02-28fix Sequence ostream operator<< wrt. constMichael Stahl
Change-Id: I0e9cf35b45b0bcd58ce9d987ffb0384afda4c5dd Reviewed-on: https://gerrit.libreoffice.org/68021 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-02-28Update git submodulesOlivier Hallot
* Update helpcontent2 from branch 'libreoffice-6-1' - tdf#117890 Remove unhelpful screenshots (1/2) Change-Id: I8a96220ae688f78fe43d66ab205323f3d4605140 Reviewed-on: https://gerrit.libreoffice.org/68392 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> (cherry picked from commit c74a4653f50aedfd99ee83a1a841ad5b7886b9be) Reviewed-on: https://gerrit.libreoffice.org/68481 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-02-27add missing responsesCaolán McNamara
Change-Id: I2c24ea46b6e81ed02ae53da5e9ae1b7df85e44a1 Reviewed-on: https://gerrit.libreoffice.org/68456 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2019-02-26cairo: upgrade to release 1.16.0Michael Stahl
This fixes some minor CVEs. Not including the fix for CVE-2018-18064, which does not affect LO because we use the default implementation of FT_Memory which uses free/malloc. Change-Id: Ic047ed52cff3fdeba068f1b8d303c6c96c69addd Reviewed-on: https://gerrit.libreoffice.org/68088 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit caeaa7b90e42c60ec407e1f0cd5b5db2b30f55d2) Reviewed-on: https://gerrit.libreoffice.org/68217 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-02-25bump to latest cairoCaolán McNamara
Reviewed-on: https://gerrit.libreoffice.org/58134 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 00f6bec6b70130327313b9e203625272ef05ae93) fix own-cairo edge case build Reviewed-on: https://gerrit.libreoffice.org/59663 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 30020423bd76c6770db1627cfec684708ab3427c) Change-Id: I001da359569d37afe482cdbb50e9c8b3ced24aff Reviewed-on: https://gerrit.libreoffice.org/68216 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins
2019-02-22mDNSResponder: upgrade to release 878.200.35Michael Stahl
Apple can't afford the costly GPG licenses to sign releases apparently, but the sha256 matches some OpenWRT and FreshPorts repos... Fixes CVE-2015-7988. Removing windows build patches, fixed upstream (except for the last hunk of the SOCKET patch, but that is in code that is only used on MacOSX). Change-Id: I9fdba5929badb75f995c66da0850d188780e7beb Reviewed-on: https://gerrit.libreoffice.org/68092 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3a85c2db176db708c0ff9401c40858eb60e80f1e) Reviewed-on: https://gerrit.libreoffice.org/68139 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-02-22libjpeg-turbo: upgrade to release 1.5.3Michael Stahl
Fixes CVE-2017-15232, which looks rather minor. Change-Id: Icffb0c5160bef79577431a02eb10ed9492e01d11 Reviewed-on: https://gerrit.libreoffice.org/68091 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit e0b96b9863ebe52c4e35c21b3084da9e53ebee1f) Reviewed-on: https://gerrit.libreoffice.org/68109 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-02-21Related: tdf#117761 oox smartart: backport fixes related to cycle matrixMiklos Vajna
This is a combination of 6 commits. This is the 1st commit: oox smartart, cycle matrix: fix counting presentation children The markup is: <dgm:if name="Name6" axis="ch ch" ptType="node node" st="1 1" cnt="1 0" func="cnt" op="gte" val="1"> Where PowerPoint evaluated the condition to true, but Impress evaluated to false. This means that the undocumented relation between the child lists is "OR" (not "AND"). Also, our code assumed that "node" has to be a data node (not presentation node), but it seems the only way this condition can be true if presentation children is also counted. (The presentation node in question is not a presentation of anything.) (cherry picked from commit e3c6f249c10f7f1bcc528e643f5723288c514b29) This is the commit #2: oox smartart, cycle matrix: handle left/bottom constraint in composite algo The bugdoc has 3 shapes in the "outer" circle which have a position where either x or y is not 0. But these are defined using constraints talking about the right or bottom edge of the shape. Map that to top/left, given that we already know the shape size. (cherry picked from commit b9b4e9223b6c0d6e0b48b694c9aabbe54a250660) This is the commit #3: oox smartart, cycle matrix: fix too large height in composite algo The user-level problem was that the height of the entire smartart was too large. The reason for this was that: - composite algorithm gets the constraint height should be 77% of width, this means 6096000 -> 4693920 EMUs - at the same time the parent container is already smaller, 4064000 EMUs - a few lines later we already limit the max height with std::min(), but in the meantime an incorrect y position is calculated, exactly due to the lack of early limited height Solve the problem by making sure composite algorithm never works with a height (even when using it to calculate vertical center) that exceeds the height of the parent. (cherry picked from commit 5b2e38e0cfc7006d6982f741cf158a8a98dc8630) This is the commit #4: oox smartart, cycle matrix: handle aspect ratio in composite algo This way the 4 quadrant shapes in the center of the SmartArt form a circle, as width is shrinking. It's not height growing, as OOXML spec clearly says "ar" always just shrinks one axis. (>1 and <1 "ar" is to be handled when they are seen in action in an actual document.) (cherry picked from commit 34383064ac061497b0c46c449313877c6b6a2087) This is the commit #5: oox smartart, cycle matrix: handle destination order in connections It is possible to have connections from multiple data nodes to the same presentation node with a presOf type. We use to order these based on as they appear in the data XML, but we need to order them according to the destOrd attribute. Introduce an std::map for that, so get ordering automatically as we iterate. Turn the std::pair into a struct to make the code a bit more readable. (cherry picked from commit ecb733da58b74714eb66d2063a2835ce5c471870) Conflicts: oox/source/drawingml/diagram/diagramlayoutatoms.cxx This is the commit #6: oox smartart, cycle matrix: fix fill and line props of shape The topmost shape may not have 0 depth, but something larger. In that case at least it's safe to still use fill & line properties. The B1 quadrant of the test file now has the proper orange background, and B2's border is also properly orange. (cherry picked from commit 8193e697d286595aa62859011761adeb002244e3) Conflicts: oox/source/drawingml/diagram/diagramlayoutatoms.cxx Change-Id: Iccc5f6993693a0f1cf8f50d163003c24d3ad690e Reviewed-on: https://gerrit.libreoffice.org/68149 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-02-21tdf#123090 Handle removed column with gridSpan.Gülşah Köse
This is a combination of 3 commits. (cherry picked from commit 48ef20f2039d1a300a4324072e9b712c9994b406) (cherry picked from commit 00e89430a2f8cd1f9ec702a7583a1e4c886a2b46) (cherry picked from commit 1f0206d940cd8f7fb627a59cfe4165c0bfebaf46) Change-Id: Ic6fa6f335623e2114fc8bea76dc54833284d2a02 Reviewed-on: https://gerrit.libreoffice.org/68154 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-02-21Don't use the non-public fdatasync() API when sandboxed on macOSTor Lillqvist
Change-Id: I9e36cb78e3e945f6531a31e0ddf73d9c8d655f7d (cherry picked from commit 47c498417248444cab4e8f597ddeec4e0d585a71) Reviewed-on: https://gerrit.libreoffice.org/68138 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2019-02-19tdf#113020 Change horizontal-align to justifyLaurent BP
Some frames in templates were horizontal-align to left, which prevent from centering text Change-Id: I1de654af6ebfcad52352ed9031d14da00d72eff5 Reviewed-on: https://gerrit.libreoffice.org/67790 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 802e77dd4fe0192942a493b4c83e2c8b31c210c2) Reviewed-on: https://gerrit.libreoffice.org/67933 (cherry picked from commit 7b9f8fdee94f74107f5d6fb1fb94fab9dbb4047c) Reviewed-on: https://gerrit.libreoffice.org/67985
2019-02-19tdf#122982 Remove image from cell when cutting the cellSamuel Mehrbrodt
Reviewed-on: https://gerrit.libreoffice.org/67844 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit e756b6f310f309ac29bb2bce92309bb74edd788d) Change-Id: Idd73dcc88a8cd76eb4011bb26efdd5c712d16e5e Reviewed-on: https://gerrit.libreoffice.org/67854 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-02-13Revert "tdf#121962 Update fields after layout has been calculated"Samuel Mehrbrodt
See tdf#123378 for the problem caused by this. I have a fix at https://gerrit.libreoffice.org/#/c/67754/ but I prefer to revert the fix on 6-1 branch since this is the last release in this series and I'm not sure if the fix has other side effects. This reverts commit d9f02548f29678b8b7fc3a6c714ab144bd728005. Change-Id: If9298b9cafaf6984ce25ba78b2c7a79171567840 Reviewed-on: https://gerrit.libreoffice.org/67755 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-02-12tdf#116851: some rtf files provide param with "-" for "edmins"Julien Nabet
Change-Id: I2a2a189ee727a51aeef5601b39bb288d813fc8f3 Reviewed-on: https://gerrit.libreoffice.org/52610 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit c04c6c487e20730391cfc29dfe66b4558b7b4efb) Reviewed-on: https://gerrit.libreoffice.org/67708 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 08c98b7aba639e0d246f3662d7950885f8a81432) Reviewed-on: https://gerrit.libreoffice.org/67723
2019-02-11Resolves: tdf#123320 non-existing drop caps char styleCaolán McNamara
Change-Id: I416e3fcffe7da549ffd3b82cb912d78d1ca02339 Reviewed-on: https://gerrit.libreoffice.org/67684 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
generated by cgit (git 2.34.1) at 2024-05-02 13:52:39 +0000