summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-01-29Update git submoduleslibreoffice-6-2-0Olivier Hallot1-0/+0
* Update helpcontent2 from branch 'libreoffice-6-2-0' - 6.2 features video last update of 1/20/2019 as per msg in marketing priv list of 1/20/2019 Change-Id: Ifc8cba99206c5872bebfd0a4da140d4f4bab5ae1 Reviewed-on: https://gerrit.libreoffice.org/66859 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit ec2affa7289a7964f5291d5368dc31a1d2ae0961) Reviewed-on: https://gerrit.libreoffice.org/66956 Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org> Tested-by: Olivier Hallot <olivier.hallot@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com>
2019-01-26Update git submodulesAndras Timar1-0/+0
* Update translations from branch 'libreoffice-6-2-0' - Updated Slovenian translation Change-Id: I07561f22049061a2f8f3abcef7576bdd06e381b8 (cherry picked from commit 3af8fa3625c380fc9dc417b247cc230ddda73f8d)
2019-01-25Support AdoptOpenJDKhimajin1000006-5/+21
Change-Id: Idcfd542c6caede3d987e9b8219cf48114800daa5 Reviewed-on: https://gerrit.libreoffice.org/66634 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 61c4f96d6ae6a80370774e53287edb27cbce8067) Reviewed-on: https://gerrit.libreoffice.org/66715 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 273330a55d7cf457da6d7ba9829527a961c40bc0) Reviewed-on: https://gerrit.libreoffice.org/66881 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-01-23bump product version to 6.2.0.3.0+Christian Lohmaier1-1/+1
Change-Id: Iafa54ac6206f8be17a7cc89b170aeec8d2d67334
2019-01-23Resolves: tdf#122874 select row when user clicks toggle in rowCaolán McNamara2-1/+5
Change-Id: I761d0566eef07eadf9e583566b8707b18563ee33 Reviewed-on: https://gerrit.libreoffice.org/66744 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-23tdf#122846: Close option dialog if restart is confirmedXisco Fauli2-4/+6
use the same logic as 0fa14d58457e9418ff756a0efd66e365c4403a67 Change-Id: I485cb232bb787e176918caf2eee74b0fbb360e47 Reviewed-on: https://gerrit.libreoffice.org/66691 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Reviewed-on: https://gerrit.libreoffice.org/66733 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
2019-01-23OSX Re-Introduce NSApplicationMain usageJan-Marek Glogowski6-13/+52
This restores the nested NSApplicationMain and default run loop usage. Without it the Java AWT integration will start its own event loop, effectively blocking any non-system event processing. Reproducible via "Tools - Macros - Organize Macros - BeanShell... - LibreOffice Macros - HelloWorld - helloworld.bsh - Edit". The blocking can be prevented by overriding NSApplication::run and running our own event loop using Application::Execute. But this still doesn't show the Java AWT editor window and I couldn't find any information how to fix this. Since OSX now is a VCL plugin, this can't restore the old hook mechanism, but instead adds a new function to SalInstance. SalInstance initialization happens at InitVCL() start just a little bit later in the call stack. Somehow NSApplicationMain manages to run the Java VM in an extra thread, so it doesn't block the main loop. Probably this could also be handled by LO starting the JVM as a thread. Further information for an implementation eventually can be found in the "Technical Note TN2147" "JNI Development on Mac OS X." Change-Id: I04a0c2bf7949571f1b678ada9ab3592e0fe30c1f Regression-from: 925e2edb6f3f8fffcff9eddb31ed18bc77e2a690 Reviewed-on: https://gerrit.libreoffice.org/65836 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 284a7f60fff72c4d8c011ff60ea2e40163cd25c3) Reviewed-on: https://gerrit.libreoffice.org/66192 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit d94f96c56d858cfd20bd7fac0c357ea0ecc24785) Reviewed-on: https://gerrit.libreoffice.org/66240 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-01-23sw_redlinehide: fix assert caused by buggy lcl_ModifyOfstMichael Stahl1-24/+14
converting ooo67907-1.doc to ODT asserts in fillSoftPageBreakList() while mapping an invalid (too large) GetOfst() of a follow frame. There are some problems with the lcl_ModifyOfst() implementation and usage: 1. the implementation iterates over all follows; but the follows will get the same SwClientNotify() call as the frame itself, so in effect the follows' Ofsts will be modified multiple times 2. the calls to lcl_ModifyOfst pass in a positive nLen whether the text is deleted or inserted; surely for deletions the Ofst should be subtracted from instead of added to 3. the special-casing of RES_DEL_CHR to COMPLETE_STRING while RES_DEL_TXT uses the length does not appear to be justified The assert happens since b15f1ed2a1df45a57b587ac90efa90c1c18866fc but the lcl_ModifyOfst logic never made sense. Change-Id: Ie92628515bbee0fcc2123eb412057d8c0fd0b2f1 Reviewed-on: https://gerrit.libreoffice.org/66679 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 0acde7514e666fc04805fd36503bd174162336ca) Reviewed-on: https://gerrit.libreoffice.org/66683 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d246374dc71ee557de5811e1971a82e0f6145509) Reviewed-on: https://gerrit.libreoffice.org/66722 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2019-01-23update creditsChristian Lohmaier1-1573/+1603
Change-Id: Ib5e07977b6dd15b533e94185ecb80d0d6587b7c7 (cherry picked from commit 2a4cba62438de7f3dc2ccc79cd2ee013a99bb990) (cherry picked from commit 09f7cc59735ce0f43fb4f6a531feccf732cc25f0)
2019-01-23Resolves: tdf#122889 Mail config dialog is emptyCaolán McNamara3-8/+7
revert... commit 7ec12ce7e449d7849b3e67c443783110e2a50a17 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Sep 28 20:24:35 2018 +0100 weld SwMailConfigDlg the contained page needs to be converted first Change-Id: I9788132b0ad11cec853be7339be1829386794511 Reviewed-on: https://gerrit.libreoffice.org/66785 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-23Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-2-0' - update translations for 6.2.0 rc3 and force-fix errors using pocheck (cherry picked from commit c9b0b78a2010686c68f88d7ccb7a6dec0be2827f) Change-Id: If53c61680a119cbecfd5439115f48fd8da19d489 - Version 6.2.0.2, tag libreoffice-6.2.0.2 Change-Id: Ic7d10ae575c168125f2182031683f18b0ffbc92a
2019-01-23Resolves: tdf#122880 list of obj types at 0 height with gtk 3.18Caolán McNamara1-0/+2
Change-Id: Ib50bc94d1dd4c90cf1516110d413c480aff603ab Reviewed-on: https://gerrit.libreoffice.org/66746 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-22tdf#122516: fix timestamp in MariaDb/mysqlJulien Nabet1-1/+1
Change-Id: I9740e265c7f4c607bf871c5f12df149355ce6a61 Reviewed-on: https://gerrit.libreoffice.org/66671 Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-22Resolves: crash in double-split when first timeout hadn't expired yetCaolán McNamara1-2/+5
Change-Id: Ieba97589a3794cf5ed95839e20cc4028cfedae3a Reviewed-on: https://gerrit.libreoffice.org/66067 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-21Resolves: tdf#122786 use weld::SpinButton::set_value() instead of set_text()Eike Rathke1-5/+5
... otherwise get_value() returns 0. Change-Id: I345d31e888e40f1fc191cef7dac802eb860a824f Reviewed-on: https://gerrit.libreoffice.org/66539 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit af8d616fe7556716af8ccd4c4de7a68ae52ce2b7) Reviewed-on: https://gerrit.libreoffice.org/66547 Reviewed-by: Laurent BP <laurent.balland-poirier@laposte.net> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-21Resolves: tdf#122404 unlock just the toplevels that were lockedCaolán McNamara8-94/+59
push what toplevels got locked to just unlock those ones. otherwise the just dismissed toplevel may still be present in the Application toplevel list. merge all the similar examples of this. Change-Id: I77c0d55d1e4b3bcc3b8d88fef00ba289edd1e831 Reviewed-on: https://gerrit.libreoffice.org/66167 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-21Related: tdf#122598 macro dialog from record macro has no parentCaolán McNamara1-1/+11
Change-Id: I4ef2bca2ada4accefcf9a5314ad60c6177d1ae19 Reviewed-on: https://gerrit.libreoffice.org/66163 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-21Resolves: tdf#122398 max/min limits too small for scale FormattedSpinButtonsCaolán McNamara2-6/+9
Change-Id: I679b6cc7e4bfc4273fc438e6d1d897ba66ead77b Reviewed-on: https://gerrit.libreoffice.org/66126 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-21tdf#107416 Revert "tdf#103703 Turn on single print jobs for collated prints"Gabor Kelemen1-3/+0
Turns out this was a wrong solution to the problem, also causing printout mixups on busy printers for the users This reverts commit 37c3e57c788fb5ad931126ea233093d87ac3dbc3. Change-Id: I8a456f4c90f48854c1f5e92dc39ed4ec8a17cf75 Reviewed-on: https://gerrit.libreoffice.org/65993 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit 2117257eafac507b6af0be86ae62261fd192089a) Reviewed-on: https://gerrit.libreoffice.org/66153 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-21Resolves: tdf#122458 not enough values savedCaolán McNamara1-10/+2
Change-Id: Id71db408e756b273f8a90b15f86c76285cc2b1e1 Reviewed-on: https://gerrit.libreoffice.org/66434 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-21tdf#122808 search formatting dialog should be modalCaolán McNamara1-0/+1
Change-Id: I8b33fcbbf538660703f6cdb9818e8fae2c623be9 Reviewed-on: https://gerrit.libreoffice.org/66676 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-21Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann1-3/+3
Reviewed-on: https://gerrit.libreoffice.org/66496 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5e89aad61e143ad6a52291ef7065f5b22e348c85) Conflicts: solenv/flatpak-manifest.in Change-Id: I9400c8fa5b7763debc13274f7e001b6425d8392e Reviewed-on: https://gerrit.libreoffice.org/66538 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2019-01-20lcms2: upgrade to release 2.9Michael Stahl4-28/+175
... at least, that's the plan - this is harder than it appears, as the upstream maintainer appears to have released version 2.9 at least 3 times: - Fedora has a file evidently downloaded before Nov. 17 with SHA512 of e30ad5a9a1ab9e7aaace9431434caa19a5ff6143db46644aba971a5ee37a265b26bf738e886d766405a7eb45a9d620d67c7ab3684ace86a107cf5a76642c04a5 - Gentoo has a file evidently downloaded before Nov. 19 with SHA256 of d4ad6f8718f7f9dc8b2a3276c9f237aa3f5eccdcf98b86dedc4262d8a1e7f009 - Debian has a file evidently downloaded before Dec. 17 with SHA256 of 48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20 The lcms2-2.9.tar.gz available from sourceforge currently matches the one Debian has, so let's use it. * 0017-Upgrade-Visual-studio-2017-15.8.patch added (fixing CVE-2018-16435) * 0001-Added-an-extra-check-to-MLU-bounds.patch.1 removed (fixed upstream) Change-Id: Iab8dada8f6d77d5b2da8560993380b3332bc02f6 Reviewed-on: https://gerrit.libreoffice.org/66400 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 99b20e589e64fbcf374d84ae68911ef2a96e537c) Reviewed-on: https://gerrit.libreoffice.org/66427 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7af853921bc2161a42e0ba3bd02fdafcc49e62d5) Reviewed-on: https://gerrit.libreoffice.org/66537 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-01-20sdext: fix build with poppler 0.73Michael Stahl3-6/+10
... which has removed Guchar, Gushort, Guint, Gulong... Reviewed-on: https://gerrit.libreoffice.org/66305 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 50d371ae08c66648d9f32f633b2245e1746e2bb6) Reviewed-on: https://gerrit.libreoffice.org/66356 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9e1522ad1d2c2bd775fa50c2b142eb110a56af72) sdext: fix the build, std::is_same_v is not available yet Reviewed-on: https://gerrit.libreoffice.org/66429 (cherry picked from commit cf77d8f53b526b2896a02f8e8594f2dc7f560323) Change-Id: Ia54ad378031f167f6779f6ffe574b85c1e72f26d Reviewed-on: https://gerrit.libreoffice.org/66535 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-20curl: upgrade to release 7.63.0Michael Stahl1-2/+2
fixes CVE-2018-16840 Change-Id: Ica995a28a71eb5d5277d045d57fee9ba0f88883f Reviewed-on: https://gerrit.libreoffice.org/66328 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 5e96a5c664aea950111199e56bda412512a849b0) Reviewed-on: https://gerrit.libreoffice.org/66359 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit ab508db4dfe406e92a056cd74cb31b7cda62fed9) Reviewed-on: https://gerrit.libreoffice.org/66530 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-01-20libxml2: upgrade to release 2.9.9Michael Stahl3-16/+4
* fixes CVE-2018-14404 * drop one hunk from libxml2-android.patch that was added in commit 6a17d2f2ba7acfec277314b97b50e41532d6b44d; presumably nan() exists now given that other code is calling it. Change-Id: I696cc4e1da55536ea1c89a6e0446ce5bc8398ba4 Reviewed-on: https://gerrit.libreoffice.org/66308 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit beea5852720b22043aefcd1e6b7243c202b40601) Reviewed-on: https://gerrit.libreoffice.org/66357 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a9672d702e82a2aeaa3fe1986a355ce355c7cf3e) Reviewed-on: https://gerrit.libreoffice.org/66529 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-01-20python3: add patch bpo-17239: Disable external entities in SAX parserMichael Stahl2-0/+60
Reviewed-on: https://gerrit.libreoffice.org/66329 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit a57dd8eba9c0799dd42eb547a37622bce8fdb0b3) Change-Id: I44e969d8d3a8fe6b6426d61a1cbe83154c8518dd Reviewed-on: https://gerrit.libreoffice.org/66366 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 372617a61554ddbdcbb488ef05a1e9d9b30171e1) Reviewed-on: https://gerrit.libreoffice.org/66531 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-01-20Resolves: tdf#122346 get font features to stick in entry properlyCaolán McNamara1-1/+1
Change-Id: I56058a2069600a4c8acba861a38e7e5d84f44d81 Reviewed-on: https://gerrit.libreoffice.org/66501 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-20poppler: upgrade to release 0.73.0Michael Stahl6-13/+52
Reviewed-on: https://gerrit.libreoffice.org/66306 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 0609ea4fc27f34367716bf41c0cdaa7785aed9da) Change-Id: If20998f8565b5534a96b3f29ccec572273edca1d Reviewed-on: https://gerrit.libreoffice.org/66368 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 33cbf95d65c876838507a7084ef0f65e00f93928) Reviewed-on: https://gerrit.libreoffice.org/66536 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-01-18Fix build with poppler-0.72Andreas Sturmlechner1-0/+8
Change-Id: I0664d1b39e97b7555c0a3cba442db52b84f37134 Reviewed-on: https://gerrit.libreoffice.org/65960 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 65a6c9ae4791188ffcecf489073cf38873ce5e17) Reviewed-on: https://gerrit.libreoffice.org/66373 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6382edc2b1d5ae5e6f88a378da0647b890d4c776) Reviewed-on: https://gerrit.libreoffice.org/66534 Reviewed-by: Andreas Sturmlechner <asturm@gentoo.org>
2019-01-18Resolves: tdf#122711 fix order of columnsCaolán McNamara1-2/+2
Change-Id: I04c078257fd9290ca17410b4833828f7f6bfd266 Reviewed-on: https://gerrit.libreoffice.org/66354 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-01-17Fix build with poppler 0.71Aleksei Nikiforov3-2/+10
Change-Id: I470ece9dc4766e10e1ccb5e99b25a8d8cc4cbf38 Reviewed-on: https://gerrit.libreoffice.org/63860 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 8ff41a26caf51544699863c89598d37d93dc1b21) Reviewed-on: https://gerrit.libreoffice.org/66372 Reviewed-by: Aleksei Nikiforov <darktemplar@basealt.ru> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7ec15d251bbc8b5d968c8f95577afd80908fd065) Reviewed-on: https://gerrit.libreoffice.org/66533 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-01-17poppler dropped GBool since 0.71Mike Kaganski2-25/+31
See https://lists.freedesktop.org/archives/libreoffice/2018-November/081410.html Change-Id: I258e08894486a925bed50a3a4232b6e805af6784 Reviewed-on: https://gerrit.libreoffice.org/63625 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5e8bdd9203dd642111c62a6668ee665a20d4ba19) Reviewed-on: https://gerrit.libreoffice.org/66371 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit d723af33fb7b56dcc319118f3eae759c1efba67c) Reviewed-on: https://gerrit.libreoffice.org/66532 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-01-17Related: tdf#122627 auto detect of toggle column doesn't workCaolán McNamara11-63/+94
so remove it and explicitly state what column contains the toggle Change-Id: I58fb12a4b8fa9eeb9c038f796e48b0aeaa0b2404 Reviewed-on: https://gerrit.libreoffice.org/66381 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-17Resolves: tdf#122509 we have a second list with generated currency formatsEike Rathke3-10/+25
... which kicks in if SvxNumberFormatShell::FindEntry() determined a format index of NUMBERFORMAT_ENTRY_NEW_CURRENCY instead of a real existing index. Regression from commit e607f1da329a2d4dd91904053d7ff86ac05c77bf CommitDate: Thu Oct 4 15:02:13 2018 +0200 Select the current format if multiple instead of first matching format code The old (now removed as unused) SvxNumberFormatShell::GetListPos4Entry(const OUString&) used before took care of that, add the functionality back but combine into the existing GetListPos4Entry() function, the additional FindEntry() call wasn't necessary anyway because it was just called before in the caller. The actual crash happened elsewhere in SvNumberFormatter::GenerateFormat() because no format exists for the then determined entry, which should be changed independently to prevent such abuses. Change-Id: Id42efa152693119fbde82b234f367679f818cfab Reviewed-on: https://gerrit.libreoffice.org/66472 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit c9d19b70c93b02e5c666414097e835039c598731) Reviewed-on: https://gerrit.libreoffice.org/66478 Reviewed-by: Laurent BP <laurent.balland-poirier@laposte.net> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-01-17sw_redlinehide: fix infinite loop when deleting commentsMichael Stahl1-3/+31
The problem is that sw::UpdateFramesForAddDeleteRedline() sends a SwFormatFieldHintWhich::REMOVED event in order to remove any comments that may have been deleted from the document view. Unfortunately there's another listener in class FieldDocWatchingStack that is used during various SwPostItMgr::Delete* functions, which will effectively start over from scratch if it receives this event, so it is an infinite loop. Avoid this by simply ignoring any redline-deleted fields; deleting them again won't provide any benefit anyway. This can be seen with UITest deleteAllComments.DeleteAllComments.test_comment_trackchanges. (regression from 9b67b6a6d4b912f1e515d3884fa02c1be8aa6921) Change-Id: Ie1d5676d1d79a51e2e4a01a3e282f8739ff08899 Reviewed-on: https://gerrit.libreoffice.org/66178 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 484fb55168b18bbd8c6160e5a3958a5188987ab5) Reviewed-on: https://gerrit.libreoffice.org/66193 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 3ddbd377abfbf462f83e3190aa2fd31da876fd6d) Reviewed-on: https://gerrit.libreoffice.org/66279 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-17Resolves: tdf#122356 on row-activate click ok buttonCaolán McNamara1-1/+4
instead of proceeding directy to the ok response. Because there is an additional handler installed in the okbutton to do extra stuff that is needed to make this work Change-Id: I9646ea6978533084c6c9c48b03806e46eaa49c33 Reviewed-on: https://gerrit.libreoffice.org/66047 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit f3ff8ba104e8271e7a33c5cbb94ab8f561dd4a38) Reviewed-on: https://gerrit.libreoffice.org/66473 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-16tdf#122722 sw: fix hidden text crash in SwTextFrame::GetCurWord()Michael Stahl1-1/+1
A frame that is fully hidden does not have a SwParaPortion, see SwTextFrame::Format() early return. (regression from 9bda4a67565817f0a26f48c4a4b9723894a385f5) Change-Id: I6b06824e53cef7218b60f60fced8f863adad8b62 Reviewed-on: https://gerrit.libreoffice.org/66385 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 0623861685dd1c9daa72a1002f5b018d5c5ef03c) Reviewed-on: https://gerrit.libreoffice.org/66402 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-15Resolves: tdf#122700 cannot change shadow colorCaolán McNamara1-8/+0
Change-Id: Iee42beb96ff4d059c685173fdde453981b300b3c Reviewed-on: https://gerrit.libreoffice.org/66362 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2019-01-15Resolves: tdf#122627 be explicit about what column to checkCaolán McNamara1-12/+12
Change-Id: Icdd1cef6b0bc9d8dd61c309dc9de66021fc9422d Reviewed-on: https://gerrit.libreoffice.org/66288 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-14tdf#122253 KDE5: Correct parent menu before it's usedAleksei Nikiforov2-6/+9
Also correct action group of menu Change-Id: Ie7eddd3cdc9fa1c36fdeaa1e96eb5d50d7126c09 Reviewed-on: https://gerrit.libreoffice.org/66146 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit c278857137ea0e9e25613d5f6bf8ddaf1336fbcc) Reviewed-on: https://gerrit.libreoffice.org/66173 Reviewed-by: Aleksei Nikiforov <darktemplar@basealt.ru> Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit b6704c14ce2241e76904e494125a520814ec5021) Reviewed-on: https://gerrit.libreoffice.org/66290 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de>
2019-01-14tdf#122384 Added isPrinter support to WinSalGraphicsImpl::drawPolyLineArmin Le Grand1-0/+15
As already guessed but not been sure (see 'One more hint' in WinSalGraphicsImpl::drawPolyPolygon) the strange WinGDI transform is also needed when printing for WinSalGraphicsImpl:: drawPolyLine. Change-Id: I39f89eac0c17e524949221306723a355c6e94a17 Reviewed-on: https://gerrit.libreoffice.org/66190 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> (cherry picked from commit 6e3c4ae8bca898700cde9caaff43c3a8a61eebc2) Reviewed-on: https://gerrit.libreoffice.org/66270 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 5af161ebbe2a0183c1302099c995548d82965fa9) Reviewed-on: https://gerrit.libreoffice.org/66271 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-11Resolves: tdf#122449 crash after dismissing edit index entry dialogCaolán McNamara2-0/+6
Change-Id: I109833e175fce96c12877fefb4b093e518782ce8 Reviewed-on: https://gerrit.libreoffice.org/66039 Tested-by: Jenkins Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit d5c09698b02cc41cba0719d9a2e61690a427b46b) Reviewed-on: https://gerrit.libreoffice.org/66057 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-11Resolves: tdf#122598 avoid crash on macro recording endCaolán McNamara1-12/+8
Change-Id: Ie9f9fc8b4a4a7852a5da37c7d190ca020391012e Reviewed-on: https://gerrit.libreoffice.org/66162 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-11tdf#121978 use round again for Calc function SECOND.Winfried Donkers2-8/+88
Round was inadvertedly replaced by floor in commit 273b3e10eab70ebc084cb62568bd699fddfb376e. Change-Id: Ie0824e228c62509952a11b866638482a409c851d Reviewed-on: https://gerrit.libreoffice.org/65579 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 1692034d53ce28b2c5d1c63ab429232a92b2f861) Reviewed-on: https://gerrit.libreoffice.org/66095 Tested-by: Eike Rathke <erack@redhat.com>
2019-01-11sw_redlinehide: try harder to prevent SetRedlineFlags from messing things upMichael Stahl1-16/+24
Rearrange the code added in 15f1555da8adfa81ea1d4b0d8b694164fddbb2ae to set all layouts to non-hidden before moving redlines in the model. tdf52550-1.doc contains lots of consecutive delete redlines that when exported to ODF trigger asserts about wrong start nodes in CheckParaRedlineMerge(). Change-Id: I89c3d4fefd26691a9632807b9899138eee895fff Reviewed-on: https://gerrit.libreoffice.org/65965 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit b15f1ed2a1df45a57b587ac90efa90c1c18866fc) Reviewed-on: https://gerrit.libreoffice.org/65972 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 307a6b4287c0096e1a10d2fdb73b073e9eef7a11) Reviewed-on: https://gerrit.libreoffice.org/66021 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-01-11Resolves: tdf#122611 crash in empty template listCaolán McNamara1-1/+2
Change-Id: Ifab72f21e92382a3072a35447c6387e1fd405e15 Reviewed-on: https://gerrit.libreoffice.org/66104 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-10Resolves: tdf#122597 chart dialog should be modalCaolán McNamara1-0/+1
Change-Id: I66881168fe2c6f3d033f2037e3d1b884bb74bc1a Reviewed-on: https://gerrit.libreoffice.org/66016 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 49e22dbd36fefdb32f929a87a961f821444df96c) Reviewed-on: https://gerrit.libreoffice.org/66056 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-01-10tdf#122452 sw_redlinehide: WW8 import/export sets layout show/hide modeMichael Stahl2-4/+11
... and not SetRedlineFlags(), similar to the way the ODF filter does it. The RTF/DOCX filters don't appear to be able to export the show/hide flag currently, they can only handle the enabled flag. Change-Id: I76bc19292882d7de5c28ea6afe0f81eadbd4a04f Reviewed-on: https://gerrit.libreoffice.org/65966 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 2dda396f4de051cccf3442f17c84bf2ff5d1db1d) Reviewed-on: https://gerrit.libreoffice.org/65973 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit b4d942fce7e6764cd354517140e0249cb7382dd3) Reviewed-on: https://gerrit.libreoffice.org/66020 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-01-08bump product version to 6.2.0.2.0+Christian Lohmaier1-1/+1
Change-Id: I596e6cf1beaf17a801e65f832b67c7067c17495e
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-25 00:48:45 +0000