summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-01-21bump product version to 6.4.0.3libreoffice-6.4.0.3Christian Lohmaier1-1/+1
Change-Id: I6618b804e007fe8b44a123316ad501896a4d61cf
2020-01-21Version 6.4.0.3, tag libreoffice-6.4.0.3Christian Lohmaier3-0/+0
2020-01-21tdf#129788: Revert "no need to use AlphaMask in RecentDocsViewItem"Xisco Faulí1-1/+2
This reverts commit 31bd8c4a4a4752dcff12ee35636193f79a6d6137. Similar to 5c54778aad677d6bb6e6687f0f43dffad1aefa1e Change-Id: Ibb4daa702df1f683888b92b8b8041f28e25e6b04 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86998 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit d720e120b6534ff2fdf6cb11f0b46eca454d4e34) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87051 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-01-21Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-4-0' to fd49d16dcc4ec31b0b02b7e7e7437a99f7d1a6bc - update translations for 6.4.0 rc3 and force-fix using pocheck Change-Id: I902bc9b9118b106605e454dfb7da73aa16f8c405 (cherry picked from commit e2634177118353d07fbd22f9e4c6dc9b41e1cc16)
2020-01-21Resolves: tdf#130075 have to specify which column is the text columnCaolán McNamara1-1/+7
in this two column case Change-Id: Ia999a0540b2d0f7c03a54241c61bf4c2231b8460 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87092 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-21Resolves: tdf#130090 xEntry should be xIconEntryCaolán McNamara1-1/+1
copy and paste error apparently Change-Id: Ifdeb90ececc200211ce41c55f2826987666cd401 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87089 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-21Revert "Add ODF 1.3 strings to Save options page"Thorsten Behrens1-14/+1
This reverts commit ef39938dea14666a5835b6ae85091c1010f8ae8d. Change was precautionary to get strings in, feature didn't make it in time. Let's revert for 6.4.0 release. Change-Id: I5a09dade0f218564bcfc58ca875f39e8103acd1a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86819 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-01-20tdf#127619: external/nss: Load smime3 lib with a path on macOSStephan Bergmann2-0/+26
A plain dlopen("libsmime3.dylib",...) would search (among other places) DYLD_FALLBACK_LIBRARY_PATH, which when unset defaults to a set of paths including /usr/local/lib (so would erroneously find Homebrew's /usr/local/lib/libsmime3.dylib instead of LO's LibreOffice.app/Contents/Frameworks/libsmime3.dylib next to the calling LibreOffice.app/Contents/Frameworks/libnspr4.dylib). At least macOS 10.15.2 supports a "@loader_path/" prefix in dlopen, to find the requested library next to the calling code, so use that as a quick fix. (Should that turn out to be problematic, there is PORT_LoadLibraryFromOrigin in workdir/UnpackedTarball/nss/nss/lib/util/secload.c that might be useful in a more elaborate fix.) Change-Id: I8688606017a4b32a2dd55740f67b8fdb36fc5435 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86966 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit a3ca9b88b4b38c008efa868844ba7a3105b4bcca) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86970 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2020-01-18tdf#129839: pass initialized shared_ptr to SwDoc::GetBoxAttrMike Kaganski2-1/+25
Regression after commit 1e2682235cded9a7cd90e55f0bfc60a1285e9a46 Change-Id: I40acc9e0ffdd292283381366a31eb6647b80324f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86291 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 4056b70e6339102374898fff26f099da455475b1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86329 Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit ed7dc32834e11c93eaf21de8424d9d46c7fa0d53) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86965 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-17tdf#129393 Calc: cannot format whole row of unprotected cellsNoel Grandin1-4/+11
regression from commit 3c3a371c799d00475deb13b4c3e0a8860c7e4fb3 tdf#125254 Performance: A spreadsheet opens too slow, part2 Change-Id: I87e06a58d6a4eb1a32bdf7e9267a4fe9d6dc4f2a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86826 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86830 (cherry picked from commit c21b6629a8af2b4d87840fcee8d39b3f77f08c98) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86958
2020-01-17tdf#129574 sw: fix RTF export of table of contentsMichael Stahl3-0/+22
The problem is that the hyperlink that starts at the start of the first paragraph of the ToX content is written to RTF before the TOC field itself, so the hyperlink contains the entire ToX: {{\field{\*\fldinst HYPERLINK "#__RefHeading___Toc250984071" }{\fldrslt {\rtlch\langfe1024 \ltrch\lang1024\loch {\field{\*\fldinst { TOC \\o "1-3" \\h \\z }}{\fldrslt {1.India\tab 1}}}} This is because the HYPERLINK is written into m_aRun but the TOC into m_aRunText. Interestingly StartRun() asserts that m_aRunText should be empty, so we don't try to change StartURL() to write the HYPERLINK into m_aRunText. The only function that moves text from m_aRunText to m_aRun is EndRun(), so wrap the TOC field in StartRun()/EndRun(). This breaks the export of the ToX to DOCX because a mysterious SDT is no longer written around the field but only the field result, so only do this for RTF. Change-Id: I22e45c4a9c9ce6edb2b9114b4a29b2a373ec3284 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86860 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 05d833a26208404e5f2b3d61298a57c9bcc7c1fe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86872 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 23ae7824ccd2df8fad6ee42ba66d2bc9a50843ff) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86909 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-17Remove a fragment from a file URL early onStephan Bergmann1-2/+4
...as ShellExecuteExW would ignore it anyway Change-Id: I969db094bb7d2ea230ac8c36eb23d71a90fbe466 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86868 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 14b36a16b225bf7c988f118d499a7287c47cd83e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86876 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-17do not ignore return value of a (confusing) function (tdf#126248)Luboš Luňák1-1/+1
The two ScCellFormat::GetString() overloads are lame API, one returns the value normally and the other one returns void and uses a reference parameter. I got confused by this in 6f810e3d7dafcd7d0101173a501 and didn't use the return value in one case. Change-Id: I0b6c839f9d0299e14ea022813481802275df5ea6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86750 Tested-by: Jenkins Reviewed-by: 锁琨珑 <suokunlong@126.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 5a211ba9f5f465c8c898ebce4cc37fa30581acac) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86835 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit deeb6f645d4eeb686afd5646b9d64480e54dabea) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86897 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-16python3: bundle libffi for GNU/Linux buildsMichael Stahl13-5/+121
CPython commit f40d4ddff3c800b3c956a5e8820aabe3aa87cddd "Closes #27979: Remove bundled copy of libffi" causes a bit of a problem because it turns out that libffi isn't all that stable; there's libffi.so.5 on CentOS 6, libffi.so.6 on CentOS 7 and libffi.so.7 on lo_daily_update_gandalf tinderbox. So we have to bundle it in LO; it's only used on GNU/Linux currently. CPython commit 32119e10b792ad7ee4e5f951a2d89ddbaf111cc5 "bpo-35947: Update Windows to the current version of libffi (GH-11797)" also removes the libffi for MSVC, so in a future python upgrade we will have to build libffi for MSVC too. The libffi fork for MacOSX is still in CPython git master. (regression from b10be5d48433076f0b7238d818020f708553e114) Change-Id: Ibc20cf8cd3614cf9941b6970662bd930496776b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86493 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 79084665f0e351a3f83fdee88071919f05ec9cc3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86500 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6b5ce621ff2a82d4fa77d7781d1dabd4b14a4c90) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86668 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-01-16python3: fix 32-bit x86 buildMichael Stahl1-1/+1
The reinvented wheel needs another subst. Change-Id: I5bc01b0213f00d383cf971d34f0dc2a9e6817ab9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86480 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit db75ec187051090e2eb1b13745fe11a2a5bb1dd0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86485 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 87932b78d7e0d46c7e921a8b3149d67fbefeea0a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86669 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-01-16tdf#129805 writerfilter: fix import of nested generic fieldMichael Stahl2-8/+9
The problem was that the end of the outer nested generic field did not call PopFieldmark(), so the end of the field was at the end of the document. (regression from f610f9b611fe9f206b872ed06f7e859d688385fc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86785 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit cf226535f9903a048b1c105b180ae3a50a776e68) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86797 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Change-Id: If5928b14dd35f7dd509370c2b8eef4c31bd149dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86810 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-16tdf#129525 writerfilter: ignore GOTOBUTTON fieldMichael Stahl1-1/+2
The bugdoc contains nested fields for some of the page numbers: {\field\flddirty{\*\fldinst {\caps0\lang1024 GOTOBUTTON _Toc434317064 }{\field{\*\fldinst {\caps0\lang1024 PAGEREF _Toc434317064 }}{\fldrslt {\caps0\lang1024 4}}}}} The problem is that the outer field does not have a \fldrslt, only the inner PAGEREF field has one. This used to be imported incorrectly because the nested field's result ended up in the outer field's result; now it's imported correctly but then there's no field result to show, because Writer can't expand fieldmarks. As we can't do anything with a GOTOBUTTON field, just ignore it explicitly to prevent creating a generic fieldmark; the PAGEREF is already ignored inside of a ToX since commit 9679e9c23216decb5f9f25f85b04cb3f25211111. ("regression" from e511a0ca5dde6d731bb126bbfe21768867890102..d9030ad6298e2f49ee63489d6158ea6ad23c0111) Change-Id: I8135c8d14995378181ce959d22d9be5ea0cae260 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86796 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit f761059b8c8ffe4e7b6e28924898ba71ee6b9ea8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86832 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit bdd17d4dd5c51d563c5f866e69c47e458b3851b6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86862 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2020-01-16oox: add missing nullptr checksXisco Fauli1-1/+2
See http://crashreport.libreoffice.org/stats/signature/oox::drawingml::chart::PlotAreaConverter::convertFromModel(oox::drawingml::chart::View3DModel%20&) Regression from 11473832b5717cb3222ce72baee885bc9e8e2386 Change-Id: I6cf08582fb384203ca1ce5736b88b85c11ff56da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86483 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit aa499120c4cb3935cd942751859b6d5d3689ea43) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86523 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 085d76af93e1ac15ad2fc660f5eac91f80dfda67) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86539 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-14tdf#129908 Crash at Data > Group and outlone > AutoOutlineNoel Grandin1-0/+2
regression from commit 7282014e362a1529a36c88eb308df8ed359c2cfa tdf#50916 Makes numbers of columns dynamic. Change-Id: Ie0eff58c7db5a3c85cfea480ca1fea5767fd8cfb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86683 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit b56e0d7f7fb9f1ca9295ac2ba540a3cf778324b9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86763 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-14Resolves: tdf#127417 delete-all tabs doesn't workCaolán McNamara1-1/+1
since... commit 1e2682235cded9a7cd90e55f0bfc60a1285e9a46 Date: Thu Apr 18 19:25:06 2019 +0200 WIP: Further preparations for deeper Item changes because since then aNewTabs is cloned, but on delete-all aNewTabs is reset to a SvxTabStopItem with a 0 WhichId so its clones are useless Change-Id: I725bec90d8915b3546afeed590f21ebdbbdaa355 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86579 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit dfb60d3b80ca8459505ab7e4599eb9406f1bfb3e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86631 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-13Resolves: tdf#129904 use the current page as the page for helpCaolán McNamara2-0/+18
in the options dialog which has a non-standard organization for its contents vs an ordinary dialog Change-Id: I6a50652f5ae3fe2e8b4d32933bec6dc0217cbec1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86577 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 52ac526a61c1a26bb9dbf995f4af02c9469b8cf6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86663 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-13Update git submodulesAndras Timar1-0/+0
* Update dictionaries from branch 'libreoffice-6-4-0' to 288ed78013d9df0bfadf604c412c9e25c8ee6e59 - corrected Slovenian readme and package description Change-Id: Iaeece79f64ed03a63191afe9a5f55cbd298a5ed5 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/86645 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Martin Srebotnjak <miles@filmsi.net> Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2020-01-09tdf#129887: fix crash during scrolling down documentSerge Krot1-1/+1
regression from tdf#129708 Change-Id: I6c5d7eb90030234e899ab8ce5b3adec33e03962a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86454 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit a3c3f21a742f7c7f587bd63ee2617a150bb39b96) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86460 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 75265fad67c38827aec074e99e010109f9219079) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86461 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-08bump product version to 6.4.0.2.0+Christian Lohmaier1-1/+1
Change-Id: I611dde3d9a38d1a41a2bb6496d6e8a35c131f15a
2020-01-08Branch libreoffice-6-4-0Christian Lohmaier4-1/+1
This is 'libreoffice-6-4-0' - the stable branch for the 6.4.0 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-01-08Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-4' to a7bd83b1b05ea2a4604ca73b011afca6ae9b8f40 - update translations for 6.4.0 rc2 and force-fix errors using pocheck Change-Id: I271c6f6ca96a7cfd41bfc51b5e9894033b17fabc
2020-01-08tdf#123262 writerfilter: completely ignore footnote separatorsJustin Luth5-26/+52
... except for processing enough to observe the separator exists. For each footnote reference, the entire footnote.xml file is parsed every time. The text in the "separator" footnote was being added to every footnote. The normal case where this is just a single paragraph was already handled, but this patch generalizes everything to handle cases of actual text or multiple paragraphs. Not every footnote has a type, so we can't depend on that to turn ignoringText ON/OFF. Every footnote has an ID, but theoretically the ID could be processed before or after the type, and it has no idea which type it is. Finally, the skipped text has no idea how many times/paragaphs it needs to skip. So a three-way control was needed to handle on/used/off. As a safeguard, finishing the footnote.xml parse (PopFootOrEndnote) ensures that ignoring won't be left on in the unlikely case that the separator is the last footnote. Change-Id: Ia30ca8d3a36417a4691e3b2e1c978720be017030 Reviewed-on: https://gerrit.libreoffice.org/82172 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit acb9d901009d026cb48e6a8b94e6200f05110504) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85734 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-08Resolves tdf#129622 - Layout problem in Options-LibreOffice-ViewHeiko Tietze1-7/+3
horizontal fill set for the questionable controls Change-Id: Iab194709ec3ad4881ace36a605ebb4a0d37fe8a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86275 Tested-by: Jenkins Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org> (cherry picked from commit beed7183ac6323eb052e7c586d6a807fcb32eb1f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86427
2020-01-08Fix SfxPoolItem use-after-freeStephan Bergmann1-6/+6
...as observed with -fsanitize=address in Draw, after drawing some rectangle (so that there is at least one marked object) doing "Format - Area... - Area - Bitmap": > ERROR: AddressSanitizer: heap-use-after-free on address 0x6030004aca50 at pc 0x7f14d0ef5fe1 bp 0x7ffd966c6cb0 sp 0x7ffd966c6ca8 > READ of size 4 at 0x6030004aca50 thread T0 > #0 in CntUInt32Item::GetValue() const at include/svl/cintitem.hxx:163:42 > #1 in SvxBitmapTabPage::Reset(SfxItemSet const*) at cui/source/tabpages/tpbitmap.cxx:278:124 > #2 in SvxAreaTabPage::CreatePage(int, SfxTabPage*) at cui/source/tabpages/tparea.cxx:448:21 > #3 in SvxAreaTabPage::SelectFillType(weld::ToggleButton&, SfxItemSet const*) at cui/source/tabpages/tparea.cxx:381:9 > #4 in SvxAreaTabPage::SelectFillTypeHdl_Impl(weld::ToggleButton&) at cui/source/tabpages/tparea.cxx:364:5 > #5 in SvxAreaTabPage::LinkStubSelectFillTypeHdl_Impl(void*, weld::ToggleButton&) at cui/source/tabpages/tparea.cxx:358:1 > #6 in Link<weld::ToggleButton&, void>::Call(weld::ToggleButton&) const at include/tools/link.hxx:111:45 > #7 in weld::ToggleButton::signal_toggled() at include/vcl/weld.hxx:1130:42 [...] > 0x6030004aca50 is located 16 bytes inside of 24-byte region [0x6030004aca40,0x6030004aca58) > freed by thread T0 here: > #0 in operator delete(void*, unsigned long) at ~/github.com/llvm/llvm-project/compiler-rt/lib/asan/asan_new_delete.cpp:172:3 > #1 in SfxUInt32Item::~SfxUInt32Item() at include/svl/intitem.hxx:113:21 > #2 in SfxItemPool::Remove(SfxPoolItem const&) at svl/source/items/itempool.cxx:710:13 > #3 in SfxItemSet::~SfxItemSet() at svl/source/items/itemset.cxx:252:42 > #4 in SvxBitmapTabPage::Reset(SfxItemSet const*) at cui/source/tabpages/tpbitmap.cxx:276:9 > #5 in SvxAreaTabPage::CreatePage(int, SfxTabPage*) at cui/source/tabpages/tparea.cxx:448:21 > #6 in SvxAreaTabPage::SelectFillType(weld::ToggleButton&, SfxItemSet const*) at cui/source/tabpages/tparea.cxx:381:9 > #7 in SvxAreaTabPage::SelectFillTypeHdl_Impl(weld::ToggleButton&) at cui/source/tabpages/tparea.cxx:364:5 > #8 in SvxAreaTabPage::LinkStubSelectFillTypeHdl_Impl(void*, weld::ToggleButton&) at cui/source/tabpages/tparea.cxx:358:1 > #9 in Link<weld::ToggleButton&, void>::Call(weld::ToggleButton&) const at include/tools/link.hxx:111:45 This appears to be broken ever since d543d66a4ee34d3b0088f45951b56c150f7206ec "tdf#104615: there's no mpView when opening odc directly". Change-Id: Id0b3991f3e953ca5b10f466daab890383b0428ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86368 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 4d59436258702251a881a007ccc52ffd5a3eeb38) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86423 Reviewed-by: Michael Stahl <michael.stahl@cib.de>
2020-01-08tdf#120502: Excel doesn't increment max column for OOXMLMike Kaganski2-6/+44
This is obviously a result of copy-paste from XclExpColinfo::WriteBody (where that increment existed at least since commit 92d8c6d6c4dc2a2824a0e24e22485361c3b65b54 from 2004). Implementing OOXML export, authors of commit 64274b38f6cc50a8bb49f114f1ac9e7c1c3b3c4f likely forgot to remove this after copying the code to XclExpColinfo::SaveXml. This change removes the copy-pasted code incrementing column number for the last possible column. Change-Id: Ie2f043c4910568731cac90d89ec791ecbc8565b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86046 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit f1aec2392dba32e90f2cb0e4ad3c84bcbbd9f305) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86428 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-08Update git submodulesChristian Lohmaier1-0/+0
* Update helpcontent2 from branch 'libreoffice-6-4' to daea7016dd2410de8a610cc63a6ab3d84b256c52 - avoid unnecessary change in po files due to use of spaces to indent po file extraction would strip tabs, but keeps spaces when extracting strings. Change-Id: I2947b12787f52f65ef9981ba6a9c9ffdee503a6b (cherry picked from commit 9fc4da0db94a4d06ab31ada262551a0a28f2859e)
2020-01-08tdf#129879 Fix wrong order of buttonsTomáš Chvátal1-2/+2
Change-Id: I0cb135c5b8298fd7c5579673d0eaff7068a03842 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86426 Tested-by: Jenkins Reviewed-by: Tomáš Chvátal <tchvatal@suse.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2020-01-08pyuno: fix build against system-python-3.6Miklos Vajna1-0/+2
pyuno/source/module/pyuno_runtime.cxx:984:57: error: use of undeclared identifier 'PyThread_get_thread_ident' It's only an assert, so simply do it only for >=3.7. Change-Id: Ia3fffc7a9af30780adff9bc7dbabe1727c1f8f54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86410 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Jenkins (cherry picked from commit fb4e15a89d8d8f081c0c152e5047bc0e76870b39) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86421 Tested-by: Michael Stahl <michael.stahl@cib.de>
2020-01-08tdf#129450 DOCX import: fix bottom border of 1-row tablesSzabolcs Toth3-0/+17
Bottom border was missing in a 1-row table with disabled inside borders. This happened because LO applied the empty horizontal borders to the bottom border of the table. Change-Id: I40140bf63297189edad13088f98fc5f869969c2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85303 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 6b1bd2699b0bdad6dc42db741dea0717cf7c1d36) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86397 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-08tdf#123206 Add test: import custom-label-fieldTamas Bunth3-1/+22
Add test for deprecated custom-label-field attribute of the data-point element. Change-Id: I9a7619898fa72900323e5b41728d2146c14203e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86103 Tested-by: Jenkins Reviewed-by: Tamás Bunth <btomi96@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86123 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-01-08tdf#123206 Store custom label as chart:data-labelTamas Bunth10-46/+186
Use the chart:data-label element instead of using the loext:custom-label-field attribute. chart:data-label stores can be a child of chart:data-point and it may contain a text:o element for holding one or more paragraphs of custom label text. This commit aims to export and import chart:data-label with paragraphs put into different text:span elements. These span elements may hold a text:style-name attribute in order to achieve formatted text. This structure is already in the ODF format. Change-Id: I0bea7ce1a16af9c47b33555e18545bdaae7e95ca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85659 Tested-by: Jenkins Reviewed-by: Tamás Bunth <btomi96@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86122 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-01-08tdf#129513: drop incorrect and redundant erasure of paragraph sprmMike Kaganski3-1/+15
It was introduced in commit 2499397cb39330dabeb8b7b3e0d7eb6213a0d8f4 "avoid sending duplicated paragraph flags", and supposedly was meant to avoid having duplicating sprms in the collected properties, when new properties were pushed back at that time. Using specific sprm id was likely a mistake (nParam should have been used instead). Now the new sprm is added using RTFSprms::set with eOverwrite having default value of RTFOverwrite::YES, which takes care to avoid dupes, so the call to erase is redundant. This reverts commit 2499397cb39330dabeb8b7b3e0d7eb6213a0d8f4. Change-Id: Ied19f6feb41bd17ef317812d4d295ca0542a5843 Reviewed-on: https://gerrit.libreoffice.org/85602 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 989043b0644354b92fd17e4194897c2eb0935031) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85742 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-08tdf#129841: fix GetTextTableCursorPropertyMap cell background valuesMike Kaganski2-3/+38
... which were accidentally broken in 2003 in commit eba784710e92597282a2284b56dce3a45ac38776. Change-Id: I3dc96dff0a8935f927933bb3946528fb8ac9aed0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86315 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86330 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-08Bump copyright year to 2020Adolfo Jayme Barrientos17-95/+95
Change-Id: I6fb736591f32907c8977fbac8fbf1dcbaef1bb97 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86092 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit a526e85a0d6371781482a9b7de4e05b8b2578de2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86093 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-01-08python3: upgrade to release 3.7.6Michael Stahl20-465/+138
* external/python3/python-3.3.3-aix.patch.1: most of it doesn't apply and AIX port isn't maintained anyway so remove it for now * external/python3/ubsan.patch.0: apparently one of the files was removed * 0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1: fixed upstream * python3-osx-avoid-new-10.13.patch.1: replace with simply passing ac_cv_func_utimensat=no to configure * external/python3/python-3.5.4-ssl.patch.1: project files to build OpenSSL removed upstream * There have been changes to how python locates OpenSSL; new variables OPENSSL_INCLUDES etc; it turns out that you have to pass one directory to --with-openssl, as the variables cannot be passed * libuuid.so.1 is a new dependency of the _uuid module * libffi.so.6 is a new dependency of the _ctypes module (the bundled copy of libffi for non-Darwin platforms was removed) * python-3.3.0-pythreadstate.patch.1: the PyThreadState functions have been changed such that CppunitTest_services asserts when there is a PyThreadAttach on top of PyThreadDetach on top of PyThreadAttach, i.e., 2 PyThreadState per thread (PyGILState_Check() fails). Instead of patching in additional workarounds, change PyThreadAttach so that it re-uses an existing PyThreadState if one exists for the thread. Change-Id: I24c19d79b43a30709261fd9db66312b2e3872fd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84765 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit b10be5d48433076f0b7238d818020f708553e114) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86398 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2020-01-08tdf#129442 DOCX import: fix right border of 1-column tablesSzabolcs Toth3-0/+16
Right border was missing in a 1-column table with disabled inside borders. This happened because LO applied the empty vertical borders to the right border of the table. Change-Id: Ib190689bf5059bfd7dbf07b07808cd761015f37e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85301 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 8a2eb40abbd52d960dd21308157186be0ca9dd3d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86261 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-07tdf#129228 speedup opening of xlsx file with lots of commentsNoel Grandin4-25/+64
de-UNOise the Comment::finalizeImport method, so we can build a better custom import code path, that does not touch all the stuff that updating a running UI needs. The primary improvements comes from using setPropertyValues to set a bunch of props together. This takes the opening time from 61s to 53s for me. Change-Id: I5506a5a37a9b4b84b6930f0563a775a8aa0a9e2c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85947 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 4992d61600536fe14b97b718dbb11f00e936c6a9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86343 Tested-by: Jenkins
2020-01-07tdf#129552 sc: avoid infinite invalidation loop when the print range is emptyMiklos Vajna4-4/+147
Commit caeb7b141280a65e60525f11a7e6514b76e12e11 (tdf#124983 In calc make printable page borders also initially visible, 2019-07-10) added the ability to paint page breaks right after opening a document. The implementation calls ScPrintFunc::UpdatePages() whenever there are no calculated page breaks. The problem is that this is not only true when they are not calculated, but also happens when the print range is empty. This means that ScGridWindow::Paint() resulted in a vcl::Window::Invalidate() for the same window, and this happened again and again as the idle handler was invoked, resulting in flickering form controls. Fix the problem by only calculating page breaks when ScPrintFunc::HasPrintRange() confirms something will be calculated. This works because HasPrintRange() return false when ScTable::aPrintRanges is empty, and UpdatePages() also does nothing in that case. (cherry picked from commit e7e01efc56f7061d0a2e5142b4bae84dd403cc50) Change-Id: I14d8a728f4672e647e9009a3dc3e0dd5fb40c023 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86274 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
2020-01-07ofz#19803 check for negative valuesCaolán McNamara1-1/+1
Change-Id: I30036a16cf1651a7e27c7aefa086b3725d58933a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86250 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0ab8ae4d98122f7de50365a062675d001ef0ca6a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86340 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-01-07tdf#129004 Make shift+F6 cycle order reverse of F6Jim Raykowski1-17/+7
Change-Id: I52013b4c54ef5e457d9fa19210d08d9c042fed45 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/83637 Tested-by: Jenkins Reviewed-by: Jim Raykowski <raykowj@gmail.com> (cherry picked from commit 32b9d07baa0cf6907f14ccb9aa068b51d95eefaa) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86342 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2020-01-07halign 'Start'->'start'Caolán McNamara1-3/+3
Change-Id: Ia8547ffd08cc60ec8e6f791fcccaab35784de9aa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86333 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-07tdf#129798: store SwWrtShell when it's availableMike Kaganski2-24/+35
GetActiveWrtShell may return nullptr when attaching a new component to current frame, e.g. destroying on print preview. OTOH SwWrtShell is passed to SwFieldDBPage::SetWrtShell on creation, so store it to own base class then. Possibly that would be enough, and we could remove all the checks in other methods - but I don't know the code well enough to be sure that SwFieldDlg::PageCreated and SwFieldEditDlg::CreatePage will always set SwWrtShell; to be on the safe side, I kept the checks where SwWrtShell is used, and stored it in those places if not yet stored. Regression after commit 39ba5e3bde93358af1b363da8f850bdc96806cfa. Change-Id: I21f3c8ef24764e98b1bc287db3c6485ce0b3ab48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86253 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 016c69c99e1ab26e6582ca8dea6fa1b4b9e5d109) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86260 Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-01-07tdf#128996 Chart: Fix disappeared vertical X axis labelsBalazs Varga5-11/+26
Regression from commit: 75ef0e41ea8a9096ac619356d2b837c5333b47e6 (tdf#125334 Chart: allow text break in bar chart axis labels) Change-Id: Ib935de74314b7dec489d94a4aa3c65072e18d9e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86010 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit d53de6b0bfff08dfbde4fe305e2a9b7a60255458) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86259 Reviewed-by: Balazs Varga <balazs.varga991@gmail.com> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-07tdf#86731 Don't show 'start from beginning' when dictionary is missingSzymon Kłos1-3/+4
Change-Id: I160e4b15e3c636be0e23dd5bbb2da62dfa6a42ef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/82169 Tested-by: Jenkins Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit a50a2bf8e8c6084aeacb8d2db42e21f528410742) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86345 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2020-01-07tdf#107604 Handle predefined table styles.Gülşah Köse5-138/+949
Handle table styles that we have just style-id and have not corresponding style defination in tableStyle.xml Change-Id: Id06f5508d5eb1330b5bac1634c520c3066c09139 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86068 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86325
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-23 06:52:06 +0000