summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-03-01tdf#116382 Replace old dialog in header and footer drop-down menuAditya2-40/+14
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 Mehrbrodt1-2/+12
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 Grandin1-1/+1
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 Grandin1-1/+1
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 Stahl1-2/+2
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 Stahl1-2/+2
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 Hallot1-0/+0
* 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 McNamara1-0/+2
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 Stahl2-4/+4
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 McNamara2-4/+4
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 Stahl4-108/+2
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 Stahl1-2/+2
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 Vajna7-22/+181
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öse5-19/+91
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 Lillqvist1-0/+1
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 BP5-12/+12
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 Mehrbrodt2-4/+73
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 Mehrbrodt1-3/+2
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 Nabet2-0/+222
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 McNamara1-2/+7
Change-Id: I416e3fcffe7da549ffd3b82cb912d78d1ca02339 Reviewed-on: https://gerrit.libreoffice.org/67684 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-02-09Resolves: tdf#121002 UpdateRefOnNonCopy::mbUpdated=true if references changeEike Rathke1-0/+2
... somewhere in a previous shared formula group, so for the new groups after split the column is added to sc::RefUpdateContext::maRegroupCols in ScColumn::UpdateReference() to setup new listeners later, and true returned there, which also results in ScTable::SetStreamValid(false) at the end, which in this constellation wasn't the case. It may have been a reason that some documents have individual unrecalculated results stored (i.e. values moved within ranges that a shared formula group pointed to) that can be corrected by recalculating after load. Said to be a regression from commit 2f6a06856ad8df0c11a112d1e457b408e9a7af1d CommitDate: Fri Jun 5 16:22:38 2015 +0200 tdf#90694 reset group area listeners when splitting group but that only uncovered this misbehaviour. Change-Id: I6b04b71898c3f1774452dd19790c208f3167d8eb Reviewed-on: https://gerrit.libreoffice.org/67461 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit cdfa8b27f28328612b6734533981c1b363ced0a0) Reviewed-on: https://gerrit.libreoffice.org/67466 Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
2019-02-07Resolves: 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>
2019-02-07fix 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>
2019-02-06tdf#87884: UnoControlTabPageModel is using tabs w/o WB_NOBORDERVasily Melenchuk1-1/+4
No border attribute is a special case for vcl/TabControl, so by defualt created with corresponding UNO interface tabs were invisible. To create invisible tabs there is already "tabcontrolnotabs"(?) Change-Id: I3cc9baef9106f6c3fb5688daadbb5844d2b2a008 Reviewed-on: https://gerrit.libreoffice.org/67188 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 18f2e73f51c0f09c94f1a2b701d8e064adb39bf5) Reviewed-on: https://gerrit.libreoffice.org/67400
2019-02-06curl: upgrade to release 7.64.0Michael Stahl1-2/+2
fixes CVE-2018-16890 and CVE-2019-3822 Change-Id: I4c0021a5002590659cbfbdf642a7704a05309bf2 Reviewed-on: https://gerrit.libreoffice.org/67444 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 6ac54b9c8bce9425d3415d1e9bd8da318c44ed47) Reviewed-on: https://gerrit.libreoffice.org/67448 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-02-06tdf#118879 don't embed base64 image data if we have an origin URLTomaž Vajngerl1-2/+6
If an Graphic has an OriginURL it means it was created from an external source. We want to preserve this so we don't want to add the image base64 data - used in Flat ODF format. Reviewed-on: https://gerrit.libreoffice.org/67338 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 36aa3f4d6f9e9da7289ed760cfb1e87600cb6459) Change-Id: I2782ec53cf8dc78b0c360365d3eed3e5c54bf271 Reviewed-on: https://gerrit.libreoffice.org/67350 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-02-06tdf#87884: basic: fix for UnknownPropertyExceptionVasily Melenchuk1-0/+7
UnoControlTabPageModel had no USERFOMRCONTAINERS property and this was causing an exception during any attempt to set its properties. Change-Id: Icc432d7a431ecd861ac4f00a96ec75165bec168c Reviewed-on: https://gerrit.libreoffice.org/66801 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 3deab788199395712b7d4641be5b11623b2ed964) Reviewed-on: https://gerrit.libreoffice.org/67398 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-02-05tdf#119661 remove the original URL when removing a graphic linkTomaž Vajngerl1-1/+2
Change-Id: I8c875202ba8af9cbcd7eb9ce0db78f97d56a07a8 Reviewed-on: https://gerrit.libreoffice.org/67337 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 6a36bedd0a418ce12543f797ab46f24ee57feb6c) Reviewed-on: https://gerrit.libreoffice.org/67349 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-02-04Resolves: tdf#122930 paper tray is to update on focus-inCaolán McNamara3-8/+51
which adds the problem that GtkComboBox doesn't send a focus-in, but its toggle does, to find and use that instead Change-Id: I18d46511bf2e6997539a8413f574a94b24b4583f Reviewed-on: https://gerrit.libreoffice.org/67136 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-02-01tdf#123077 gtk3_kde5: Set KFileWidget's custom widget only onceMichael Weghorn1-0/+4
Since the event filter is only used to set the custom widget in the KFileWidget, it can and needs to be removed again once this has been done; which also avoids crashes. (s. https://gerrit.libreoffice.org/#/c/67185/ for more infos, where the same thing is done for kde5) Change-Id: I5c719fb17510916b4730ed5c00bb638df2f183e3 Reviewed-on: https://gerrit.libreoffice.org/67184 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 30cc54a4532a732a0cf6dfe9943521978ff7292f) Reviewed-on: https://gerrit.libreoffice.org/67204 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-02-01sw: fix use-after-free in SwCursorShell::MoveFieldType()Michael Stahl1-1/+2
Change-Id: Ie272373bcef3459b05dc29bf874ecc3fdfa31d4a Reviewed-on: https://gerrit.libreoffice.org/67151 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins (cherry picked from commit 1ec8caedace2de2b7e6bf91468301548b54a28a8) Reviewed-on: https://gerrit.libreoffice.org/67173 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-31libnumbertext: try to remove some odd stuff from ExternalProject.mkMichael Stahl1-5/+0
Why do we need this? Change-Id: I662402731de9b5c56d05730d31ae59606484ec97 Reviewed-on: https://gerrit.libreoffice.org/67210 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 67411db4517f38b9c0283717b52ece141ff49ed1) Reviewed-on: https://gerrit.libreoffice.org/67219 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-01-31Revert "configure: require autoconf 2.68"Michael Stahl1-1/+1
This reverts commit 8bc2018c83aeef691313502a83e42e8a0cc8adf4. No longer needed for libnumbertext. Change-Id: I093cffacc26c71b1a687d7e0a1d228561097ded0 Reviewed-on: https://gerrit.libreoffice.org/67220 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2019-01-31Resolves: tdf#122958 bmps with weird compression values that work in msoCaolán McNamara2-2/+12
Change-Id: Ie1887288cba7c1d56b807dbc9ddb886b9d20ff33 Reviewed-on: https://gerrit.libreoffice.org/67145 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-30odk: CustomTarget_build-examples hard-codes on "gcc" and "g++"Michael Stahl1-0/+1
... so it fails if these aren't available; instead use the C++ compiler of the LO build system. Change-Id: I8a95d1865c481dc0a790d6fec6ff9fae8284d76d Reviewed-on: https://gerrit.libreoffice.org/67078 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Jenkins (cherry picked from commit b05484224df74709edf654901d1da299c168e344) Reviewed-on: https://gerrit.libreoffice.org/67113 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-30vcl: fix deadlock in VclGtkClipboard::setContents()Michael Stahl1-1/+6
Must not call getTransferDataFlavors with m_Mutex held; 6 TransferableHelper::getTransferDataFlavors() (this=0x567b980) at svtools/source/misc/transfer.cxx:392 7 VclGtkClipboard::setContents(com::sun::star::uno::Reference<com::sun::star::datatransfer::XTransferable> const&, com::sun::star::uno::Reference<com::sun::star::datatransfer::clipboard::XClipboardOwner> const&) (this=0x3199550, xTrans=uno::Reference to (SwTransferable *) 0x567b9a8, xClipboardOwner=uno::Reference to (SwTransferable *) 0x567b9b0) at vcl/unx/gtk3_kde5/../gtk3/gtk3gtkinst.cxx:618 8 TransferableHelper::CopyToSelection(vcl::Window*) const (this=0x567b980, pWindow=0x301b0c0) at svtools/source/misc/transfer.cxx:960 CopyToSelection() uses SolarMutexReleaser, then getTransferDataFlavors() has a SolarMutexGuard; this will deadlock against the main thread that holds SolarMutex and calls VclGtkClipboard::setContents() itself, from VclGtkClipboard::OwnerPossiblyChanged(). Change-Id: Ibda0b6bce6f3388c45cee8077dd977abb3dda366 Reviewed-on: https://gerrit.libreoffice.org/67121 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 9286cebdff378a19ec146183676c6da96aac77db) Reviewed-on: https://gerrit.libreoffice.org/67154 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-30Avoid CFLAGS being set by accidentStephan Bergmann1-8/+8
When no CFLAGS are passed into autogen.sh, f104b3cafee63b47a735cfdce0f05dab2eedbb91 "tdf#72987 run firebird test for little endian only for now" (introducing AC_C_BIGENDIAN before AC_PROG_CC) caused CFLAGS in config_host.mk to accidentally be set to -g -O2 (instead of being left undefined). Change-Id: I639ce74b468e7fb25a6bda97346c7f97d6b829aa Reviewed-on: https://gerrit.libreoffice.org/67125 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit fcb08e31ee0635fe61338246a57e926c11890ac7) Reviewed-on: https://gerrit.libreoffice.org/67135 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-01-29vcl: unx: apply configuration to "Generic Printer" so it's PDF ...Michael Stahl1-0/+3
... by default, instead of leaving it with m_nPSLevel == 0 && m_nPDFDevice == 0. Change-Id: I44059ac39791442602cbc48582670d98edc578ee Reviewed-on: https://gerrit.libreoffice.org/66802 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit c8dd1c22d7512d4922461350c6cb804cd0864e0b) Reviewed-on: https://gerrit.libreoffice.org/67064 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2019-01-29dbaccess: don't try to migrate read-only fileMichael Stahl1-2/+9
It's going to throw IOException anyway. This fixes CppunitTest_dbaccess_hsqldb_test on read-only file system. Change-Id: Ifc8a4791ab9a1a8d3e0f1e67d65e10dac458147c Reviewed-on: https://gerrit.libreoffice.org/67028 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 577a9708ea9594d60b66c1c71d24175c66d24096) Reviewed-on: https://gerrit.libreoffice.org/67065 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-29configure: require autoconf 2.68Michael Stahl1-1/+1
LO's own configure doesn't need it, but the ExternalProject_libnumbertext requires this version; since it's available in RHEL6 as "autoconf268", just keep it simple and require it in the top-level configure. Change-Id: I43a6ef10089363c344f06134d75f54685ed7026b Reviewed-on: https://gerrit.libreoffice.org/67002 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 182f5a0f34fa45d2f74ba22eda41d4e39dca93e5) Reviewed-on: https://gerrit.libreoffice.org/67057 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-01-29Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-1' - update translations for 6.1.5 rc2 and force-fix errors using pocheck Change-Id: I579894af9bf0a9db2c0962434503a141aa6077e8
2019-01-29tdf#122927 prevent SolarMutex deadlock on join()Jan-Marek Glogowski1-1/+8
The AsyncRequests thread can be blocked in a SolarMutexGuard, so we have to release the mutex before calling join(). But there is also a static AsyncRequests object inside the VistaFilePickerEventHandler::impl_sendEvent function, which will just be cleaned up at DLL atexit. "Luckily" it won't ever run, so it doesn't need to be joined and we can use isRunning to detect it, prevent releasing a non- existing SolarMutex at this point and so won't crash LO on exit. Reviewed-on: https://gerrit.libreoffice.org/66901 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 5b2f1243bd44b450da26c8344b3ee459f8e88f6c) Reviewed-on: https://gerrit.libreoffice.org/66913 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 1ed8416703d1f1a33690cc47fd6cb6b2b3520cf1) Change-Id: I0c56b89a11f96be54e82b756c5e18a058b04a41d Reviewed-on: https://gerrit.libreoffice.org/66979 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-01-29Resolves: tdf#122662 restore context after changing stateCaolán McNamara1-6/+47
otherwise we may change a context which get reused by gtk for rendering something we don't ourselves draw directly Change-Id: I814140cd63489f7e4fac47a7486a006a4aa1fac5 Reviewed-on: https://gerrit.libreoffice.org/66849 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-29Resolves: tdf#123019 give modal dialog a parentCaolán McNamara1-1/+4
Change-Id: I669d8cb18ed78fcdb50aa3f452661500d75ad880 Reviewed-on: https://gerrit.libreoffice.org/67023 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-01-28Fix build with recent jdk 11.0.2Fridrich Štrba1-1/+1
Change-Id: I0ee68e087e3973b6a148f9bfefc16581606d6568 Reviewed-on: https://gerrit.libreoffice.org/66961 Reviewed-by: Rene Engelhard <rene@debian.org> Tested-by: Rene Engelhard <rene@debian.org> Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-01-28tdf#122951: Fix insertion of graphics as bulletsXisco Fauli1-4/+6
Regression from 81260c448911069ce8cb051d3a973ec52b9b43a3 Change-Id: Iecf00ea8310a767ff7945e7c1a0efe9dca5edd20 Reviewed-on: https://gerrit.libreoffice.org/66906 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-01-24Related: tdf#117761 oox smartart: backport fixes related to org chartMiklos Vajna9-28/+390
This is a combination of 10 commits. This is the 1st commit: oox smartart, org chart: add initial hierChild/Root algorithms hierChild is supposed to align and position its child layout nodes in a linear path under the hierRoot layout node, so initially just use a simple vertical layout algorithm. (cherry picked from commit 3103f9f9461f6eabb61a70be73862ef4be98010e) This is the commit #2: oox smartart, org chart: handle multiple elements in hierChild In case one manager has multiple employees, then we laid out only the first one. Recognize non-assistant type as the node type (as a start) to get the correct number of employees (when there are no assistants), and also render employees on a horizontal (and not on a vertical) path. With this, the 1 manager and multiple employees case looks reasonable. (cherry picked from commit dcd378bf614c99d705312259a0a0a25b40d88e2b) This is the commit #3: oox smartart, org chart: fix font color when defined with quick styles createStyleMatrixContext() assumed that <dgm:style> contains <dgm:fontRef>, but it contains <a:fontRef> instead. This resulted in a 0 mnThemedIdx, which meant that since commit 89206c472ecf18bfde6824cea8004921cd404365 (bnc#862510: PPTX import: Wrong text color inside shape, 2014-12-21) we ignored the theme color in oox::drawingml::Shape::createAndInsert(). (cherry picked from commit 5dfd5755c709e91d2903bd7be4582f7832e89780) This is the commit #4: oox smartart, org chart: fix vertical order of assistant nodes It seems the manager -> assistant -> employees ordering is not part of the file format. The order is stored twice in the file: the hierRoot algorithm has 3 layout nodes as a children, and also the data model has an order of the presentation nodes: both describe that employees go before assistant nodes. In contrast to that, PowerPoint orders XML_asst nodes before XML_node ones, so teach the hierRoot algorithm about this. This requires tracking the data model node type for each in-diagram drawingML shape, so that layout can determine if a hierRoot algorithm children has an assistant node or not. (cherry picked from commit 22086e70c4f3bb41620ff81ecaf57fd2af6ccbce) This is the commit #5: oox smartart, org chart: handle multiple paragraphs on data node This problem was similar to the one fixed in cfa76f538a44d4396574ece59e8a3953c22c6eb7 (oox smartart, accent process: handle multiple runs from a data point, 2018-11-21), but this there we handled multiple runs and this handles multiple paragraphs. It seems some smartart types allow multiple paragraphs in a diagram node, others only allow multiple runs. Org chart is in the former category. (cherry picked from commit dfc97dd381ef516ca4a7e99b29f9da1033a380f4) This is the commit #6: oox smartart, org chart: fix height of manager nodes without employees Employees and/or assistants reduce the height of managers -- this effect is wanted even if there are no employees/assistants. (cherry picked from commit 8638cc1b737195df16a160b148d2cd2c68131174) This is the commit #7: oox smartart, org chart: improve width of non-manager nodes The default case is that all managers have assistants/employees, so nodes under a manager can only use the horizontal space under the manager to avoid overlapping. But in case the previous / next sibling of the manager have no child nodes (assistant/employee) then we can use that space to make the child nodes larger. This improves readability of the chart's text a lot and brings the layout closer to what PowerPoint does for the same input. Handle all this in the hierChild algorithm, i.e. the container for a list of assistants or a list of employees, which means "parent" in this context always refers to a manager node. (cherry picked from commit 3a655975e5ea43417885513d0752da3627dd25ed) This is the commit #8: oox smartart, org chart: implement support for hierBranch conditions The relevant part of the layout is the <dgm:layoutNode name="hierChild2"> element that has a <dgm:choose> with two branches: <dgm:if name="Name34" func="var" arg="hierBranch" op="equ" val="std"> <dgm:if name="Name36" func="var" arg="hierBranch" op="equ" val="init"> The connectors were missing as we took the first branch (ConditionAtom::getDecision() returned true if the arg was hierBranch), even hierBranch on the parent layout node was set to "init". With this, the correct number of connectors are created, previously all employee connectors were missing. Their size / position is still incorrect, though. (cherry picked from commit ae34f471030869dfc0da1784597cae6f9131f8c5) This is the commit #9: oox smartart, org chart: fix shape type of connectors PowerPoint renders these as bent connectors, not as arrow shapes. Also add a bit of vertical spacing between the nodes, otherwise the connectors have no way to be visible. Their position is still incorrect, though. (cherry picked from commit 1791e08e9f27453ac5563ef400c715e30c791133) This is the commit #10: oox smartart, org chart: fix position and size of connector shapes Finally the bugdoc rendering result is reasonable and even looks like a tree as it should. (cherry picked from commit 2bfb9117b287a371066a157267614b9bdb367d71) Change-Id: I4e7a729afd3d2c5af2e7f41903737bd56be406fa Reviewed-on: https://gerrit.libreoffice.org/66718 Tested-by: Jenkins Reviewed-by: Aron Budea <aron.budea@collabora.com>
2019-01-24tdf#121561 sw DOCX: output toc-end inside last toc paragraphSerge Krot2-0/+20
During export of the TOC into DOCX all TOC field parts should be placed inside one STD frame: field start-begin, field-separate and field-end mark. Updated unit test. Change-Id: I10e37a48160e1dc4f0074c4e2e7621a59f79c2ee Reviewed-on: https://gerrit.libreoffice.org/66587 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit fd5599b9d23a2d9b13af6dd88bd2d38f438f7e00) Reviewed-on: https://gerrit.libreoffice.org/66810
2019-01-23tdf#122885: fix crash when converting odb file to FirebirdJulien Nabet1-1/+1
4 0x00007fffdfddf846 in (anonymous namespace)::lcl_makeStringFromBigint(std::__debug::vector<unsigned char, std::allocator<unsigned char> > const&) (bytes=std::__debug::vector of length 3, capacity 3 = {...}) at /home/julien/lo/libreoffice/dbaccess/source/filter/hsqldb/rowinputbinary.cxx:104 5 0x00007fffdfde04e2 in dbahsql::HsqlRowInputStream::readOneRow(std::__debug::vector<dbahsql::ColumnDefinition, std::allocator<dbahsql::ColumnDefinition> > const&) (this=0x7fffffff0350, nColTypes=std::__debug::vector of length 9, capacity 9 = {...}) at /home/julien/lo/libreoffice/dbaccess/source/filter/hsqldb/rowinputbinary.cxx:312 6 0x00007fffdfdf39f0 in dbahsql::HsqlBinaryNode::readRow(dbahsql::HsqlRowInputStream&, std::__debug::vector<dbahsql::ColumnDefinition, std::allocator<dbahsql::ColumnDefinition> > const&, int) (this=0x7ffffffefc74, input=..., aColTypes=std::__debug::vector of length 9, capacity 9 = {...}, nIndexCount=2) at /home/julien/lo/libreoffice/dbaccess/source/filter/hsqldb/hsqlbinarynode.cxx:56 See complete bt here: https://bugs.documentfoundation.org/attachment.cgi?id=148530 Change-Id: I0b0373a81d9299fd7bf3107d2262f5836e52e459 Reviewed-on: https://gerrit.libreoffice.org/66752 (cherry picked from commit 301ff4dfb82dfd961b993aec151784bd478b4f97) Reviewed-on: https://gerrit.libreoffice.org/66786 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-01-23tdf#122156: closing a section link should not clear its Hidden flagMike Kaganski3-1/+81
If a section is hidden or not does not depend on whether it's linked or not. Clearing the Hidden flag made all linked sections not hidden in DocumentLinksAdministrationManager::EmbedAllLinks() during mail merge. Existed since commit 84a3db80b4fd66c6854b3135b5f69b61fd828e62 initial import Reviewed-on: https://gerrit.libreoffice.org/65286 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit fdf4afb25ba38c7be3278bb4bde462c3f9e722fc) Change-Id: If347008e4cf48ab1327eb04db9fdf69750ce8fa5 Reviewed-on: https://gerrit.libreoffice.org/65316 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>