summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-21Version 6.4.6.1, tag libreoffice-6.4.6.1libreoffice-6.4.6.1Christian Lohmaier
2020-07-21bump product version to 6.4.6.1Christian Lohmaier
Change-Id: Id0c069b53dfb4a0ec2b9dedb454104b6c6c4519f
2020-07-21Branch libreoffice-6-4-6Christian Lohmaier
This is 'libreoffice-6-4-6' - the stable branch for the 6.4.6 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.4.x release, please use the 'libreoffice-6-4' branch. If you want to build something cool, unstable, and risky, use master.
2020-07-21Update git submodulesChristian Lohmaier
* Update translations from branch 'libreoffice-6-4' to a86baa6cd1436f8de43a415d8b38e3ecce44e647 - update translations for 6.4.6 rc1 and force-fix errors using pocheck Change-Id: I496cd03a7f5b62f438cbc762561ea9bc9b3e924a
2020-07-21solenv/flatpak-manifest.in: Merge "Switch git repo URL from git: to https:"Stephan Bergmann
<https://github.com/flathub/org.libreoffice.LibreOffice/commit/75fd1b1b4a0945aec6de3534865578a7f3e30782> Change-Id: Id1ca1d09ac55d689ef0105b6ab9c29e7c6f85ebd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99128 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 0f288cf2df790d5cd13511471e0216c46c0564b5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99061
2020-07-18sw: fix crash when using anchor of at-paragraph fly ...Michael Stahl
... to insert fieldmark; the problem is that the anchor doesn't have SwIndex so the resulting sw::mark::Fieldmark's positions won't have SwIndex either, so they aren't updated when its dummy chars are inserted in lcl_SetFieldMarks(). Change-Id: Id6281f45aa1f1337f1ae599877f155b129389d81 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98852 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit ca2dfac3e790fb384e904502fe1ededd695001af) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98981 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-17tdf#77962 ww8import: 0x4xxx sprms are always 2 byteJustin Luth
SPRA(bytes) | SGC (property type) | A | ISPMD XXX X XX X X XXXX XXXX Focusing on the SPRA meaning: 0 is Operand is a ToggleOperand (which is 1 byte in size). 1 is Operand is 1 byte. 2 is Operand is 2 bytes. 3 is Operand is 4 bytes. 4 is Operand is 2 bytes. 5 is Operand is 2 bytes. 6 is Operand is of variable length. 7 is Operand is 3 bytes. Thus every 0x4xxx and 0x5xxx are 2 bytes sprmCIcoBi = SPRM_CHR(0x60, 1, spra::operand_2b_2); // 0x4A60 and thus it must be defined everywhere as 2 bytes. Wrongly "fixed" from 0 to 1 by commit bf24cca78e3c95d7a07e2073802c1540faec6920 Author: Caolán McNamara on Wed Dec 4 08:56:32 2002 +0000 #105926# some bidi properties with incorrect cached len Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98911 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit 56b04e40ab72b6333ce278ba2980650f5272025f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98845 Change-Id: Ic30df735ed325a508ef3c7220d9b06878af248a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98932 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-07-16tdf#134618 sw: WW8 import: don't insert fieldmark for SHAPE fieldMichael Stahl
Follow DomainMapper_Impl::CloseFieldCommand() and just don't waste effort creating a fieldmark that doesn't provide any benefit. This should avoid any fieldmark related problems introduced in e511a0ca5dde6d731bb126bbfe21768867890102..d9030ad6298e2f49ee63489d6158ea6ad23c0111 Change-Id: I6688dcda1e3b41ac648f3d69740f05d34bb46191 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98542 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 4e0aa38afd674f5ad16b4bc3222dc393543ad915) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98469 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-16tdf#134618 sw: DOCX export: fix order of as-char and at-char fly...Michael Stahl
...at same position. The problem is that in this case the as-char fly was written before the at-char fly but the positioning of the at-char fly can be relative to its character position, i.e. before the as-char fly. Apparently as-char flys are written in DocxAttributeOutput::EndRunProperties() via WritePostponedDMLDrawing(), wheras at-char flys are written earlier, in SwWW8AttrIter::OutFlys() via DocxAttributeOutput::OutputFlyFrame_Impl(). So this undoes the swap that these undergo via the magic of the mark stack. Change-Id: I83a72bb2affbf321fc4dea4e7fb37bdb43cea2e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98543 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 7b156d37cfc92292323694ec064fe51ae57b3257) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98633 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-15Breeze: tdf#126122, tdf#133038, tdf#133582Rizal Muttaqin
- tdf#126122: differentiate Indent and Promote/Demote - tdf#133038: toolbar icon for Catalan - tdf#133582: missing checkbox in gen env Change-Id: Ie1b7e8e7f0a6849586590724a7d73df0057ddebd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98800 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Jenkins
2020-07-15tdf#134654 sw: Alt-X - end keyboard selection tooJustin Luth
The selection itself was cancelled, but not the fact that a keyboard selection was "in progress". EndSelect is slightly heavy, so wrap it in a very lightweight if statement. ClearMark also checks HasMark, so real purpose in first checking it. Change-Id: I969a694c46d92201f3c3f2121e3fa3a2af27253c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98719 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit cef5a2d780ad01105dae860f6293f6f137603027) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98649 (cherry picked from commit 8901f44746f3df147d327e95125cbd4a08049843) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98762
2020-07-14tdf#134431 sw: fix crash on setting anchor of textbox while splitting a paraMiklos Vajna
Regression from commit 682e0488df819c191c13a03758fad0690706e508 (tdf#134099 sw: fix textbox anchors on copy-paste and undo, 2020-06-29), the problem was that setting the anchor of a frame format triggers "modify" notifications, but the handlers of those notifications expect a consistent layout. This invariant is not held while we're still in SwTextNode::SplitContentNode(). Fix the problem by updating the textbox's anchor the same way "normal" fly frames are handled, i.e. add/remove the frame format to the new/old text node manually and block notifications. (cherry picked from commit 9c8aa11ee7ddbae34afcce2cbfc4d521122a527b) Change-Id: If1f07d4230540796a81d9ed46a932b67d5995462 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98717 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-07-14Sifr: tdf#126122 differentiate Indent and Promote/DemoteRizal Muttaqin
Change-Id: I280c34263888e43f83d59bc6a0167b25cfa244d3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96192 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id> (cherry picked from commit f60b09b5d3edad6aa16dc494de0b35cbf9157be6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96187 (cherry picked from commit 5ebb8fbd21b53cf86f0029338058aaeaf616626c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98646
2020-07-14Icon themes: Fix for tdf#134768Rizal Muttaqin
Fix Line Arrangement Presets in "Borders" tab on "Format Cells" dialog Change-Id: I5d94e07a308cb195d14bc9d3320dfc4509e0bab2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98704 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
2020-07-13tdf#133600 Only one button selected by default in QR code dialogGabor Kelemen
Change-Id: I10a5f04492cf23caeb89cb119f91c578e5d57413 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95540 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98245 (cherry picked from commit 654f5316015a38b5c720a93305d21f63aa9697eb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98460
2020-07-12tdf#134548: sw: revert of changes to tab at zero posVasily Melenchuk
It looks like solution for provided in 5ed96c for tdf#83309 is enough to resolve original bugdoc, so these changes for emission of tab at zero position are not required and produce just regressions. Corresponding unittest for tdf#83309 is adjusted: it is using now original bugdoc. Conflicts: sw/source/core/text/txttab.cxx Change-Id: I2e7683f071f78c720436b4c9ccb903133a985e7c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98476 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98547 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98564
2020-07-10tdf#60684: graphic type content must correspond with graphic type extensionJulien Nabet
Change-Id: I8075b1b44aa400268b4022decb2a56770c81d83b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98239 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 7272a2edf113f29edeb8987ce649f85b776d9d23) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98456 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-07-10Resolves: tdf#134674 object inserting using dialogs SdrModelCaolán McNamara
not the target Documents one Change-Id: I07088bddc7c15109e7d377f86c6d0a7819faa658 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98348 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-07-09Resolves: tdf#124454 exec the matrix operator on values converted from stringsEike Rathke
Effectively a fallout from the matrix operations rework started for tdf#89387 that did not convert strings at all and subsequent work converted the string according to settings but did not apply the current operator on the result. Change-Id: I90c8963021396fd9a46b063f6aee96283f89271a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98385 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 7ead920f7015bb8e7a4343b863333bb26187d9a3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98339 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-07-09tdf#134260: docx import: allow default value for list tab positionVasily Melenchuk
It looks like previously used as a testcase document is just a specific case with default values. All other readers (incl. Office 365) displaying that doc with default tab at zero position. Change-Id: I50fe00c7f87b6d790fbe6e2f32a306ac59060c72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97089 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 7221994b9b29659d3290e95eee92b1a3f80c2b7e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98331 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 54b6a6a5c95ed51ce0cd709d9fd3e477ced5ce8f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98332 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-07-08ofz#23961 pad back to original lengthCaolán McNamara
in case of multi-byte input encoding resulting in a shorter output string than input Change-Id: Ieb4bb7b5f4551ca22e87c573233f083901f3d3c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98273 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-07-08Fixing top border style by fixing three XSLT issues triggered by...Svante Schubert
... new properties in ODF 1.3 * check for fo:border='none' * missing @ in @fo:background-color * without default case (xsl:otherwise), end delimiter for "page" missing in CSS Change-Id: Ie5d0c3e8a32de0403534c5a4fa33a5f20393ce69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98365 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 646cf598633bacc3959fc126c9117f06f3d0f9e3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98335 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-07-08tdf#130991 Scale the drop-down arrow size-requestJan-Marek Glogowski
When requesting the size of the drop-down arrow button, the arrow rect must be scaled, like all other native size requests. Change-Id: Ic0ccd96e812527c880868d385484655526ebb09b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97536 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit ba956e60a868e98d22bc95efd041f423987e7f76) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97576 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit f0daeb39aa61cc3435630cf0b9727f6da818de1a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97679 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-08tdf#134603 [en|dis]able logic reversedCaolán McNamara
Change-Id: I192b7a6da4bcd311e64a31d9dc2b4c2b422194cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98267 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-07-07tdf#134054 toolbox: respect drop-down arrow rectJan-Marek Glogowski
When centering the text and icon on the button, the code didn't take the drop-down arrow rect width into account, resulting in an overlapped arrow. This is especially visible, if the drop-down is shown and the button is wrongly highlighted. There is supposed to be some vertical mode, which I couldn't find in the GUI, so this just adapts the width in horizontal mode. Change-Id: I194780dc32db610041ad0ee45a425e1026c7c4e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97358 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 8565546ce6a04f6f243f4f60d2693b148dca5a77) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97688 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-07tdf#130991 Fit the drop-down arrow into its rectJan-Marek Glogowski
Looking at the original fixed-size arrow painting code replaced in commit b62c43d1200e524369d9c7c2bd1dad3044efd672 ("Anti-alias toolbar button drop-downs."), it used some fixed values of 5 and 3 to match the arrow box width of 11. The new code assumes the width is the expected arrow size, minus a minimal margin to separate the arrow from the button border, and there is enough height available. Based on these assumptions, the code now scales, positions and paints the triangle to fill the available space. Change-Id: Ied721e494d105106086ef6252e72ae7395eafe08 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97537 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 1cb897a0f65ba066d1e81b62c70c3e46bbdb7ba8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97583 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit b0315eb69c62f2108983e6a4b2177cf28a2663bf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97687 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-07tdf#134472 Only add spacing in header when flag is setSamuel Mehrbrodt
Flag was set, but not evaluated in 9b5805d1ef2b9e9c4e8f389c069807bf4489ea95 Change-Id: I46f19945be521e886baa0fc9a9a419d88c0915fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98224 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 70f9c3b8f03fb28215985a5b899bd8fae9cb3ac3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98085 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-07tdf#134264 writerfilter: fix DOCX->DOC of ADDRESSBLOCK fieldMichael Stahl
... and other unsupported ones; the problem was that the field got exported with ww::eUNKNOWN = 1, which can't be imported again. Move the ww8 eField enum to include/ so it can be used from writerfilter. (regression from e511a0ca5dde6d731bb126bbfe21768867890102..d9030ad6298e2f49ee63489d6158ea6ad23c0111) Change-Id: I19193392d62fdf0bba01fac2516bafe9fdfa5a99 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98221 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit ae2e8202407e82c9b14f0cc307742561f8c6e530) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98244 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-07Resolves: tdf#131424 separator in TableRef column specifier is validEike Rathke
Even only a separator or any operator single character. Change-Id: I102dd7fd49c1a6a7f1d8c39f4a6139a51dbebe51 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97535 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 31951265f541c9f5acf424674e2d1d97c0f3b8c2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97507 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-07-07tdf#134253 sw: fix SwUndoInserts::UndoImpl() if inserting before sectionMichael Stahl
Somehow the clipboard is pasted before the SwSectionNode, which is the first node in the body text. The OSL_ENSURE( !bStartIsTextNode, "Oops, undo may be instable now." ) is triggered; the Undo must remove 2 SwTextNode in this case. Because of the extra SwTextNode the indexes are off by 1 and this starts to assert since commit 24fd14b387dca458a1b6e9415e936d26562ddb1e when setting a fieldmark on a non-text node. Change-Id: Ic52b0f4c7665994cadfe8f074bc4607c55352aa1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97887 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit dc7e7b94a7211c576454267c09eb108e761e4487) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98078 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-07-07tdf#132956 Chart view: fix missing plot areaBalazs Varga
Do not reduce the inside area of the chart depending on the size of the legend. Use the default legend size. Regression from commit: 739ed2c29f49ea5e83bcd1352b2644c2e2d09f7b (tdf#115630 tdf#88922 Chart: fix custom legend position and size) cherry picked from commit cf46500243c51071227e08c5067041e414180ebc Change-Id: Ic191229d7ceab1f2689ab07424353108f8cb2b95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94059 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: Tünde Tóth <tundeth@gmail.com> Reviewed-by: László Németh <nemeth@numbertext.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95583 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-07-07don't add a cell to a non-existent column (tdf#104865)Luboš Luňák
This change also needs invalidating column position hints if the columns get changed by the copying of the cells. Change-Id: I4793e25f253c0197d88b313bc9336435cef649f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97603 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit ee2d2184133b3bf47d38a03b14abab2caa15dad1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97673 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 8765592db900fae22ff2a0440fe94842dcbd805f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97684
2020-07-07failed cell dependency check should not set invalid values (tdf#132451)Luboš Luňák
Calc's dependency check done before parallel formula cell group calculation tries to ensure valid cell values for all the dependencies of the group's cell, and if it detects a problem such as a cycle it bails out. But since ScFormulaCell::Interpret() simply bailed out without doing anything, other cells could use that cell's possibly incorrect value for their calculation and get their dirty flag reset. This fix adds a flag to mark that bailing out is in progress, which ensures the bail-out is short-circuited and no cell values are set. Change-Id: Ia93c70d456682e19ce533abd2cf65ce35ffed9ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96838 Reviewed-by: Dennis Francis <dennis.francis@collabora.com> Tested-by: Jenkins (cherry picked from commit 82803ef4736fbed89dd8ae0723f2c4f30e37ba8e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96801 (cherry picked from commit afb6dd43af5d1179c2e3cd8f00794cd4c3d75b2d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97493 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-07-06Resolves: tdf#134551 ModulWindow deleted when last module removedCaolán McNamara
leaving a dangling reference to m_aName. Hold a reference until ExecuteCommand is finished. Change-Id: I82ac5cc73427a945c78b9317dee9edf6129bb975 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98083 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-07-06Resolves: tdf#134490 do not skip all trailing '-' or '/' of the start stringEike Rathke
Skip *one* of them under the condition that a month name was actually recognized. A horrible implementation of commit b00fc9462d26083b6d09f72ea44abb1e11546b63 CommitDate: Wed Sep 15 11:54:10 2010 +0200 sc-date-fix.diff: Parse 'june-2007' as June 1 2007 in en-US locales Change-Id: I0800c4f0b33aa1413bde558d710fe467e4380262 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97903 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 348e78b8ccd04b59140c7f83504c7823b2ffbe8c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98073 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-07-06tdf#133877 use optimal size for hamburger buttonJan-Marek Glogowski
This way it'll properly scale, instead of using the fixed 28 pixel dimension. This is a hack, which is used a few more times in VCL. Still this should not be needed, but done automatically. If there aren't any constraints, just return the optimal size! Change-Id: I8aa32645ea95cba28d0daf56f0be27c15153b6c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96390 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit eff34e639055701b1299c07e6cdc0ce07cfc0936) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96411 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 1c73b219487b2aa60d888755cf4eca082e6b00c0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97464
2020-07-06tdf#123292 notebookbar: vertical align for shortcuts toolbarSzymon Kłos
Change-Id: I2f2ccee9d6c01962d5d8609ea55c0c2bca6b5cb6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92892 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 96e5121869e95a8e28788a91ce0dc480e5f10c0b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97463 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-07-03tdf#130151 Fix toc pointing to wrong pageSamuel Mehrbrodt
Change-Id: I26c1027722613f751bd39fde97f1e14d3238eefa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97413 Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Jenkins (cherry picked from commit 63f3485b57904de4e77c04f5759e6563fcce6748) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97504 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 0e558c86a3d25764d44c14e28232ff4629af75ff) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97581 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-07-03Resolves: tdf#134455 Let TIMEVALUE() use lax time recognitionEike Rathke
... to accept minutes or seconds >59 Prepare SvNumInputOptions as enum class in case further options would be needed for anything else. Change-Id: Ie9ae62adf68f9948e23f55ac32c09a6b992a36e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97784 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit f106bb4471b6d3627311980ed727459b2da8e448) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97793 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-07-01tdf#132172 Qt5 just handle visible widget's focusJan-Marek Glogowski
I investigated the state of isWindow() and the SalFrameToTop flags for the detached find toolbar (tdf#126607) and the Impress presentation and the tabbed "page size" drop-down and all had the same status (isWin: 1, flags: 12). Than I had a look at the gtk3 implementation, which just handles focus requests, if the widget is already mapped (gtk_widget_get_mapped). So I also dumped the visibility as the nearest equivalent in Qt to the X11 mapped state, and that was different. In the end Qt now also just handles the focus for already visible widgets, like gtk3, which works for all the cases I tested (incl. tdf#125517). And omiting either activateWindow or setFocus breaks some cases... and I still don't understand the GrabFocusOnly flag, which is just handled in the X11 backends at all... Note: this doesn't happen with 7.0+, because the weld'ed version of that control (commit 3afc718eddcd81232392d46fccc24b8ec626c8df "rework PageSizePopup to be a PopupWindowController") doesn't expose this bug (and also doesn't support mouse-over highlight). Change-Id: Id085732f6a52bbc69ed47fbd3d57454756a03121 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97549 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 06fb3e7b7f1079c276ad2f048cd94299b4bd7006) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97575
2020-07-01DOCX import: fix margins of inline shapes with effects, imported as Draw shapesMiklos Vajna
Effects have an extent, and unhandled effects (like this blurred shadow) need to take space in the margin of the shape to make sure they use the correct amount of space in the layout. This was working in general, but not in case the importer decided to import the shape as Draw shape + the shape was inline. (And also disable a new CppunitTest_sw_uibase_shells test on Windows, which is only stable on Linux, it seems.) Change-Id: I9d0531d9393d8c2cd274e6f54bbbfe8024bf270f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88427 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit bf25e69f8f657d5e3bcdd0bd54c5fa0d66ec85fe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96234 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-07-01tdf#128006 allow documents inside odbs to be as trusted as their containerCaolán McNamara
Change-Id: Id19d3805ef2e3282c1a8e89dd8edcccbf4ac4db6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96210 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ac65ade24aa10c0a39d7d38576ad54bd00724455) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97496 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-07-01tdf#134099 sw: fix textbox anchors on copy-paste and undoMiklos Vajna
Regression from commit c7307c77254557646f33017af915f6808a861e29 (fdo#82191 sw::DocumentLayoutManager: copy textbox content of draw formats, 2014-08-15), without which this problem gets hidden, as copy breaks the textbox into 2 pieces, so the textbox codepaths are no longer hit. The direct problem is that SwHistorySetFormat::SetInDoc() uses a raw node index into the nodes array, which is past the end of the nodes array. Root cause is that we have this invariant that actions and their undo has to be in sync, otherwise raw node indexes no longer work. In this case, SwUndoSaveContent::DelContentIndex() did not delete a fly frame format, because it was out of range, as it had a wrong anchor. Fix this in SwTextFlyCnt::SetAnchor(), so that whenever the anchor of a draw format is set via that function, we update its textbox as well. Also fix a related problem when fly formats were copied twice. (cherry picked from commit 682e0488df819c191c13a03758fad0690706e508) Conflicts: sw/qa/core/txtnode/txtnode.cxx Change-Id: I0d6c9069544c405eb20c5fed65fb40423b0adc84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97515 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-07-01tdf#134063: sw: redesigned support for tab at zero positionVasily Melenchuk
Initial support for tab position at zero (d2e428d1) was not taking into account hack for tab positions below zero. So previous behavior is restored (search is started from 0) but we also taking into account potential tabs at zero position in SwLineInfo::GetTabStop() Change-Id: I8b315ab69f9a53ac15002a41a81e069ff832f692 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96526 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 02c0e015f84ddcc6fa94433f603ef89f358a0391) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96582 Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97478 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-06-30curl: upgrade to release 7.71.0Michael Stahl
Fixes CVE-2020-8169, and about 3 other ones that don't affect LO/libcmis. Disable new optional dependencies "ngtcp2" and "quiche". Change-Id: I595ed909c4e792ac3244643511a338b117e7f102 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97406 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit cb0c7e26e5708010b1fe941ae2f66134f31ed876) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97386 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-30tdf#134043 DOCX import: DropDown text field instead of ComboBox form controlSerge Krot
Change-Id: Ide9cedefde3b00fa0eeb37a6540e8d4a420b70c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96471 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96608
2020-06-30tdf#134404 sw: another subtlety with start/end of section (at-para flys)Michael Stahl
fix this problem by comparing the start/end of the selection instead of the anchor position, which always has an index of 0: 1. new document with image anchored to paragraph 2. insert one letter 3. press Enter 4. Backspace -> Image gone (regression from cc4b5091e739116a7ec83513fa1cd856f0130330) Change-Id: I1219a9f58ce19ea88d697c90c862fe9005318177 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97511 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 17aeb522f566cf225baa5ce524e747089f76728d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97499 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-06-30tdf#132822 close open undo group before clearing undo stackCaolán McNamara
when changing paragraph. previous para undo info needs to be discarded, but that cannot be done properly if there is an open undo group. So pass the optional undo group guard down to GetNextSentence_Impl which can close it before it needs to set the new paragraph. Change-Id: I595c3598b15b6b1fdace045c3879617ecfea3faa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96398 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-06-30tdf#83309: sw: do not create bullet with no charVasily Melenchuk
On some machines (depending on fonts installed) creation of SwBulletPortion with bullet = \0 leads to drawing a bullet as a empty rectangle. Change-Id: I2826944f2278e8c9a6c740b11b69d2e4e5108158 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96711 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 5ed96c798679a1613b058a11b30cce4ba0ffd920) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96886 Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> (cherry picked from commit 0453702ea9cf48fc5764bb7d2d6685e0234e09cb) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97494 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
2020-06-30tdf#119081 sw: fix RTF paste into outer table cellMiklos Vajna
Regression from commit ed654c4aa7f9f10fcb16127349009bc0c38b12e8 (Revert "fdo#43869 use the old rtf importer for paste", 2012-11-30), the direct problem is that SwXText::insertTextPortion() is now used by writerfilter, so in case it's not as good as the internal API used by the old RTF filter, we have a problem. This function calls SwXCell::CreateCursor(), which calls SwXCell::createTextCursor(), which uses Move() to go to the first content node in the cell, but that means we end up at the inner cell's XText for an outer cell. So later when we want to go to the end of the outer cell, we can't, as that would be a different XText and we throw an exception. Fix the problem by instead using createTextCursorByRange(), which immediately positions the cursor at the insert position, so the XText will be correct. FWIW, the ODF import at SwXMLImport::setTextInsertMode() also uses createTextCursorByRange() to handle this situation. (cherry picked from commit e0d0274c2b806f5148b413926ec2e58c75ce04a1) Conflicts: sw/Module_sw.mk Change-Id: I1db13b860bc60771d98c2b4099be73f4bf41c375 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96937 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>