summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-08-16Version 7.2.0.4, tag libreoffice-7.2.0.4libreoffice-7.2.0.4Christian Lohmaier3-0/+0
2021-08-16bump product version to 7.2.0.4Christian Lohmaier1-1/+1
Change-Id: Iec0d90b5d17ae51b438e7ff7a04bb9b15fb6b352
2021-08-16tdf#143896: FILESAVE XLS(X) 1001+ rows are lost after saving new fileJulien Nabet1-0/+1
Regression from: https://cgit.freedesktop.org/libreoffice/core/commit/?id=2bf3e0d00e3bccb5b250642ee0d3fdbe6cae8ecc tdf#104502 sc: skip hidden columns at printing pages Page calculation counted the hidden columns, resulted printing blank pages by accident. Extend GetPrintArea() and GetTableArea() to count pages without the hidden columns, too. Change-Id: I77e7d6d893967a3ddac4c7c4e225769b38b44649 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120449 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit ab6c339faa15bf324f1161678717f02dbf8c19f6)
2021-08-10Version 7.2.0.3, tag libreoffice-7.2.0.3libreoffice-7.2.0.3Christian Lohmaier3-0/+0
2021-08-10bump product version to 7.2.0.3Christian Lohmaier1-1/+1
Change-Id: If826e8aa3d02705b409c2e02ea665e59fae89062
2021-08-10Revert "tdf#104254 sw DOCX import: fix text wrapping in headers"Justin Luth8-37/+13
This reverts 7.2 commit 798b69087119c01a3b51e0bb3240ef35cfededeb. The change affected not only DOCX compatibilityMode 15, but also DOC and ODT and older versions of DOCX and everything else which should not have been affected. This reverted change of course affected layout. Some bug documents didn't loop after this layout breakage. That doesn't mean that those bugs were fixed. So just revert the tests: Revert "tdf#96840: sw_ww8export3: Add unittest" This reverts commit 975488594fc88aaba7298448e0ff727ebca7fe85. Revert "tdf#64997: sw_ww8export3: Add unittest" This reverts commit 02af9b8ef1f87bb6bc5fee22ad184681b20f201a. Change-Id: I54f7b801199bba45d8ca6f82f77e7060c7b3fcf7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119887 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit d03aaef3dcb5d142955457ae9b8ca4469cfafa38) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119973 Tested-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit ff91ddf0a3992b58112f3ffc3e76735b9d66e514) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120144 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Michael Stahl <michael.stahl@allotropia.de>
2021-08-10tdf#143572 Restore enable undo setting immediatly after object nameJim Raykowski1-0/+2
is set each time here This prevents a crash when an object is in text edit mode and a different object is selected in the navigator to jump to. Change-Id: I7c0eaa7770f0e3f23e6a62780f18e0a973019c62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120170 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit 18004b707d2cb92ab88923138d72c5ca1b03301c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120141 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 64919f64f5da1ac149b5a0e1079ea8fd2299c574) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120143 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-08-10tdf#143626 "protect" always shown checked for sections linked to fileCaolán McNamara1-1/+0
Change-Id: I8a403a25ae5c5e3b6183ba559b0224f2886eb925 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119861 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit c99b55cbcd98ca6c96c901bc7c1129814cfac4ab) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120151 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-08-10tdf#142532 search string at any position not just startTomaž Vajngerl2-32/+69
In the first implementation, we check if the search string is at the start of the command string. Mainly this is done to find the right command with a better accuracy. The problem with this is that it discards other hits where the search word occurs at an other position in the command text. This change adds the command where the search string doesn't occur at the start of the command string, but it adds those hits to the end of the list, so the best matches are still added at the beginning. Change-Id: I44a15400c84d45b0c8d3b65ec0e1ffee10686e72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119962 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit fc0d2136aee6c1749d780de09df025251703b59e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119983 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-08-10update creditsChristian Lohmaier1-2107/+2139
Change-Id: Iad0175ccc7a1ee903812f34bcacb86e3f90e58b3 (cherry picked from commit 555366667c9a62f366230843c1727b0643a06b1a) (cherry picked from commit 2e2fa3ca1cc652d296a06f08748b33ca50b25d66)
2021-08-10Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-7-2-0' to 51cf809cfdc1bd1d9038711dea8f95c5bb20eff9 - update translations for 7.2.0 rc3 / master and force-fix errors using pocheck Change-Id: Ifd8f486c7c40d1b9f5e78313bc94496f86698681 (cherry picked from commit 2ec580d39ac7950b584fde730d22fa4f09dd8399) (cherry picked from commit 636c5cce84b63bcec08aefeecfe37027470e1de9)
2021-08-09Always provision PATH the cygwin way under WindowsThorsten Behrens4-15/+3
With PATH essentially serving the role of LD_LIBRARY_PATH under Windows, there was the notion that this needs to be provided in Windows notation, for win32 gnumake. That was perhaps once true; currently we're always evaluating PATH inside a shell, not the Makefile. So this since a while only worked accidentally, due to cygwin transparently converting between DOS and UNIX PATH vars. It did break though for corner-cases, e.g. SRCDIR!=BUILDDIR, and BUILDDIR e.g. D:\FOO. With that simplification, also GNUMAKE_WIN_NATIVE can go. Change-Id: Ied5a0443dc70e7dc629c0c0620e6ce911d9a73d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119941 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit da36d655608c3da39fd79d95974e1f7404a27aa0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119976 Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> (cherry picked from commit 71e7457cddda30a52cbf91d400e682bf11b67fa5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119981 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
2021-08-09tdf#143686 Increase a width of the labelRoman Kuznetsov1-2/+2
Change-Id: I71d7994ad7ed4506c1514cf417a535caff20b05f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119869 Tested-by: Jenkins Reviewed-by: Roman Kuznetsov <antilibreoffice@gmail.com> (cherry picked from commit af0437d7b1d9cc5a00b7d01a6510e5ba40ca1a12) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119985 Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit df389c813637f7681fccf025a624554b3627468e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119986 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-08-09tdf#143657 'execute' button doesn't get enabled when contents changedCaolán McNamara1-6/+6
since... commit 73c9ef661d9ef6237d3fd3c259fd040a545b44cf Date: Tue Jul 6 18:51:38 2021 +0200 tdf#132740 don't broadcast if modified status has not changed now we only get a notification on transition from unmodified to modified. So continue to launch a timer on transition but clear modification on firing so we will get notified on the next change and move the modify callback to the timer. modifications are no deferred until the timer fires, so reduce the timer to make it smoother Change-Id: I27980be54de20bb516b1f106c3ed1b303e2a4014 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119864 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
2021-08-07tdf#143388 rebind command search from CTRL+F1 to SHIFT+ESCTomaž Vajngerl1-1/+1
CTRL+F1 is reserved by the OS. Change-Id: I7b5804fc3c65edc8279559635f33ff932bf6ae45 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119871 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-08-07Resolves: tdf#143714 only three of four of these buttons have always-show-imageCaolán McNamara1-0/+1
Change-Id: Ic4bb951d0a7800b5d920a3b40c2bb4b06ecbc629 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117203 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119975 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-08-04fix install with --disable-cmisRene Engelhard1-1/+1
Change-Id: I51430a860a0b5047b566ed8184f0f563ec54f288 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119661 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 299b72e4c9ad239d747e47eaf004400f5a590695) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119626 (cherry picked from commit e5dd63f1904582fe40f848675bc23630d24e9334) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119867 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2021-08-04Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-7-2-0' to 43587c6ccbdb8cff898f5f2d4d9b405a723ee107 - update translations for 7.2/master and force-fix errors using pocheck (cherry picked from commit 879d0acff38f25a4219a9da35bda3ead3f8b4b63) (cherry picked from commit 084abfc185b00eb2c42e84c354d4d005f8b9fb3f)
2021-08-03Consolidate link update handlingEike Rathke6-59/+71
Have it at one central place and identical for all document loading paths. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119835 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 55abc3eb93fb8314b413453e384261cb00fde087) Conflicts: sc/source/ui/docshell/docsh4.cxx Change-Id: Ib00153a9f5831e223d0129df0538353a7e20961e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119852 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-07-28bump product version to 7.2.0.2.0+Christian Lohmaier1-1/+1
Change-Id: I6012ee369fdee5bdbb46163911bd49b7734dc972
2021-07-28Branch libreoffice-7-2-0Christian Lohmaier4-1/+1
This is 'libreoffice-7-2-0' - the stable branch for the 7.2.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 7.2.x release, please use the 'libreoffice-7-2' branch. If you want to build something cool, unstable, and risky, use master.
2021-07-28Revert "tdf#58521 DOCX import: enable ContinuousEndnotes compat flag"Gabor Kelemen4-18/+1
This reverts commit e35fc16969c0d0a55538733d76fc4bb03bf137b0. Reason for revert: tdf#143456 shows there are layout problems with this compatibility option Change-Id: I4f03b9a0cbc6de1d3dbf79681f7caa203a1ce59c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119451 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-07-28ODFF: eliminate spaces between function name and initial opening parenthesisEike Rathke1-1/+8
Same as for OOXML, they are disallowed in ODFF as well. Change-Id: Iff78a901838092a3ee32221fdaadd28ee50f7646 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119577 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 6eb9fde88af245a00247fca8a592ed08ee4b8bbe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119449 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-07-28Update git submodulesStanislav Horacek1-0/+0
* Update dictionaries from branch 'libreoffice-7-2' to 447a883184eaa8643fd6ae9a85ca64ef1d912d35 - Czech Hunspell: add several word forms Change-Id: I227d4fe75539691c75323ffcc822545081ced9ae Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/119643 Tested-by: Stanislav Horáček <stanislav.horacek@gmail.com> Reviewed-by: Stanislav Horáček <stanislav.horacek@gmail.com>
2021-07-28Update git submodulesXisco Fauli1-0/+0
* Update dictionaries from branch 'libreoffice-7-2' to b6f494a9946de2899acf22c843ef7386d09a5cf4 - tdf#143489: Update Galician dictionaries to version 20.08 Change-Id: I95b0064894a10a47e638568f85ddf5eb97ac345e Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/119372 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit c292071ca8f8dece2bf5655038cdfd4899a09fa3) Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/119614 Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-07-28Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-7-2' to 325c25d7264976f4272460ae6852f2743e62bf02 - update translations for 7.2.0 rc2/master and force-fix errors using pocheck Change-Id: I7b7bd01e640b88e6e81140686a68f72592e5a25d (cherry picked from commit a2b54ae27fac12ee3aee478872632c377e1843f9)
2021-07-28tdf#139426 Supress AssertFlyPages in Tabe re-layoutArmin Le Grand (Allotropia)4-1/+13
The current code tries to on-demand create content in form of a SwBodyFrame at a SwPageFrame. That unexpectedly and unfortunately leads - when done during a Table re-layout action - to an endless layout loop. I tried quite some solutions, but the simplest and safest is to just supress AssertFlyPages in that specialized TableLayout. Other solutons may break MailMergse, so CppunitTest_sw_mailmerge needs to be checked with any fix in this area. For more details, see tdf#task comnments. Change-Id: I02de9ee72848061497678936aa1d0c492694bfc2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119324 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> (cherry picked from commit 0bac5c7e7d71658c5056c4bf0b71fbfb51b92ca0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119266 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2021-07-28Revert "tdf#58521 Enable ContinuousEndnotes compat option for RTF too"Gabor Kelemen4-236/+1
This reverts commit 59c5732875c1bea619ed461a378906a2dce12b48. Reason for revert: tdf#143456 shows there are layout problems with this compatibility option Change-Id: I73cbbb73f3110bc93840b8f0de0f2fab69250ebc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119443 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: Jenkins
2021-07-28tdf#101630 - gdrive support w/oAuth and Drive API v3Christian Lohmaier9-55/+1007
LibreOffice is only using drive.file scope, so can only see files it owns/that were created by LibreOffice. In addition, also store the refresh token in LO's password-store if the user enabled persistent storage, removing the need to to the copy'n'paste dance to grant access each time LO is launched. related tdf#115643 also store the refresh token for onedrive consolidate the fallback-auth provides for onedrive/gdrive into one, they are all the same login in browser, then copy code method that ultimately should be changed to having LO listen on local port for the code Change-Id: I97e3843682c302d2884e35ece6e72bc3a07e2539 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119572 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 73041de9563c9a973d1b5394c6e5520a7d799980) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119446 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-07-27tdf#143424: support for "Chapter number without separator"Vasily Melenchuk6-3/+48
If LO is using list format strings (this is default behavior since aa5c6d12) it was not able to show just numbering without all formatting, as it used in some fields. Change-Id: Ib4695b8e1c2d7a451522c7e04af2216d16aceefe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119309 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Tested-by: Jenkins (cherry picked from commit d44730148a95933f4a45a70241cb6d1d0546f626) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119440
2021-07-27tdf#142693 DOCX import: fix zeroing huge page sizesAttila Szűcs5-2/+15
which bigger than 2^15 twips (> ~57.8 cm). Regression from commit 4d1621136c464b462a598571ecdcfe2ae119d8c7 "Fix ignoring large twips values like MSO does (cp#1000087)". Note: Writer could export page size up to 600 cm × 600 cm, and now it can import it back as well. It can even import page sizes in kilometers, and display that, but there will be other issues about its display. MS Word couldn't save page size over 2^15, but can import, and display them till up to 2^16 (that is about 116 cm). Co-authored-by: Tibor Nagy (NISZ) Change-Id: Icc1bd708d53036768a7be94cb1ebe18c1c4c8487 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118940 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit d5d9795968771651c57c661d95b6992c3c778eca) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119441 Tested-by: Jenkins
2021-07-26sw: layout: fix red triangle problem with text frame in sectionsMichael Stahl1-1/+1
First, a document is loaded, then about 4 pages of content are pasted into it, in about 6 paste operations. In an idle layout action, a page's worth of content moves forward; the text frame at the bottom was split previously, and is joined. The follow has the same upper as the master text frame, so this causes the upper section frame to shrink: SwRect::operator=(const SwRect & rRect) Zeile 256 SwFrameAreaDefinition::FrameAreaWriteAccess::~FrameAreaWriteAccess() Zeile 112 SwSectionFrame::Shrink_(__int64 nDist, bool bTst) Zeile 2327 SwFrame::Shrink(__int64 nDist, bool bTst, bool bInfo) Zeile 1562 SwContentFrame::Cut() Zeile 1339 SwTextFrame::JoinFrame() Zeile 677 SwContentFrame::MakeAll(OutputDevice * __formal) Zeile 1310 The ToMaximize(false) check doesn't help because the section frame doesn't have a follow (or footnotes). Then the text frame is formatted, resulting in one line but no height for it, and a split after the one line. The split causes a follow section frame to be created, calling SwSectionFrame::SimpleFormat() on the master's upper: SwFrameAreaDefinition::FramePrintAreaWriteAccess::~FramePrintAreaWriteAccess() Zeile 120 SwFrame::SetTopBottomMargins(__int64 nTop, __int64 nBot) Zeile 175 SwRectFnSet::SetYMargins(SwFrame & rFrame, __int64 nTop, __int64 nBottom) Zeile 1405 SwSectionFrame::SimpleFormat() Zeile 1192 SwSectionFrame::SwSectionFrame(SwSectionFrame & rSect, bool bMaster) Zeile 110 SwFrame::GetNextSctLeaf(MakePageType eMakePage) Zeile 1781 SwFrame::GetLeaf(MakePageType eMakePage, bool bFwd) Zeile 879 SwFlowFrame::MoveFwd(bool bMakePage, bool bPageBreak, bool bMoveAlways) Zeile 1977 SwContentFrame::MakeAll(OutputDevice * __formal) Zeile 1349 SwFrame::PrepareMake(OutputDevice * pRenderContext) Zeile 286 SwFrame::Calc(OutputDevice * pRenderContext) Zeile 1794 SwTextFrame::CalcFollow(o3tl::strong_int<long,Tag_TextFrameIndex> nTextOfst) Zeile 281 SwTextFrame::AdjustFollow_(SwTextFormatter & rLine, o3tl::strong_int<long,Tag_TextFrameIndex> nOffset, o3tl::strong_int<long,Tag_TextFrameIndex> nEnd, const unsigned char nMode) Zeile 608 Now the upper has space but at this point the master text frame is valid and not invalidated, so it never grows into the available space. There is a check to format again in case additional space is available in SwTextFrame::CalcFollow() but peculiarly it's disabled if the upper is a section frame since initial CVS import. Removing this check appears to fix the problem. Change-Id: Ifad545f7e79675af6e33d68c7fcdbc82bd4f8f57 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119419 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 44cc59db6f4f4f8b2ce5c993a31b5a019a8d7e97) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119434 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-07-26tdf#143510 DOCX import: fix tracked table drag & dropLászló Németh9-0/+121
Accept or reject of tracked drag & drop table (row) move weren't handled, resulting an extra empty table (rows) instead of removing the deleted or inserted table (rows). Note: tables moved by drag & drop with track changes use w:moveFromRangeStart/End and w:moveToRangeStart/End bookmark-like elements to sign the boundary of the moved text. Now moveFrom/moveTo import is handled by tracked table (row) deletion and insertion. Change-Id: Ie382645fef28f57b30d3504fb28ac08489f705c0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119406 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 7f3c0bbc174b9b0316991c174ca3b407c0e3d141) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119436
2021-07-25Related: tdf#135762 Suppress cout if not command lineEike Rathke2-22/+45
Change-Id: I9431221aadf97739bb197871f25fa151ef4c391c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119294 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 0cda081c9aa3b3dcb363f97bac60c845ce9a13e0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119255 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2021-07-23curl: upgrade to release 7.78.0Michael Stahl9-32/+16
* Fixes CVE-2020-8284 CVE-2021-22924 * Also fixes these which don't look relevant to LO: CVE-2020-8231 CVE-2020-8285 CVE-2020-8286 CVE-2021-22876 CVE-2021-22890 CVE-2021-22897 CVE-2021-22898 CVE-2021-22901 CVE-2021-22922 CVE-2021-22923 CVE-2021-22925 CVE-2021-22926 * disable some new protocols and dependencies * remove curl-ios.patch.1 as the code no longer exists upstream Change-Id: I12d5f87f4d503a5f9859226a05cfe2a07e46d993 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119313 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 946f457c885bd10ff1a7281c351f3981f035f5a7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119261 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-07-23sdext.pdfimport: Restore to read font file for the determination...Kevin Suo2-13/+89
of font attributes, as suggested by Mike Kaganski in https://gerrit.libreoffice.org/c/core/+/118977. This partially reverts da59686672fd2bc98f8cb28d5f04dc978b50ac13 but did some modification of the previous code with some explanationary comments. Change-Id: I224d9e717bf374a90f4834cbd9e11bf1138b41ff (cherry picked from commit a91d373837550fbde9c6ba8ca0f43aa8603d86f2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119118 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-07-23Resolves tdf#143066 - Language set to None for indicesHeiko Tietze1-2/+9
Disables spell-checking on ToC Change-Id: I6601d8c54974fcc70564292176a71a80d91020e9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119222 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> (cherry picked from commit 137a1d5380e310a43d36932c643e1331a94fd70d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119265 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2021-07-22tdf#143493 Qt5 key modifier events don't have textJan-Marek Glogowski1-1/+1
Regression from commit 862fdb98ca271b60a831cd5420fd16d5f9c1c747 ("tdf#143298 Qt5 send SalEvent::KeyModChange events"). Change-Id: I6981af06e3a73dee45ed10416f5d3b17b860a73b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119375 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 22997c4777eeb424493d1259b72db9a15ff37069) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119267 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-07-22tdf#143464: fix SmartTag managementJulien Nabet3-2/+4
by putting back missing information in lcl_FillRecognizerData Regression from e98711c14db9348f4d3f7d0f5bbde9276a3e73bc loplugin:unusedfields in sw (2018-12-12) Change-Id: I2e99df1a712915851c30c018a1f7279756da72de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119346 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 717ec99667f5a9ab570f1c8581e2d7a0241c32f6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119263 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-07-22Dereferencing uninitialized pointerMike Kaganski2-4/+4
SfxItemSet::GetItemState returns SfxItemState::DEFAULT without resetting the passed pointer. Regression after commit dd5bf12193471f064bf7f581dd1b21783390e735. Change-Id: I1e427a05f8e5b375f50d81b51d32e78fca83eb42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119348 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 0d4cbdbc9cd4ab06056cec66cffd292b41615b6e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119259 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
2021-07-22tdf#143412 CRASH: converting imagesNoel Grandin2-5/+6
Revert "use unique_ptr in SdrEditView::ImpConvertOneObj" This reverts commit 2ec1dab4693cd45b475f02452114dd96ec0bda1b. I was wrong, we are no returning ownership here. Change-Id: Ib3b3b32248d4b56f0a48c658db5d6431b26fc352 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119335 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 58c6fad213024ef8f162984a66af565ac9ad4b97) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119260
2021-07-21tdf#142854 XLSX import: fix grid visibility in headless modeAttila Szűcs5-7/+55
Fix regression from commit 759103fd65f82fc131679eba0de05f2ddc7294c8 (tdf#126541 XLSX import: fix View grid lines). Sheet based grid visibility shouldn't overwrite the global grid visibility, except for headless mode (i.e. for command line batch mode, see --convert-to in ./soffice --help, otherwise we could get a regression here: The sheet based grid visibility (bShowGrid) is stored in view settings. Headless mode means not to export view setting, including sheet based grid visibility. As the old workaround, use global visibility to keep the losing sheet visibility. FIXME: headless mode only works correctly if all sheets have the same grid visibility. The sheet based bShowGrid should be moved to another location, which is supported by the headless mode, too. Note: now the modified tdf#126541 unit test checks the fix for the regression of the headless mode, and the new Python UI test checks the (now improved) fix for tdf#126541 on the desktop. Co-authored-by: Tibor Nagy (NISZ) Change-Id: I93551d22cc5d858dc64f93a46cd8aa202b4b2df5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118599 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119314 Tested-by: Jenkins
2021-07-21tdf#143452: make 2 buttons in the date form control translatableJulien Nabet1-2/+2
Regression from: https://cgit.freedesktop.org/libreoffice/core/commit/?id=bafd50ee06d982e19d54fae0f9d8f968a2dedbd4 weld DateField Calendar floating window Change-Id: I43c108908c6e802f3a8014ccf3fa243bebcae0ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119293 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 73503ce975ce0923bfe2cfd075ac8b91de20f29e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119257 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2021-07-21sdremote: avoid infinite loop if client disconnects during handshakeAndrzej Hunt2-54/+64
The following loop can turn into an infinite loop if the client disconnects at the wrong point in time, because pSocket->readLine() returns 0 (indicating disconnection), aLine remains empty (no data was read), and we just keep looping because we never bothered to check the return value: do { pSocket->readLine( aLine ); } while ( aLine.getLength() > 0 ); Aside from spinning unnecessarily, this infinite loop also stops the server from being able to accept any new incoming connections - in effect this causes a DOS of the server. Hence we need to start checking readLine's return value, and break out of this loop - and in fact break of the surrounding outer loop too (because we discard this connection and want to wait for another connection to arrive). Because of the nested looping it's hard to come up with a clean solution that only involves changing this loop - we'd probably need to introduce a temporary to remember that the client has disconnected, and check that temporary after the do...while - letting us 'continue' the outer loop. Therefore we first extract the code that handles newly accepted clients into a separate method, which then lets us simplify the implementation by returning at those points that we know a client has disappeared. That unfortunately makes this bug-fix patch a little more noisy than expected, but it is a refactoring that we'd want to make anyway. (There are further improvement we can make here, but I'll put those in a separate commit to simplify cherry-picking of just this fix. Examples include moving to smart pointers instead of new/delete, introducing an early return instead of the really long if statement, etc.) Change-Id: I13c6efa622a1b1de10b72757ea07e5f4660749fb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119083 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit fcc4d8e01360baa9ba0bf20eb5e7a1c9af793a02) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119184
2021-07-21Qt5 fix Qt::Popup window handlingJan-Marek Glogowski2-3/+11
I guess to get popup windows somehow working, they were matched to Qt::ToolTip. Fixing that by removing SalFrameStyleFlags::FLOAT from the tooltip check, resulted in rather bizarre bahviour. The Qt::Popup window is modal, as documented, but wouldn't close when clicked outside, like normal popups. And I neither got any mouse button or focus events, just some leave or enter. The only way to interact with anything again, was by clicking somewhere on the popup where it can't take focus... and it has nothing to do with the transition setting either. In the end it turned out that Qt::StrongFocus prevented the mouse events to happen. Even without it the widget accepts mouse and keyboard focus, so nothing seems lost by omitting that for the Qt::Popup case; hopefully... Change-Id: Icda7bbe87268293a400fe0da551d2804675d4c2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119236 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 63f92f185b78db5a575da58efac3f94a8cb5a5f6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119252 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
2021-07-21tdf#143298 Qt5 send SalEvent::KeyModChange eventsJan-Marek Glogowski3-0/+85
I originally omitted this in the Qt implementation, as I couldn't find any non-working use case. The implementation got a bit hacky, because Qt doesn't have a non- native way to identify different L/R modifier keys, so we must process the X11/xkb keycode ourself, which obviously won't work on Wayland... but most times this is not relevant, so the default modifier notification may be good enough. P.S. it's basically the same code then X11 and Gtk... Change-Id: I37fbfde4a33a966b6017f3e0c280e2c7ea91e4db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119235 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 862fdb98ca271b60a831cd5420fd16d5f9c1c747) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119191
2021-07-21tdf#143334 Qt5 don't reset buffer on style changeJan-Marek Glogowski2-7/+2
This bug was "unveiled" by commit 963f252cd1ea9c268a6ced68a3454b10cbee1a89 ("Qt5/KF5 get rid of unneeded own grahics handling"). I'm not sure why I ever came up with that code. Eventually we would need a paint event, but at least changing the theme correctly updated LO UI, so that seems to be handled correctly. Change-Id: I528b551180be184427eeeeeb2977e2b7da073ce6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119237 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit ec77a2ed0283cb3446f6e352fc329afd3dfb785c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119190
2021-07-20framework: fix multiple-free in VclToolBarManager::Destroy()Michael Stahl3-5/+7
Multiple ImplToolItem with mnId 1000 are inserted in the same ToolBox and the problem is that only the first one gets its mpUserData set, because setting and getting that is based on the assumption that mnId is unique per container. So in Destroy() for every item with mnId 1000 the same AddonsParams object is deleted. The problem is that in ToolBarManager::FillToolbar() the local nItemId is copied, so its value never changes when iterating the loop because only its copy is incremented. (regression from ac1aefd5174258d9bcb41465ce566ed1a0819f3d) Change-Id: Ica47051f9447c2b9d1981f8373d754874f0f31b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119228 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 7d1175c46588c246c455cd7c8874136bf61197fd) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119186 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
2021-07-20tdf#46184 sc AutoFilter: reset filter options to default valuesTünde Tóth2-10/+111
when the old filter entries are removed in auto-filter rules, because these options are not visible from the AutoFilter. E.g. now using AutoFilter doesn't apply copying of the previous standard filtering, changing also the active sheet etc. This fixes regression from LibreOffice 3.5 or more. Change-Id: I26b272dc738f3918ff5b2ca7e8fee3481d21460a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118603 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119272 Tested-by: Jenkins
2021-07-20tdf#123598 sc UI: don't show autofilter dropdown arrowsTünde Tóth1-0/+4
on the result area when the "Copy results to:" option is true. Change-Id: I3da4a1098d8c7c0be6604451b7485312043c5ede Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118484 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 15684e5d595289e0a94efd80bbe203ca133845f2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119188 Tested-by: Jenkins