summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-08-06bump product version to 6.4.6.2.0+libreoffice-6-4-6Christian Lohmaier1-1/+1
Change-Id: I2bf3ddf69581ab6c5df132afb332ab42d704b20e
2020-08-06update creditsChristian Lohmaier1-1595/+1646
Change-Id: I2a9253f3c9699a235cdb1f051e728708a5da15b1 (cherry picked from commit ad99b6cb2de7eb91554c224540daef03027beaa9) (cherry picked from commit 07d3121bc21ddd599da5b1e4efd09107683dab53)
2020-08-06update creditsChristian Lohmaier1-1580/+1619
Change-Id: I5ab692f72ae2433fa39b23c65f16fe9a71fc990c (cherry picked from commit 26a29f7f62f4f98b7eafa738037bef3b737c8470) (cherry picked from commit 04a38d939cd0023a164e98bc59921890ac352a29)
2020-08-06tdf#130707 xmloff: survive <text:database-display> in editeng textMiklos Vajna5-16/+130
Regression from commit 28d67b792724a23015dec32fb0278b729f676736 (tdf#107776 sw ODF shape import: make is-textbox check more strict, 2019-08-26), now that we correctly identify what shape text to import as "textbox" (Writer TextFrame) and what to import as editeng text, there are documents out there that try to import mailmerge fields into editeng-based shape text. Fix missing error handling there. Note that the error is not just silently ignored, we do insert the field result into the shape text, existing code provides this already. (cherry picked from commit fd18d12efdfbe0e26d41d733edc711d0f40a7804) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100038 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit fec8b842d701cca0b79af9ea9f6192a8cf7610b0) Change-Id: Ibe631ac5d94c1c7795dd00bad05fdcca0e6741a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100055 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 790ab54d7232d232ba84f17f285d4639ddba80d5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100066 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-08-06tdf#135032: autoredaction, take into account emails in lowercaseJulien Nabet1-1/+1
Change-Id: Ie922a9e7203e46b19a0c7418983b1d0d7e787f02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99216 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 26357bcb3838698e041d7079105144dfb72856e1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99209 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 6360bea26ddc8e4d42c2f0c50b4f3974a07a8ce4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99490 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit b8e61e79067e476911e173356c5fdbbeafba0a6c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99492 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-08-06rhbz#1861794 csv fixed width import missing split handleCaolán McNamara2-22/+21
regression from... commit 1e97ca02773e2ba968606eed61d25d88f0d7e417 Author: Caolán McNamara <caolanm@redhat.com> Date: Mon Oct 14 11:05:07 2019 +0100 EndMouseTracking was left uncalled Change-Id: Ia952addac585737c3d3aa4fd68d772c3acbae848 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99733 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 1dab9a434acd51beb58373017ec293014349f033) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99741 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-08-06Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-4-6' to 786054e362a5584907ffcfe1398e7c63005219c7 - update translations for 6.4.6 rc2 and force-fix errors using pocheck Change-Id: Id908ccd8e13508c60a4a0cd1fbede491bb0bf2bb (cherry picked from commit d03e92fd5d821662dc0ed7d9a0a2b45da09de8a4)
2020-08-06tdf#134252 sw_redlinehide: fix SwUndoDelete for table before end of sectionMichael Stahl3-0/+163
In this funny case, the SwPaM starts inside a section, and ends in the first text node following the end of the section, which happens to be in a different section (but that doesn't matter)... this is because IsSelOvr() moves the end of the selection resulting in the 3rd SelAll off of the table end node (as the section ends with a table), but then it's on the section end node and moves forward again. SwUndoDelete::UndoImpl() must first create the outer section frames, skip over the start text node which has frames handled by RecreateStartTextFrames() and then create the frames following the start text node, where the end node of the outer section now finds its expected outer section frame. This relies on the code from 55576842ec72a748d0bad123d41fa03c89fc136d to move the existing text frame below the new section frame(s). (regression from 6c7245e789f973cf6dad03f7008ab3f9d12d350c) Change-Id: I9f39b09e603e75ef813d5c855d828ec9bd5fdd95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99723 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 740f1796504f66408b692225a9676c9ee3d63722) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99785 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 941086cdc0e8aa792eddc3d2284cd795aa8f7ea3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99922 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.com>
2020-08-05tdf#130559: don't fail creation of preview when BackingComp can't add...Mike Kaganski1-4/+15
an event listener. This crashes when loading a document with print preview set as active view. Regression after commit 128ecffe53394c1f045521c2efb42ea03a319f4b. Change-Id: I5dc421f7c08dd70d51772fac5432f33cd9a1491a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99442 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit e3b695f6a1525ac6b32abd27a6368a7e8b7d09fa) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99740 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a9457b3c18f6030b19d8cb1aada3709649a05460) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99747 Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 810b9dabc0b91629b0aadadb999b396a7879b385) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99923 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-08-03tdf#134250 sw_redlinehide: fix copy non-empty node before non-textnodeMichael Stahl1-1/+8
The problem in CopyImplImpl() is that pCopyPam's end position was updated to index 0 but text was copied into the node, which is thus not covered by pCopyPam and thus also not by SwUndoInserts. Then SwUndoInserts::UndoImpl() doesn't delete the bookmarks in the end node and the bookmark positions cause ~SwIndexReg asserts. Change-Id: I4cc03e846eae4cabd9eb4346a98c1e5c2866050d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99643 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 8ec8da5638ab465e69900a08067ad496bcb5d3d5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99778 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2deb30593b382e3780c76dcf9fb4dc8855aefde3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99748 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.com>
2020-08-03(related: tdf#134252) sw: fix assert when moving mouse pointerMichael Stahl1-30/+31
SwPageFrame::GetModelPositionForViewPoint() was calling GetCharRect() on a frame that doesn't match the passed prevTextPos; it was supposed to be initialised by GetModelPositionForViewPoint() call but that didn't work because the point was outside the frame so nothing was inited. (regression from edd2db1c783bd571ff796a5298385cacc91877b9) Change-Id: Ic064c3efc1b7f29d18d713206e5ea5ac0b67fbc8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99692 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 63308aa3b109271ffb4fd47e9fea2e3281a1552d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99780 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d7c123efdf0870dd8ca7e0f4e2a5648b024cd36d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99830 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.com>
2020-08-03tdf#134250 sw_redlinehide: fix Undo with section before tableMichael Stahl3-1/+159
... at start of document, part 2: In SwUndoDelete::UndoImpl(), the m_aEndStr wasn't inserted, because the pTextNd was a section node. This caused asserts when trying to add the history hints that used to be in the end text node. thints.cxx:1295: bool SwTextNode::InsertHint(SwTextAttr*, SetAttrMode): Assertion `!pAttr->GetEnd() || (*pAttr->GetEnd() <= Len())' failed. (regression from 57d488660572d62ef0371e50dcdd4ca7a6d98a14) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99644 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 27613259990d39d34b036b3d717d3ceaf5c15e65) tdf#134250 add unit test Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99672 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 50ceac91a4ac2057847e7d9807f5cb614e6ff755) Change-Id: I48caa7487d2d1e6250b5aceab18f270555d3ee8f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99779 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c2ed2045f1d09e501306e6e2fe77b67917100ac6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99749 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.com>
2020-08-02xmlsecurity: detect unsigned incremental update between signaturesMiklos Vajna8-34/+153
(cherry picked from commit 7468d5df5ec79783eae84b62bdc5ecf12f0ca255) Conflicts: vcl/source/filter/ipdf/pdfdocument.cxx xmlsecurity/source/pdfio/pdfdocument.cxx Change-Id: I269ed858852ee7d1275adf340c8cc1565fc30693 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99382 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ed21fa8d6edd97fad3a5b606b3522ab3bff14e05) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99745 Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-29tdf#134769 XLSX export fix: unable to open with MS ExcelSerge Krot1-1/+1
Change-Id: I8fff01118e25768ca54c816fcb0eb522da6f38bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99149 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 641dbafcb4c7b00bc9e56b58d12c95a6f05ee88d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99395 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 05b1e42a168b9675cff45b6be3ca8c28f01a629a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99491 Reviewed-by: Serge Krot <Serge.Krot@cib.de> Tested-by: Serge Krot <Serge.Krot@cib.de>
2020-07-27tdf#132911 sw_redlinehide: fix assert in CopyImplImpl()Michael Stahl1-3/+3
With Ctrl+A, Ctrl+X, Ctrl+V we get the bAfterTable = true case; line 4722 does pCopyPam->GetPoint()->nNode-- and then line 5085 does pCopyPam->GetPoint()->nNode++ but the problem is that nContent still points to the same node as initially while the node after the table end node is now a different one, i.e. nNode and nContent point to different nodes and something in redlining asserts becuase of that with "Assertion `m_pIndexReg == rIndex.m_pIndexReg' failed."; we don't get to step 4 anyway. (reportedly something changed with commit 4532845e22c10f252840887e55002307227b2390 but it's a mystery what that would be) Change-Id: I23744fad543e1e7bfcc11c4b488d4469ba9e509c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99166 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 14bdbc36f0cf3913f6de10c746044b6aadf37095) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99194 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 30bab6ff42297c9d7759d31e11e814bcb5d38cee) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99196 Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-07-27tdf#135077 Qt5 revert broken fix for tdf#132172Jan-Marek Glogowski1-2/+1
So I tested a lot of stuff, but missed the missing focus for new dialog windows :-( This is IMHO a far worse problem, then the popup, so just revert the fix. This reverts commit 14eccc62b53e202cd9ed63442481922a320fc02e. Change-Id: I391ad91ded90e4518ab024572d3f182769b0bcda Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99454 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
2020-07-21bump product version to 6.4.6.1.0+Christian Lohmaier1-1/+1
Change-Id: I3426df0df0cb52714c8b3d2d0d0bc24ec1e56011
2020-07-21Branch libreoffice-6-4-6Christian Lohmaier4-1/+1
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 Lohmaier1-0/+0
* 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 Bergmann1-1/+1
<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 Stahl3-2/+38
... 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 Luth1-1/+1
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 Stahl1-1/+1
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 Stahl1-5/+5
...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 Muttaqin527-374/+636
- 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 Luth1-0/+4
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 Vajna3-0/+29
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 Muttaqin298-48/+292
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 Muttaqin10-5/+5
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 Kelemen1-1/+0
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 Melenchuk5-12/+24
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 Nabet2-2/+5
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 McNamara1-1/+1
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 Rathke1-1/+1
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 Melenchuk2-0/+2
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 McNamara1-0/+3
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 Schubert2-4/+12
... 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 Glogowski1-2/+4
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 McNamara1-3/+3
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 Glogowski1-10/+8
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 Glogowski1-15/+16
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 Mehrbrodt3-1/+12
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 Stahl4-112/+245
... 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 Rathke1-1/+11
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 Stahl3-24/+37
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 Varga5-12/+38
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ňák4-1/+9
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ňák5-4/+95
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 McNamara1-1/+5
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 Rathke1-6/+5
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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 01:28:04 +0000