summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bump product version to 6.4.7.2.0+mimo-6-4-branch-pointlibreoffice-6-4-7Christian Lohmaier2020-10-071-1/+1
| | | | Change-Id: I45e7d2b3b7683f8892fe2873c17aab833ceba3ce
* tdf#137023 PPTX import: fix unexpected center alignment of shape text, 2nd tryMiklos Vajna2020-10-079-130/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from commit 10bb02efd8afd42e633e370480104e2575546d8e (tdf#129685 PPTX import: fix unexpected centering of shape text, 2020-09-18), now the problem was that some text should be left aligned, but was centered. Fix the problem by reverting most of the above commit: XML changes, changes to SdImportTest::testTdf113198() (manual testing show that this change is not needed after all) and changes to the TextBodyPropertiesContext ctor in oox/ (but not the testcase itself). Fix tdf#113198 again, this time in Shape::createAndInsert(), which is meant to be closer to what the binary PPT import does. With this, all cases from tdf#104722, tdf#113198, tdf#129685 and tdf#137023 are meant to be handled correctly at the same time. (cherry picked from commit dfa1856cdb4c69985ef1e809d33055427b6fbd76) Change-Id: Id785252c26fc407cd74c9cfb55624091798d7773 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104006 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104023 (cherry picked from commit bcfe68c96893c39b07c15efd99cd010d6736f560) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103978 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* update creditsChristian Lohmaier2020-10-071-647/+648
| | | | | | Change-Id: Iaa1726883202c35a3d5ce76893f05de46551e672 (cherry picked from commit 6aa831bf46282d3df8b5f214abed7428bd4bd001) (cherry picked from commit 99b065ec31d032fc08ab14f66430dac4fef904a5)
* Update git submodulesChristian Lohmaier2020-10-071-0/+0
| | | | | | | | | | | * Update translations from branch 'libreoffice-6-4-7' to 245284b64254723cda02526c8c0ab139b2abbb54 - update translations for 6.4.7 rc2 and force-fix errors using pocheck Change-Id: I5b70ce184448b11dc7d76b84e5ad200a2d8f8474 (cherry picked from commit a98a81ee9754921c9e3d306481e5db92514d7435)
* tdf#134351: do not apply autofilter if all entries are selectedXisco Fauli2020-10-063-7/+41
| | | | | | | | | | | | | | | Change-Id: I33cdfe07cc53b579bbe16486f302daf7bd3da841 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103352 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103569 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 0d7bba4df1ebd80fa033116d73cbe8c6d3807d15) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103806 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de>
* Restore the fix for tdf#126830Maxim Monastirsky2020-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It was lost with 1ae450504cf57457f9702684b1517fda1dd3c481 ("drop gtk2 support"), which was based on an older revision of gtksalmenu.cxx. In the meantime, the UI for settings icons on was hidden (see tdf#123265), but this can't be an excuse for carrying the broken code. The setting is also still available as an expert config. Change-Id: Iffc6342bb312230646399f2f85ef0211315f6c8a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103660 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 800baa9c60d8fb7b4ed8cf8ae0ba7b6b68c69c9c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103663 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit fa85f4c9dfdef681dbbcb56845b0c19c6ef1ff52) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103805 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <michael.stahl@cib.de> Tested-by: Michael Stahl <michael.stahl@cib.de>
* tdf#132688 diacritics broken in lines with punctuationNoel Grandin2020-09-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | regression from commit 4b2d4f3c4a68361a6bc03c9ab110ce9376b14b20 tdf#119227 fix freeze when copying a large bulleted list Change-Id: I7d54b19c7a02c717426edce7896caaadf909154e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102000 Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins (cherry picked from commit 18e4367c33f327cf09985105bde583cdcc7b2a46) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101972 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9ec49c6c2dd58eb60ca0ac5e99edee9ee098302a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103581 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 48cf4c412cc4ddeccf1d21a81b3b4859b6a79459) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103587 Reviewed-by: Michael Stahl <michael.stahl@cib.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* update creditsChristian Lohmaier2020-09-301-1712/+1798
| | | | | | Change-Id: I84bfd619b2f8802bc311eaa221670a9cae904160 (cherry picked from commit fb9b3e68dc4bf88a1a2764cbcd6420dc2a475220) (cherry picked from commit 71a3f015f2ac45ad4a2625a3b6398f5d75feed40)
* tdf#133358 fix crash in redoing indentCaolán McNamara2020-09-301-2/+3
| | | | | | | | | | | | | | | | | | | | | since... commit b070202b420129b5edd368420e0e50ec45261d01 Date: Tue Nov 20 18:26:18 2018 +0100 sw_redlinehide_4a: SwEditShell::IsMoveLeftMargin(), MoveLeftMargin() Change-Id: Ie28207747560153020341305015f1693f6ca9f50 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103552 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit dc6e005c79b6c23b805dea44cd89fa83ea945f03) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103578 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit c1955f26cb772fc90ca81affcb524ebf1f12f3a3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103649 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* Related: tdf#136985 SfxStringListItem::GetString() crash in empty caseCaolán McNamara2020-09-291-3/+2
| | | | | | | | | | | | | | | | | | | | | probably since... commit a573b8b21688d9681f4fa129ec37cf89954e9d1c Date: Sat May 21 16:14:56 2011 -0430 Replace List for std::vector in SfxStringListItem. Change-Id: I7060b5693ba08fa5f70cc5cb3ae1b7a4722a31a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103340 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 7c8f997321e136208e8983ab6ad78cc33891125f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103572 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit 0451222f307e00ce688c564c10f39e894973c91e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103576 Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* Resolves: tdf#133812 Add the 'Result' style again used by the Subtotal toolEike Rathke2020-09-282-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Necessary to also adapt the test case that checks for a defined number of styles. Regression from commit 7b0aed617f1e57335837cf56ef2d222a96f8270d CommitDate: Wed Sep 28 11:42:56 2016 +0000 Remove old cell styles from calc and commit 06f319937187f76ee402d53b3baa78c391c2af19 CommitDate: Sun Oct 2 13:51:26 2016 +0000 tdf#90937 Add a set of cell styles to calc Change-Id: I3e47d8e24d375a64d9056e7a85197b89173c8e41 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103520 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 930d82550863430c9bef96ac307c3ff2cfefe4d8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103434 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
* fix disable qrcodegen optionCaolán McNamara2020-09-282-1/+3
| | | | | | | | | Change-Id: Ic554f01125653022987c70d03c8c9d86fe3f547a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103204 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
* tdf#134782 sw,unotools,officecfg: adapt configuration and UIMichael Stahl2020-09-287-8/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Store AddParaLineSpacingToTableCells in configuration as "AddTableLineSpacing", consistently inconsistent like AddTableSpacing (the <desc> elements are not subject to translation). Adapt SwCompatibilityOptPage with some ugly hacks to allow 3 different states (TriState) for the corresponding checkbox that map to false/false, true/false and true/true. The checkbox widget doesn't allow to change *to* indeterminate but at least the status of the document can be displayed this way, with a non-obvious tweak to optcompatpage.ui to reference "checktri1" column. Change-Id: I5f32e05c93b5e16e782cba5d1d055809d9e5e251 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103318 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 68aec8fd57eda8c05926b7f361dc102772f2c501) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103360 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 70b2ee8ce4aa081a608bbde4f3125300675934c5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103336 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* tdf#134782 sw: split AddParaSpacingToTableCells flag in 2Michael Stahl2020-09-2810-6/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 3cccdabf19a99fd3f657985c1822436d7679df2b "extend AddParaSpacingToTableCells with line spacing" changed how the ADD_PARA_SPACING_TO_TABLE_CELLS compat flag works, to improve interop with Word. This commit splits out the change as a separate new compat flag ADD_PARA_LINE_SPACING_TO_TABLE_CELLS ("AddParaLineSpacingToTableCells"), to preserve compatibility with ODT documents that were produced by LO < 6.4 (via SwXMLImport::SetConfigurationSettings()). New documents and WW8/RTF/DOCX import have both flags enabled. The combination false/true is invalid, and treated as equivalent to false/false. Change-Id: Ida20df8fe4a8192a714f91da95345f9726fd7d98 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103317 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 38aa699f265c17548769aaa4f20e1ae35d18f202) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103359 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d731b65d3c6b58ed98ee60488d07e5cba653ede0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103335 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* bump product version to 6.4.7.1.0+Xisco Fauli2020-09-231-1/+1
| | | | Change-Id: I3e3756a44f28faf4c6d1ab4f03686c025ef1568a
* Branch libreoffice-6-4-7Xisco Fauli2020-09-234-1/+1
| | | | | | | | | | This is 'libreoffice-6-4-7' - the stable branch for the 6.4.7 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.
* add an explicit --disable-qrcodegen configure optionCaolán McNamara2020-09-237-22/+86
| | | | | | | | | Change-Id: If8e965fa955aecdb9e7011bdddc690de9cad0c4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103120 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103158 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* ofz#25684 keep ParseCMAP within legal areaCaolán McNamara2020-09-231-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee18b5a9390b79efa67414ea2d229d2816c84e18 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102776 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a014c82522834c972e247a28d8e5f42998ae3c0e) ofz#25696 OOM Change-Id: Ia69e9ce1ca0156e960dddb7e0bf98dfd2be2d7cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102846 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d57b14e3394b081adf0888ed8dcb7b86d66c246c) ofz#25774 keep ParseCMAP within legal area Change-Id: Ic68fadd3d63631cbccda76e7679d95bb89452d25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103017 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f8474367449a1b6b54918d2753e3a36798761839) Fix crash from broken font CMAP subtable ParseCMAP crashes on a broken CMAP subtable of a font used by the bugdoc of tdf#119074, which returns a negative offset (technically it's large positive offset turning into a wrong negative integer, which is still out of bounds of the CMAP overall size - you get the point). This simply ignores that broken subtable, checking for other existing ones. Regressed-by: c7482bc2904401e7d975b5721ec861b8589253f9 Change-Id: I95820fe3bb6bd2fe2e0cf9d4c3536abce31fd497 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103033 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9bf4c5ac49b73cc2a8c89a87ff87238c061a579d) Missing include (for std::max, since f8474367449a1b6b54918d2753e3a36798761839 "ofz#25774 keep ParseCMAP within legal area") Change-Id: I873c788577e9ec3bd54d9e637d2cf86be7c1f6e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103089 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 8cc52b05744443c64cf5eb62ebe3098cd964c437) ofz#25855 overflow in nTmpOffset we already know nLength is >= 24 so just move the calc to the other term Change-Id: Ic52f1686ccf81e6b13d7eb7e74dbd9cb51c8ea01 ofz#25868 Timeout, encoding conversion only sane in 0..SAL_MAX_UINT16 range so ignore points outside that range to avoid ludicrous ranges that aren't possible in the input encoding Change-Id: Ifb7b9b389d4a31b8820a7da661249223fe1e110c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103261 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* ofz#25881 use std::vector with bounds checking accessorCaolán McNamara2020-09-232-8/+8
| | | | | | | Change-Id: Ic557e85bce5f3ebe7224b0aa2192a74969f4fce2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103194 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* tdf#135942: avoid collecting autostyles during writing themMike Kaganski2020-09-235-1/+36
| | | | | | | | | | | | | | | | | This modifies the container over which iteration is performed. Additionally, make sure that all nested table autostyles are collected on the first phase. Change-Id: I74c0bb1aaacad095226c21e6bf51cc8668133bb3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101096 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit f0286ad82465152b29bba01ab2edeb97291397fa) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101069 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0273675e7dde577077ccca17571846a0942f2630) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102311 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* tdf#134112 sw: Test access of text field master objectOleg Schelykalnov2020-09-231-1/+4
| | | | | | | Change-Id: I793528faa6d73f7a97ddd4409ae8a1a3e611cea1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96678 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* tdf#134157 fix Edit with external tool causes a CPU hitTomofumi Yagi2020-09-222-10/+13
| | | | | | | | | | | | | | Switch Idle to 100ms Timer for fixing the bug Change-Id: I85a9bdcb173edd28d952d8e91c1b93d748e69206 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102984 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit f110c037114f90d219ac8d149542bf96fe66a2f1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103055 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103130
* tdf#129685 PPTX import: fix unexpected centering of shape textMiklos Vajna2020-09-219-124/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from commit 89f0af144c18efafe2573801641689a1432c0cae (tdf#113198 set default shape paragraph alignment.., 2019-11-19), the old bugdoc had this markup: <a:bodyPr ... anchor="ctr"/> (centered) The new bugdoc has 2 shapes with text: <a:bodyPr .../> (aligned to left) <a:bodyPr ... anchorCtr="1"/> (should be centered) "anchor" is about vertical, "anchorCtr" is about horizontal centering of text. Checking what the binary filter does, it maps horizontal centering to TextHorizontalAdjust, so fix the original bug differently, by leaving ParaAdjust alone, and tweaking TextHorizontalAdjust intead: this keeps the old bugdoc working but fixes the new one. This caused a number of "change detector" XML-based tests to fail: all of them are unchanged visually, so the XML files are adapted to the new state. The tdf#113198 fix itself was fixing a regression from tdf#104722, and that commit had no testcase, I tested that we don't regress there, manually. (cherry picked from commit 10bb02efd8afd42e633e370480104e2575546d8e) Change-Id: I81a7b3e8c76bfbce5c5569d16d5238958ac20f75 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103088 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103110
* tdf#131047: expand search results frameXisco Fauli2020-09-211-1/+1
| | | | | | | | | | Change-Id: I883c86658f3aa4ee18d03d8c3aa277000f278abe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100362 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit bc652f68d988a6fd0e2feb51b0e3ccfee31e6693) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100510 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* tdf#135342: filter list must include extensionsMike Kaganski2020-09-211-3/+5
| | | | | | | | | | | | | | | | | | | | | | | Regression after commit a0dcc8f78061d22d925f31ef8d03ca751ad6dc19. The commit had added extensions to the filter names sent to file dialog, but kept internal list of filter names aFilterEntryList without extensions. Then dialog returned the chosen filter's name in the form it was sent there, i.e. with extension; and that name couldn't be found in aFilterEntryList. So let's keep aFilterEntryList synchronized with the UI names in the dialog. Change-Id: Ic21d19d1a8d0b7f64ccfb517a7d0ee8ab36fc6a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100821 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 99c6c89deed41457d35c382fc7d6a4cd5191f7d7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100792 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit bbd0d424263a21dd0ffdc42d1201f86e65358f25) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101671 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* rhbz#1878275 should use value_changed for spinbutton changesCaolán McNamara2020-09-162-1/+7
| | | | | | | Change-Id: I8d042eb9c288e9db69a49cb9e097b23cf765aae6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102678 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* tdf#135682 sw: fix lost selection-all when doc starts with tableMiklos Vajna2020-09-156-2/+136
| | | | | | | | | | | | | | | | | | | | | | | | Regression from commit c56bf1479cc71d1a2b0639f6383e90c1f7e3655b (tdf#105330 sw: fix lost cursor on undoing nested table insert, 2019-09-16), the problem was that the change reverted lcl_notifyRow() back to its original state, because it seemed the conditional notification is no longer needed. However, this broke the fix for tdf#37606 (ability to select-all when the doc starts with a table). Fix the problem by handling the starts-with-table case similar to a normal table selection, so there is still no need to restore the nested table visitor code but select-all works nicely with starts-with-table documents again. (cherry picked from commit 6f1e02c96b887750f974c187a82ecd6236e6a435) Conflicts: sw/qa/core/crsr/crsr.cxx Change-Id: Icb823a39432d1774a63a0c633c172bba827ac76d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102706 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#135623: modified generation of unique fly nameVasily Melenchuk2020-09-151-5/+3
| | | | | | | | | | | | | | | | | | | Modified lcl_GetUniqueFlyName() is right now always marks current fly format name number as used. Yes, this can lead to some gaps in numbering is some cases, but meanwhile guarantee that there will be no duplicates if format name does not match SdrObject name. Change-Id: If39ed993614ae1665deba21ae8d5e6bd542fb6e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102460 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 07a695ec1988ee8b02256cab2e07a1b429ead24b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102636 Reviewed-by: Vasily Melenchuk <vasily.melenchuk@cib.de> (cherry picked from commit c514e9cfca2901f325644a65ee1b87455a56e7f0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102638 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* tdf#133327 fix calc loading background color with many colsNoel Grandin2020-09-141-3/+2
| | | | | | | | | | | | | | regression from commit 7282014e362a1529a36c88eb308df8ed359c2cfa tdf#50916 Makes numbers of columns dynamic. Change-Id: Ic9e1b31d74b11367a5ad1a82480ffe9467c37ad8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102535 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 4176beb7ef831152ce92ac3fa31314438635ec2c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102635 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* xmlsecurity: pdf incremental updates that are non-commenting are invalidMiklos Vajna2020-09-108-3/+211
| | | | | | | | | | | | | | | | | | | | | I.e. it's OK to add incremental updates for annotation/commenting purposes and that doesn't invalite existing signatures. Everything else does. (cherry picked from commit 61834cd574568613f0b0a2ee099a60fa5a8d9804) [ Also disable a pdfium assert on Windows, only on this branch, where it fails during CppunitTest_xmlsecurity_pdfsigning for reasons unclear to me. ] Conflicts: include/vcl/filter/PDFiumLibrary.hxx vcl/source/pdf/PDFiumLibrary.cxx Change-Id: I4607c242b3c6f6b01517b02407e9e7a095e2e069 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102325 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* external: update pdfium from 3963 to 4137Miklos Vajna2020-09-1012-93/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a combination of 6 commits, which brings pdfium to the same version as libreoffice-7-0. This is the 1st commit message: external: update pdfium to 4021 (cherry picked from commit 1cb70721ba00dd6c6958f0a10e39aa5c1866ec96) This is the commit message #2: external/pdfium: C++20 comparison operator fix Missing const leads to overload resolution ambiguity when a synthesized candidate of operator == for a reversed-argument rewrite conflicts with the actual operator ==, due to the asymmetric const-ness of the implicit object parameter and the RHS parameter: > In file included from workdir/UnpackedTarball/pdfium/core/fxge/cfx_font.cpp:7: > In file included from workdir/UnpackedTarball/pdfium/core/fxge/cfx_font.h:11: > llvm/inst/include/c++/v1/vector:1369:27: error: use of overloaded operator '!=' is ambiguous (with operand types 'std::__1::__vector_base<unsigned char, FxAllocAllocator<unsigned char> >::allocator_type' (aka 'FxAllocAllocator<unsigned char>') and 'std::__1::__vector_base<unsigned char, FxAllocAllocator<unsigned char> >::allocator_type') > if (__base::__alloc() != __c.__alloc()) > ~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~ > llvm/inst/include/c++/v1/vector:1359:5: note: in instantiation of member function 'std::__1::vector<unsigned char, FxAllocAllocator<unsigned char> >::__move_assign' requested here > __move_assign(__x, integral_constant<bool, > ^ > workdir/UnpackedTarball/pdfium/core/fxge/cfx_font.cpp:384:24: note: in instantiation of member function 'std::__1::vector<unsigned char, FxAllocAllocator<unsigned char> >::operator=' requested here > m_FontDataAllocation = std::vector<uint8_t, FxAllocAllocator<uint8_t>>( > ^ > workdir/UnpackedTarball/pdfium/core/fxcrt/fx_memory_wrappers.h:74:8: note: candidate function > bool operator!=(const FxAllocAllocator& that) { return false; } > ^ > workdir/UnpackedTarball/pdfium/core/fxcrt/fx_memory_wrappers.h:73:8: note: candidate function > bool operator==(const FxAllocAllocator& that) { return true; } > ^ > workdir/UnpackedTarball/pdfium/core/fxcrt/fx_memory_wrappers.h:73:8: note: candidate function (with reversed parameter order) (cherry picked from commit 6e0461d576d9f386e458f98f3c57f0ba385aacb4) This is the commit message #3: pdfium: don't patch out the COMPONENT_BUILD check, define it So next time we update, no need to adapt a failing patch. (cherry picked from commit 9b4ab9bda41a818832c721933986c9c6e07a6e6c) This is the commit message #4: make update_pch also consider files in <module>/src/**/inc With --enable-pch=full there's not much difference between a "public" header in <module>/inc and a private one in <module>/src/somewhere/inc . And since the script searches recursively, this apparently helps to find even more headers for lower pch levels. [ Just the pdfium part. ] (cherry picked from commit 69e0d871ec1de2260f9213d3113464155eac173c) Change-Id: I8483d0aa5b4fea5a59107c20a8aa5f1ef694af0a This is the commit message #5: external: update pdfium to 4083 (cherry picked from commit 9054c36d4ea3bee25fb9a47a96a0ea2cd07148c3) This is the commit message #6: external: update pdfium to 4137 (cherry picked from commit 1ffe59ef31186e36ad0aa7bbcdd32e407ee8d26c) Change-Id: Ib7c12461e04fa97bf55ee967e8d6c9bcf92fdf4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102373 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#135950 crash in format->character with selected text in tableCaolán McNamara2020-09-101-0/+1
| | | | | | | Change-Id: I66e36a638d040d2a38ac234383d6f314a2ff4d88 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102310 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
* tdf#136032 - abort scan of a string beginning with a hashtagAndreas Heinisch2020-09-102-1/+19
| | | | | | | | | | | | | | | | | Abort scan of a string beginning with a hashtag, if a comma is found. Otherwise, the compiler raises a syntax error. If the string ends with a hashtag too, it will be parsed later checking for a date literal. Change-Id: I078a2302f5c65206367a00fbc584ffa7b9ede031 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102099 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 11292d1cc405e7c3b9e1f374cc7581a63a54b994) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101973 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit cc17346d682d85b6c083d76cae2d55dcc022e58f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102120
* tdf#124470: Split export of table autostyles out from collection phaseMike Kaganski2020-09-106-1/+37
| | | | | | | | | | | | | | | | This allows to call collectAutoStyles where required (e.g. when enumerating used fonts), without side effect of writing table styles XML inside the call, out of place. Change-Id: Ida05e373eb8502590c43e2b0e85c3b0c1107c551 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100153 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 35021cd56b3b4e38035804087f215c80085564be) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100221 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Signed-off-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100274
* Always display highlighted JRE's locationStephan Bergmann2020-09-102-5/+15
| | | | | | | | | | | | | | | | | ...when opening the Advanced options page and after adding a new JRE via the "Add..." button, not only after highlighting another JRE line. (I suspect this broke with 1aa246a8e8c7d974ab0f7bdfa16cda36cb700e03 "weld SvxJavaOptionsPage" towards LO 6.4.) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100860 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit f7fe1e93da753d74485a13d46fe15fb198411932) Change-Id: I5f9b63e2d33a351eeef09712969b703f1e99ef7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102286 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* tdf#127932 fix wrong page number in print progressJuergen Funk2020-09-101-7/+17
| | | | | | | | | | | | | | - in ctor, reset start pages to non-inflated value after size calculation - update label, _then_ progress in setProgress() Change-Id: I66576e339de814922512b68167e6c0a9b1025378 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102031 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 63bf8f042abe3c0f6989f6763d13f5389182b816) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102281 Tested-by: Jenkins
* tdf#108673 XLSX: Don't export invalid sheet references in cell validationSerge Krot2020-09-105-3/+61
| | | | | | | | | | Change-Id: Id9d88f5e34f3017516f693505df4c3ce82b1890f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98479 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit a3b4831208da615789bd1e2d5660dd130807f504) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102128 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* Check range before accessing Calc sort userlistThorsten Behrens2020-09-092-4/+4
| | | | | | | | | | | | | Conflicts: sc/source/filter/excel/excrecds.cxx Change-Id: Ib5078dc4ce3f85be9b42320b60ef6fc40b684cb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102140 Tested-by: Jenkins Tested-by: Serge Krot <Serge.Krot@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102255 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
* tdf#95640 XLSX: import/export of custom sort listsSerge Krot2020-09-0913-18/+375
| | | | | | | | | | | | | | | | Conflicts: sc/source/filter/excel/excrecds.cxx sc/source/filter/oox/autofilterbuffer.cxx sc/source/filter/oox/tablebuffer.cxx Change-Id: If5ffef39770bf7abd6e75e8de998d4a2b4749a0d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97399 Tested-by: Jenkins Tested-by: Serge Krot <Serge.Krot@cib.de> Reviewed-by: Serge Krot <Serge.Krot@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102254 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
* pdfium: only init pdfium library once and destroy on LO exitTomaž Vajngerl2020-09-097-49/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | With more and more usage of PDFium, it is hard to keep track of the life-time of the PDFium library, so it can happen that a FPDF_DestroyLibrary happens when we still have another instance where PDFium is still use. The result of this is a crash. To prevent this, just initialize the library once and delete, when on LO exit. This can be improved in the future to only keep the library active when in actual use. [ Leaving out the vector graphic search bits, the motivation is to just have this in libreoffice-7-0, so that recent pdf sig verify improvements can be backported. ] (cherry picked from commit 067a8a954c8e1d8d6465a4ab5fb61e93f16c26c2) Conflicts: vcl/source/graphic/VectorGraphicSearch.cxx Change-Id: I5c7e5de7f8b97d10efb394c67c7a61b976c8d57c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102317 Tested-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
* Resolves: tdf#136364 treat svSep type with ocUnion as range typeEike Rathke2020-09-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | So for RPN sv...Ref(ocPush), sv...Ref(ocPush), svSep(ocUnion), sv...Ref(ocPush) another svSep(ocUnion) instead of svSep(ocSep) is appended. Regression from commit a6032ff5418ad66cc8fec10c636e32b124ee7864 CommitDate: Thu Oct 11 11:26:37 2018 +0200 Resolves: tdf#90698 catch list (1;2) of non-references as error that introduced a conditional check on operands and operators. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102276 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit e00e2be30436b636d93f8852bb6af44972638a7c) Change-Id: If5da3a781f24f891ff12c4a8f32a2ec92c6b4c8a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102279 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* tdf#134477 add VclMessageType::Other to indicate image-less generic InfoBoxCaolán McNamara2020-09-094-4/+14
| | | | | | | Change-Id: I76e86bf4d82b33771ea2900517712be57ae7f03d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102130 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* xmlsecurity: avoid saying OK when the signature is partialMiklos Vajna2020-09-083-9/+14
| | | | | | | | | | | | | | | | | | That's reserved for valid signatures (digest match, certificate validates and the signature covers the whole document). Also avoid "invalid" in the dialog when the digest matches and the signature is just incomplete. This now uses wording which is closer to Acrobat and also uses the same wording on the infobar and in the dialog. Change-Id: I26e4781d555b65cf29aa8df2232e286917235dc1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101926 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102188 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#136323 qt5: Remember accessible objectMichael Weghorn2020-09-082-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | 'QAccessibleCache::insert' from the Qt library has a 'Q_ASSERT' checking that the corresponding 'QObject' for which the 'QAccessibleInterface' provides information is actually the same as the object passed as a parameter: QAccessible::Id QAccessibleCache::insert(QObject *object, QAccessibleInterface *iface) const { // ... QObject *obj = iface->object(); -> Q_ASSERT(object == obj); However, 'Qt5AccessibleWidget::object' so far was always returning 'nullptr', triggering this assert when using a Qt version not built with 'QT_NO_DEBUG'. To fix this, remember and return the object as needed. Change-Id: I4015b4c37aa8a073b02465df580a7235884e6cf3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102196 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 4461d49c6cfce22c2c96185b0a1d07bfe9709268) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102126 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* rhbz#1875377 if sort order is equivalent keep order fontconfig presentsCaolán McNamara2020-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | there are two fonts in fedora 32/33 for regular Cantarell /usr/share/fonts/cantarell/Cantarell-Regular.otf and /usr/share/fonts/cantarell/Cantarell-VF.otf where VF is the Variable Font version. The Cantarell-Regular ones has a CFF table and export to pdf creates a font subset that works perfectly fine. The VF one does not have a CFF table and the fallback case doesn't work for pdf export. Both have the same version, use a stable sort to retain their relative order that fontconfig presents so we use the Cantarell-Regular version we would see if we didn't sort by version at all. Change-Id: I750006b980810fc59e0a152d42ae17f29f46e3b3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101971 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* Resolves: tdf#136189 don't try and sort until treeview is filledCaolán McNamara2020-09-056-4/+17
| | | | | | | | | | | | | | | | Change-Id: Ic5ac71d88bab7627e14220912f4b9c935f2f1f26 and... Related: tdf#136189 don't assert on unsetting non-existing previous sort column Change-Id: If2330cc83ace9ec0133b99eec8c2f0be3919013e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101710 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit c52ac477beefc46802148033adbca9edb9970ac1) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101967 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#136062 Don't use 'Reject (All)/Clear formatting' buttons in CalcGabor Kelemen2020-09-051-4/+3
| | | | | | | | | | | | | | Since formatting changes are not tracked in Calc Change-Id: Ib1b50d248f1ba75aad22cd04af86d15cc2813e36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101293 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 894fddc5edf5aad6fc6d0e18a6c934bfa7f001e4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101453 Reviewed-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 120e696653a25a2560f8c60b08a6a86fda5c10fc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101965
* xmlsecurity: fix infobar vs signature dialog inconsistencyMiklos Vajna2020-09-041-2/+11
| | | | | | | | | | | | The infobar mentioned if a signature is partial, but the dialog just has a bool UI for signatures. Then present "good, but partial" as "bad". (cherry picked from commit 3ba1144cb96c710e665ffb3ada26fb6a48a03472) Change-Id: I698190aa77702000b11d635bd038d9c9a91614ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101844 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#127471 Remove font width scaling hackSamuel Mehrbrodt2020-09-041-14/+0
| | | | | | | | | | | | | | | Which causes distorted fonts in certain cases (see bug report). Fix was suggested by Ilhan Yesil at https://bugs.documentfoundation.org/show_bug.cgi?id=127471#c6 Change-Id: Ie644f56f0835ffad9230f981d2927d6b4c17453d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100970 Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 8891a2fc2a4bf86add68691b7ac167a07a8add84) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101960 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
* tdf#136423 make SwXDrawPage::group work with a single shapeSamuel Mehrbrodt2020-09-033-1/+46
| | | | | | | | | | | | | | No reason this should not work (and the implementation in Draw/Impress/Calc also works this way) Change-Id: Ic5bc7420e9025b45ed848dccf68b112c0c6c2cd5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101842 Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 3eb5318ed9ae8cf02804fbdc584a5f4b046db0ae) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101956 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>