summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2020-07-28configmgr: Use a proper LanguageTag-based locale fallback mechanism.Jan Holesovsky1-14/+10
Without this, zh-Hant-TW locale used via the LibreOfficeKit was reduced to zh-Hant and further to zh, which was interpreted as zh-CN, causing incorrect strings particularly in the sidebar. Change-Id: I58e53f71d13824e422a7b3634f3822d55090f8ee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99262 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2020-07-28Revert "android: avoid expensive load of un-used sidebar icons on mobile."Jan Holesovsky1-6/+0
Unfortunately we need this on Android for the tablets, otherwise the sidebar lacks the icons. Also it is not easily possible to use the isLOKMobilePhone() check here, because that is per-view in general, and handled in sfx in particular, making it hard to use here in vcl. This reverts commit 9a38b194eec5bcf6cb8d073e5d35173c5856f28f. Change-Id: I2b599e884ad4d00b7c246743c180a5324c9a143d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99328 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-07-28Use enable/disable widgets instead of hide/show.Gülşah Köse1-10/+9
Change-Id: Ied3eb671155b88d47a5a91fcd81351492ccf9bb9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99560 Tested-by: Jenkins Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com> (cherry picked from commit 08d16c76e483333b43e4f74bb6f9e57605f43f27) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99535 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-07-27xmlsecurity: detect unsigned incremental update between signaturesMiklos Vajna8-34/+155
(cherry picked from commit 7468d5df5ec79783eae84b62bdc5ecf12f0ca255) Conflicts: vcl/source/filter/ipdf/pdfdocument.cxx xmlsecurity/source/pdfio/pdfdocument.cxx Change-Id: I269ed858852ee7d1275adf340c8cc1565fc30693 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99480 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-07-27lok: fix-up: isLOKMobilePhone -> isLOKTabletMarco Cecchetti1-1/+1
That was the actual intention. Change-Id: I2967cea8ae3099e8523438a68c076a786042e15a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99286 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Marco Cecchetti <marco.cecchetti@collabora.com>
2020-07-26Re-implement 481e686a66e550229ec0b600a785452f0d753342Mike Kaganski2-3/+7
Marking documents modified simply on entry to an edit box created a problem, when using search in a read-only Online session made the document modified, and then auto-save failed, displaying a warning: Document cannot be saved. Check your permissions or contact the storage server administrator. The original problem, that 481e686a66e550229ec0b600a785452f0d753342 fixed, was that entering a box in Impress in browser, typing, then pressing Save without exiting the box did not save the edits. Yet, the same sequence works outside of Online. In that case, the doc is marked modified in SdrObjEditView::KeyInput, which obviously is not called from Online, where SdrObjEditView::Command is called instead with CommandEventId::ExtTextInput. So just make sure that we mark the document modified also in this case, making sure that only the actual edits set the "modified" flag. This reverts 481e686a66e550229ec0b600a785452f0d753342. Change-Id: Ib05bc0492616a306dd328bcb8f2e1c9d7e7aa191 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97870 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98137 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-07-24sw: find & replace: fix soft hyphen cleaningMiklos Vajna4-3/+187
If there is a formatted soft hyphen after the search string, then replace skipped the replacement, even if there was a match. Do the same for comments & footnotes, though the primary reported problem was just soft hyphens. (The same happened when manually doing find & replace using the Ctrl-H dialog.) (cherry picked from commit d8270636a57e7dc68ede51308c380e2098f765d7) Conflicts: sw/Module_sw.mk Change-Id: I8437e84dea99ceef98d515beef5893cf954e674f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99274 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-07-22Send various state changes to LOKAron Budea2-2/+25
Change-Id: I0d5dc63015364cd1586555b6dced81afa50745bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92865 Tested-by: Jenkins Reviewed-by: Aron Budea <aron.budea@collabora.com> (cherry picked from commit f2e059ca3b1d55c721c6a698e6761536534224ba) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97585 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> (cherry picked from commit 5a08b856e5a5f722e6b49d2e5e526593a4ad65de) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97794 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-07-22lok: sc: Desktop: Function wizard isn't properly asyncMarco Cecchetti2-3/+48
Open another view of the same spreadsheet when the function dialog is open. Note how the document in the new view can't be edited. This patch avoids to have a view locked after creation when in an other view the formula dialog is open. See also commit 009d275. Change-Id: Ie51f414c4ad83ef20526d10be3251e174158096c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98822 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-07-21Revert "tdf#128502: Try to support multiple documents ...cp-6.2-20Andras Timar29-186/+81
in LibreOfficeKit-using process" This reverts commit b0da52d19ed40dd0871f208eb7387ec1d8252de4. We decided not to have this "multiple docs" feature in stable cp-6.2 because it caused regressions that we could not fix quickly. Change-Id: Ib9ad6e010935e6a936832c01756700735a8cc6c5
2020-07-21Revert "tdf#128502: Remove assertions that fire for gtktiledviewer ...Andras Timar1-0/+3
on two docs" This reverts commit a84adccbd8cda66fd4d84c8443b0715820afd1da. We decided not to have this "multiple docs" feature in stable cp-6.2 because it caused regressions that we could not fix quickly. Change-Id: I01de0740cafa27a2fd5e07dd3a3ebd223c64297f
2020-07-21Revert "tdf#128502: Remove one more assertion"Andras Timar1-0/+1
This reverts commit daebdc6928aff7c09f9e961ce11c38d5e636ed0b. We decided not to have this "multiple docs" feature in stable cp-6.2 because it caused regressions that we could not fix quickly. Change-Id: I57928d615d03f850cae6b713eb6a0601a57c6e99
2020-07-21Revert "Avoid crash with multiple documents open in the iOS app"Andras Timar1-6/+0
This reverts commit 818a68cb259078fe2cc1ae1d82d3b854e49b24fe. We decided not to have this "multiple docs" feature in stable cp-6.2 because it caused regressions that we could not fix quickly. Change-Id: I526b094d255a40d7b9427237ffdd86e3923e64ca
2020-07-21Revert "Let's not run on hope"Andras Timar1-5/+6
This reverts commit 6dd8180d046e88f95816d59701f78b2f81e1cb64. We decided not to have this "multiple docs" feature in stable cp-6.2 because it caused regressions that we could not fix quickly. Change-Id: Ib2b6b5196221ef2ec16308cc79b245a2c8d6e7de
2020-07-21Revert "tdf#128502: Fix (haha) for a crash with multiple docs ...Andras Timar1-4/+1
open in the iOS app" This reverts commit 2768b5828df4b045c65c1fbfd724c8066761711a. We decided not to have this "multiple docs" feature in stable cp-6.2 because it caused regressions that we could not fix quickly. Change-Id: If9c6002782bf76957ad384556152a173dd2c18cb
2020-07-21tdf#50879 PDF export: ensure only built-in fonts are used for formsMiklos Vajna1-3/+10
Alternative would be to embed the whole font, which is unusual: PDF typically just embeds the used subset. (cherry picked from commit 6294ecd7b4da38de98b24ddfb9f201cef98c1f41) [ Backport is missing the testcase, pdfium on this branch is too old. ] Change-Id: Ic0b7e121b3ae38804c1a396ea36104ebcc0b9588 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99070 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2020-07-16Bump version to 6.2-20Aron Budea1-1/+1
Change-Id: I40871c8c067f6217a0ef4b4678c253fd2e764ca4
2020-07-14Fix widget placement problem on mailmerge result dialog.Gülşah Köse1-1/+2
Change-Id: Iff7bae3f1e30d106ed54f3a67bf5c6fefe67e2d4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98636 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
2020-07-10Don't reset reference marks when editing the formulaSzymon Kłos1-2/+7
This prevents us from hiding reference marks on switching sheets when formula is under edit. Change-Id: I4bf1e36967420c12bfa974b0aeefda537a26eed3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98364 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 5fc0cea87be4b439bb3d3a5281984fd16b05dc28) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98349
2020-07-10Get correct tab for current selectionSzymon Kłos1-1/+1
Change-Id: Ie3146675a5b6cca5357fccc668ce17b859836147 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98315 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 88417fb01bf03969970b574421a7688768dff6ef) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98340
2020-07-09Empty reference marks on selection resetSzymon Kłos1-0/+2
Change-Id: Id085b6b608335e1bcc085d7a8c972622a918f1ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98316 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> (cherry picked from commit 7e8bcf38f00b3c45a78ba7a60aeb9e6dee11a23e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98341
2020-07-09android: we want full Chinese localizationAron Budea1-1/+1
Change-Id: Ie67bc68f25431dd0391885ac43d87f2717eec1bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98392 Tested-by: Aron Budea <aron.budea@collabora.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
2020-07-02Bump version to 6.2-19co-6.2-19Andras Timar1-1/+1
Change-Id: I077c07cb274d84b3505dc79329d00cf4772f11ec
2020-07-02Add Turkish (tr) dictionaryMuhammet Kara5-0/+42
Change-Id: Ibc1e7505e6a7492f4d0714c848a6d1eebcdf4a0a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97588 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-07-01Update git submodulesMuhammet Kara1-0/+0
* Update translations from branch 'distro/collabora/cp-6.2' to 3f1238d044c7f9e383e6df3e1b14d6ab16ccf5ee - l10n: Turkish translation update (redaction) Change-Id: Id734f5992ef0dd24c9075eb94dd8d956a843470e
2020-07-01android: Add a CP x86 configuration too.Jan Holesovsky1-0/+4
Change-Id: I8d584811244cd613b8637d9dd2cf1bfe1985ecec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97610 Tested-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-07-01Update git submodulesAndras Timar1-0/+0
* Update translations from branch 'distro/collabora/cp-6.2' to cda1ee131f39a4f8329749ff1ca4aa1022422b03 - Translation update (redaction) Change-Id: I568cc293ee6c03753fc923a87bf9a7f33b6d4124
2020-06-29LOKit: do not show 'Add to Dictionary' button for OnlineAndras Timar1-4/+5
Because user profiles (user dictinaries) are not persistent. Change-Id: I78261cccc068cfc1cc9fb2ddecd085ac58ff31c4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97351 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-26Bump version to 6.2-18cp-6.2-18Andras Timar1-1/+1
Change-Id: I10a58da129f3fb1eaef27a9ebcbdd56cf10de4bb
2020-06-26Revert "tdf#133858 opening spreadsheet with large array formula takes 10 ↵Noel Grandin1-9/+0
mins" (tdf#134234) This reverts commit 9a5f2961b085ce2f23ecdf0a03d1114bacac8e2c. Reason for revert: causes regression, see tdf#134234 Change-Id: I1cc3e6daa0e65231e8a4d7c1ae4a60cfdf106457 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97055 Tested-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-26mariadb: upgrade to release 3.1.8Michael Stahl17-600/+339
Fixes CVE-2018-3081 CVE-2020-2574 CVE-2020-2752 CVE-2020-2922 CVE-2020-13249 Remove obsolete patches: * mariadb-msvc.patch.1 * mariadb-swap.patch * mariadb-inline.patch.1 * mariadb-CONC-104.patch.1 Don't build anything from plugins/ in the hope that it's not needed. Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96466 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit fe041bbc343ee08c6e901f63985d55a90da71c8b) mariadb: forgot to adapt flatpak-manifest.in mariadb: the "pvio_socket" plugin turns out to be important ... otherwise can't connect to a TCP socket. (regression from fe041bbc343ee08c6e901f63985d55a90da71c8b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96536 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit 82a1650683df7d5c1769dfd68a26a4d071f1a546) Change-Id: I1c8633866b7108a8bb22dae0e0dd5f4a44bf5150 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96519 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96984 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-26tdf#128502: Fix (haha) for a crash with multiple docs open in the iOS appTor Lillqvist1-1/+4
Just a band-aid to avoid a crash. The LibreOfficeKit-related code would need a thorough re-factoring to properly be prepared for multiple open documents. Change-Id: I8c31e2badd747f3086526f89638fa495f4dcf295 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97205 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-26android: Add a CP x86-64 configuration.Jan Holesovsky1-0/+4
Change-Id: Icdfee0a6609487f5ac2423c74344cb605b7e4fbf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97113 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-06-25Let's not run on hopeTor Lillqvist1-6/+5
Change-Id: If2fb2c55d53321ec2e5beff0ade9974c02811f7f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97120 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-25tdf#130479 FODG import: fix handling of <draw:fill-image> in stylesMiklos Vajna5-0/+362
Regression from the image handling rework, the problem was that the old, URL-based code had explicit handling of mxBase64Stream, while the new, XGraphic-based code assumed that by the time we reach the end of of the bitmap style element, maAny already contains the graphic. Fix the problem by improving XMLBitmapStyleContext::EndElement(), so it loads the graphic from the base64 stream if we don't have a graphic already. (cherry picked from commit 96baf8c69330d50af7d31ab9838bcd0ec7c8c50b) Change-Id: I6d90f1470a5b797fb51789901081ccd7a6fd29e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94459 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit a97cbe7221c0175a4a2d342e2d1a62b06af4e13a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97132 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Aron Budea <aron.budea@collabora.com>
2020-06-25Avoid crash with multiple documents open in the iOS appTor Lillqvist1-0/+6
Also add a FIXME. Just 'hoping' is not good enough. But yeah, much of this code indeeed works mostly by accident. Change-Id: Ic6bcbc10229a0b7cdd8d696794efe152fca4faea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97117 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-25tdf#128502: Remove one more assertionTor Lillqvist1-1/+0
See bda60c9b1ca6a0fbfde9f3428489f33729cc81f1. Change-Id: If67f0696c56b0984dcfffdcf748d4f412874a64f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95061 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95145 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-06-25tdf#128502: Remove assertions that fire for gtktiledviewer on two docsTor Lillqvist1-3/+0
If you run gtktiledviewer so that it opens a spreadsheet and a text document these assertions would fire. In each case the assertion is followed by code that just returns if the asserted condition doesn't hold, so it is unlikely that this change will break anything. There sure will be a lot of further changes needed to make such a use case work. (For starters, editing either of the two documents does not work.) But let's do it step by step. Change-Id: I4063dbbcac7c77b57e1f4cb3f05bd5096c08c0fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95037 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95144 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-06-25tdf#128502: Try to support multiple documents in LibreOfficeKit-using processTor Lillqvist29-81/+186
The LibreOfficeKit-specific code typically has assumed that all the "views" (SfxViewShell instances) are for the same document, because all LibreOfficeKit-based application processes (including the "kit" processes in Online and the iOS app) so far have only had one document open at a time. It is now possible to pass several document file names on the command line to gtktiledviewer and that is an easy way to demonstrate how badly it still works even with this patch. Introduce a unique numeric document id that is increased in the LibLODocument_Impl constructor. Add APIs to access that. When iterating over views, try to skip views that are not of the document visible in the "current" view, if we know what the "current" view is. Also add a couple of FIXMEs at places where it is a bit unclear (to me) whether it is correct to iterate over all views, or whether only views for the "current" document are what we would want. Change-Id: I6e2d85e61a6743ca110500bf48b3d80b2027dfb1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97085 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-25Revert "tdf#128502: Try to support multiple documents in ↵Tor Lillqvist28-183/+79
LibreOfficeKit-using process" This reverts commit 3d9e60524fcb4d62fbf17af0ccd1f9613b1b8470. Reason for revert: The commit dc13c656dc25ed35c31bec7b6c8ae7d0c6b258e3 that was merged in the meantime means that this change that now is reverted doesn't compile, and besides it doesn't handle the additional SfxViewShell loop that dc13c656dc25ed35c31bec7b6c8ae7d0c6b258e3 introduced. More work needed... Change-Id: I9886445d2f7b6ce939546c0673bdb8a32afe1abf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97053 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2020-06-24Fix .uno:SidebarHide command works for onlineMert Tumer1-1/+11
Change-Id: I03743d15300687b1da947d3c44be6a42aab83107 Signed-off-by: Mert Tumer <mert.tumer@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96618 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-06-24tdf#128502: Try to support multiple documents in LibreOfficeKit-using processTor Lillqvist28-79/+183
The LibreOfficeKit-specific code typically has assumed that all the "views" (SfxViewShell instances) are for the same document, because all LibreOfficeKit-based application processes (including the "kit" processes in Online and the iOS app) so far have only had one document open at a time. It is now possible to pass several document file names on the command line to gtktiledviewer and that is an easy way to demonstrate how badly it still works even with this patch. Introduce a unique numeric document id that is increased in the LibLODocument_Impl constructor. Add APIs to access that. When iterating over views, try to skip views that are not of the document visible in the "current" view, if we know what the "current" view is. Also add a couple of FIXMEs at places where it is a bit unclear (to me) whether it is correct to iterate over all views, or whether only views for the "current" document are what we would want. Change-Id: Id5ebb92a115723cdeb23907163d5b5f282016252 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95353 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96356 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
2020-06-24lok: calc: messed up view when deleting from multiline contentMarco Cecchetti3-0/+59
To see the problem was enough to click on the cell with the multiline content (because of wrap text enabled), and press delete. Change-Id: I8288e7739c8513f5fa0bdee5f7eb414b4abac456 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96905 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-24Update fontconfig to 2.13.91Michael Weghorn1-2/+2
This new version speeds up cache initialization. For the Android Viewer case, this significantly decreases the time between the user selecting the first document after app installation and the point in time it actually shows up (e.g. from about 2 minutes to about 10 seconds on my Samsung Galaxy S4). Note: fontconfig 2.13.92 had issues and did not work properly when quickly testing with Android Viewer, showed e.g. this line in 'adb logcat' output and crashed when opening a document with Asian characters stderr : Fontconfig error: Cannot load config file from /data/user/0/<APP_ID>/etc/fonts/fonts.conf So, go with version 2.13.91 for now. This should probably also allow dropping the current workarounds related to slow fontconfig cache initialization for the online-based Android app, but unfortunately my builds of that app never succeeded in properly loading/rendering any document, so I won't touch that one for now... tarball available for download at https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.91.tar.gz Change-Id: I22c8d6de58ac9425931f884aab75841ccea0494a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90095 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit adbc858dd476651ac79300aaae25cf82e848cb69) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96874 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2020-06-23tdf#116194 DOCX import: fix missing tables with w:gridBeforeLászló Németh8-15/+74
Regression from the commit cf33af732ed0d3d553bb74636e3b14c55d44c153 "handle w:gridBefore by faking cells (fdo#38414)" This patch replaces the previous fix with a better solution, fixing tdf#38414 on the proposed DomainMapper level. (Note: to reject the old fix completely, its follow-up commit w:gridAfter will be handled in a similar way.) Now the related regressions, tdf#111679, tdf#120512 and the complex forms of tdf#116194, tdf120256 and tdf#122608 are fixed, too. Reviewed-on: https://gerrit.libreoffice.org/84263 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit da1f71edfc72928b07a569b98e2766a8a7de9d2a) Reviewed-on: https://gerrit.libreoffice.org/84711 Tested-by: Jenkins Change-Id: Id25f5fb4d9021c87ee8c82782b2038e6fb255673 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96951 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2020-06-22tdf#121384 don't leave a bare trailing : in PYTHONPATHCaolán McNamara1-2/+12
and don't insert any empty path entries if that situation was to arise Change-Id: I8d8183485f457c3e4385181fee07390c4bfef603 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96707 Reviewed-by: Tomáš Chvátal <tchvatal@suse.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Jenkins
2020-06-19Bump version to 6.2-17cp-6.2-17Andras Timar1-1/+1
Change-Id: I6a0d5f39e8a0876fe747974b73386d96547c6e11
2020-06-19Fix a chrash in LOKit (Japanese-only)Andras Timar1-0/+5
Change-Id: I09c8d3a129c0d1d2fab561add0447869156b193f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96682 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2020-06-19[cp] Be more relaxed with accepting certs in serfAndras Timar2-0/+12
The Desktop product uses neon, so this patch is for Online. When the WOPI-like host uses a self-signed SSL certificate, serf refuses to fetch resources from it, so Insert - Image and Create from Template operations fail. Related commit: a08552a8c36754930a3268e27aefee70d5cf21df But in case of serf somehow we do not trigger the interaction handler, we get an information message box with the text "Image file cannot be opened" So I decided to patch serf. The result is the same. * In Collabora Online 4.0.x we do not check the cert of WOPI-like host anyway. * In Collabora Online 4.2.x we optionally check the cert of WOPI-like host. The Create from Template and Insert - Image cases will be exceptional, where we won't check it. Generally it should not make a big difference. Change-Id: I3937bf450ef70f3a793ec1c793336d18209b6e62 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96652 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2020-06-19tdf#111535 - Add First-line indent, paragraph indent, and tab spaces/Core partgokaysatir4-1/+51
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93165 Tested-by: Jenkins Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 15adfafee5b48d6f88a0b970c50e5c5bc77a4ab1) Change-Id: Ib340e74646299c344dd770977497f59a030c86f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96611 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>