summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-08-02Use LibreOffice Vanilla in more placesdistro/collabora/lov-5.1Tor Lillqvist3-13/+16
Change-Id: I07aefbdf6c6c7290b1c7c347f11dc76964bb2488
2016-08-02OSX issues with space in product nameAndras Timar2-3/+4
(cherry picked from commit 79f3a7bfefb8decd2d18df21d799f2d9241a44c3) Change-Id: I0155372c8e5cd0eb91bfbea304190502cbf32e3c (cherry picked from commit dba11c86ac4bda84e2989a0463cea7d61e5a8e10)
2016-08-02This is LibreOffice VanillaTor Lillqvist1-1/+1
Change-Id: Ifad72bb38e183034f42c32780e17996610a8af2d
2016-08-02Bump version to 5.1.5.3Tor Lillqvist1-1/+1
Change-Id: Ic375e08a9ae16ed77c17df83655a32304ca5d528
2016-08-02update creditsChristian Lohmaier1-1287/+1314
Change-Id: I9679f7b0693ecc380d756b18025b09225afd414c (cherry picked from commit ce3577056dd44d35b38894b7ec573951208209eb) (cherry picked from commit b80a85b160126c758e210b7243047b83705b1efd) (cherry picked from commit 027db54f6d3d96c0ca609f990898d55c1a8bd0b7)
2016-08-02tdf#101138 opengl: blacklist intel drivers for Win 7Tomaž Vajngerl1-0/+3
Change-Id: I1b3db15b2fbdd948dcc9bacf7891f8429f066150 Reviewed-on: https://gerrit.libreoffice.org/27548 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: László Németh <nemeth@numbertext.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org> (cherry picked from commit 413ad2e9e9e64cb8b2bf74ab4f022fefc6963a6a)
2016-08-02No need for own implementation of erfc() in OpenCLTor Lillqvist3-192/+1
The own code was copied from the C++ one we used to have in sal/rtl/math.cxx but which was removed in a62bc6a65abb47adb0e4caff7e38823c15b302fc. However, it did not work correctly on some machines at least, like my AMD A10-7800 running Windows 10. I was unable to figure out why not. This lead to OpenCL being disabled by the Desktop::CheckOpenCLCompute() code we now run early on startup. Anyway, as OpenCL has erfc(), just use that. (cherry picked from commit 4afa88f289de1150850b52d36f2345fd9a9fbc1e) Change-Id: I7ef7d493fe60c695b2dad528fe0be6ebf0e8a79e Reviewed-on: https://gerrit.libreoffice.org/27543 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 2d5dfb05c0a6707c5823824d91e91a5761e98ecf)
2016-08-02Resolves: tdf#59896 ww6 plcf generation reversed checkCaolán McNamara3-2/+11
regression since... commit 69e040a59e1c6497b606da8a27e8f605edd041bb Author: Caolán McNamara <caolanm@redhat.com> Date: Sun Jul 17 00:19:00 2011 +0100 check seeks, check available size, pointers to ref (cherry picked from commit 99833c2d6c9882bfad17e3e7fb659f5a81184a3f) Change-Id: Idfcde46959e5693d200a91a619e7196f00f40ca0 Reviewed-on: https://gerrit.libreoffice.org/27431 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit dc436f0bc7e0cbfb27107a4e80eed5c60a2646da)
2016-08-02Resolves: tdf#101096 remove the "H after M" ruleEike Rathke1-3/+7
wrongly introduced with c9ed6e832213129cc579c1c309ce9dbd3593c57a Change-Id: Ic6c9c404ad0af11eb5d638f453150ee0da60e633 (cherry picked from commit c6e7dbaaa471861dcf76186ed3978ac95f81256e) Reviewed-on: https://gerrit.libreoffice.org/27529 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org> (cherry picked from commit 7409b12200121a5be4f6ae66d3bd575904de3770)
2016-08-02Related: tdf#101057 allow java update version number > 99Caolán McNamara1-3/+3
Change-Id: Icc37cf248fbf35f108eb5bbb25c36fbd54a9fe85 (cherry picked from commit 64d3270a89fd88d4d0cf70329af2c66f722fd95e) Reviewed-on: https://gerrit.libreoffice.org/27426 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 16d60f0632ea16ac5ad8dae2a3781195fef50d9d)
2016-08-02Resolves: tdf#101054 crash on options->path with non-native file pickerCaolán McNamara1-1/+0
regression from... commit 3bbc0574d78d129359638b74612de2f93419eeb0 Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Jul 5 10:16:51 2016 +0100 Resolves: rhbz#1352835 path options doesn't promptly destroy folder picker only clear the xFolderPicker immediately in the non-async case Change-Id: Id6a411424d41262a9379ad3eb7976c8dd666a5cf (cherry picked from commit c1bd3156cf66318023f36d81ce809a38072588e4) Reviewed-on: https://gerrit.libreoffice.org/27420 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit ce43440dd910c2ff27e95db3009752cfb2b608e3)
2016-08-02Need to try to avoid TDR also with NVIDIA cards on Windows 7 or earlierLaszlo Nemeth3-6/+38
(TDR is Timeout detection and recovery, was introduced in Vista.) Change-Id: If88f8e9e2aff2a5ffd633607ee6aebb5614c5caf Reviewed-on: https://gerrit.libreoffice.org/27523 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit cb309928872735c577d2b59fe9dd8690424410b5)
2016-08-02Resolves: tdf#100847 also external svEmptyCell is 0 in numeric contextEike Rathke1-1/+1
Regression of 243f19a1878d52a4074b59041dc3bc57ab84e417 that now differentiates between numeric and string content of external references' cells. Change-Id: I7a9635357cc7651353067a38f9ac8bc295f88546 (cherry picked from commit 89a5464a21046821648ec77f03db8316ceb4e6f8) Reviewed-on: https://gerrit.libreoffice.org/27111 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9c30e2aab23e34ba91dbe80b7dd5e5c352bbaeb0) Reviewed-on: https://gerrit.libreoffice.org/27373 (cherry picked from commit 11535b80816d131963eb8f916ba1791816513664)
2016-08-02Resolves: tdf#98778 fix parsing of exponentsCaolán McNamara1-0/+7
regression from... commit 9e9f39d171cafa035d7b8e74187e25c3581cb89d Date: Tue Mar 19 23:23:16 2013 +0100 resolved rhbz#919020 Basic CDbl() and CSng() scan localized number Change-Id: I96535fd9bc9ec59d6e07739a3118c96eb2d8bd05 Reviewed-on: https://gerrit.libreoffice.org/27342 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 2aed0d49d7891b9360916b65771222810aeeac96) Reviewed-on: https://gerrit.libreoffice.org/27350 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 43d1f9bfd4300e8bf5bcb631dcc2d849b4490d3a) Reviewed-on: https://gerrit.libreoffice.org/27351 (cherry picked from commit a6649901d3e01b3751b3e1660ac29b2248bf3c25)
2016-08-02Resolves: tdf#100764 check row when determining bounds for deleted rangeEike Rathke1-2/+8
Regression introduced with a2e591e26549294cdb07eb685d4069343404d898 for tdf#86502 Change-Id: I493c458faedccfd6e2ddf849073a52661ef2e4d0 (cherry picked from commit ab1b351840160655a9f0caedbb35e9fdf203c5a0) Reviewed-on: https://gerrit.libreoffice.org/27248 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 10b1fb083b3f66fb4099f84e94a1b4cd52ed1b06)
2016-08-02protect against empty m_aTableManagers stackCaolán McNamara3-10/+19
Change-Id: I29fecc5e0efb3b3d907f0c6505d42818fa464ffc (cherry picked from commit 9d76d9d9abb08788f2882612cfe6d0df6e19af39) Reviewed-on: https://gerrit.libreoffice.org/27281 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 808d72592aa6e9a9f9a8eddd4dada0fa9f14749c) Reviewed-on: https://gerrit.libreoffice.org/27320 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f80bcfb2907bb4c2999280c8d1be060292122659)
2016-08-02update creditsChristian Lohmaier1-1083/+1110
Change-Id: Ie49cfb83d86e85b593958fc4048022f71c351267 (cherry picked from commit bd894e5a7b9a9d6a3d3e4ea668bfea050ef39bae) (cherry picked from commit 8a22eab3b59d7188bf40f0fa3b25c2893cd06f85) (cherry picked from commit 1c99d62187b73828b5e5a2b8e504dfe6d4150cbd)
2016-08-02update creditsChristian Lohmaier1-581/+581
Change-Id: I6d1fbba2231faaf3ef64564705cf5b1fbcc8433a (cherry picked from commit 1c54cbf5bd811423ddfc29bea321510a1533d7d9) (cherry picked from commit 7ca5da3ccbde26aa66f917f47bae8ce890c122c6)
2016-08-02tdf#100883 - opencl impls. that use SEH are still bad.Michael Meeks4-1/+20
Amazingly we fell-back to the old calculation path for crashes in older LibreOffices. Change-Id: Ia182f7a25c5560b68494d5cdd68e02925bfd5845 Reviewed-on: https://gerrit.libreoffice.org/27164 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 2b1f1030bf642d1b9c8af91aa78683a9fb95e6f4)
2016-08-02Resolves: rhbz#1352835 path options doesn't promptly destroy folder pickerCaolán McNamara1-12/+9
(cherry picked from commit 3bbc0574d78d129359638b74612de2f93419eeb0) Change-Id: I5133f63fd92f384221fa2812c6e2a0e7f3b37ac1 Reviewed-on: https://gerrit.libreoffice.org/26942 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit bab5387447d2ea386b49367fe373b124a57c5ce6)
2016-08-02Resolves: tdf#88396 switching to sidebar panel will toggle it *off*...Caolán McNamara6-14/+62
if its already visible. This solves tdf#88396, but I did this fix originally for.... on switching to slide layouts panel move into slide layout context i.e. exit current textbox edit and shape selection (cherry picked from commit 05aaef55252bc9f90cbbcc1967c38ab9a5a6c798) OpenThenSwitchToDeck actually *toggles* deck visibility so rename it to that and add a OpenThenSwitchToDeck that actually does that, using the Toggle varient as the callback from the sidebar button which toggles the current deck on/off which retains the features of // tdf#67627 Clicking a second time on a Deck icon will close the Deck // tdf#88241 Summoning an undocked sidebar a second time should close sidebar but means that calls to OpenThenSwitchToDeck from e.g. slide layout don't auto close it if that deck is already open (cherry picked from commit b81daea4a78083def286fa2d5360b152b7a703fd) 3e3724626b93447a7ab6bc7032e9c6839dabcf55 Change-Id: I16a2fca158cb4caab7b6bd001742df698735dd2b Reviewed-on: https://gerrit.libreoffice.org/27071 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit e1e61bf5e5f368fc1ea579f8ae5eec9faafbd599)
2016-08-02tdf#99090 docx export page-break only inside a paragraphJustin Luth2-1/+19
If a paragraph hadn't been started yet, a w:r was being written directly in the /document/body which caused MSWord to complain about a corrupt document. Reviewed-on: https://gerrit.libreoffice.org/26771 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 07fb94655f4745eb4e80bf6e8d4cdd95371f23bb) Change-Id: Ie7f629869aab0f3d2405660a033c3f23bbd6baca Reviewed-on: https://gerrit.libreoffice.org/27121 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 28ded9c98837d6b6eefff73f396353b61b6b4017)
2016-08-02Resolves: rhbz#1349501 gtk3: smooth scrolling events can be disabled...Caolán McNamara3-42/+75
by the user with GDK_CORE_DEVICE_EVENTS=1, and so manage to disable their wheel scrolling (cherry picked from commit 7dfd50f947671d79b9119f10259857700d5728d8) Change-Id: I7df63f738983c90dea75b9f43a36133910446aba Resolves: rhbz#1349501 gtk3: smooth scrolling events can be disabled... better fix, if we listen to the eventbox we get either SMOOTH scrolling or not smooth events, not both. We get SMOOTH when supported, and not if not supported so no need to reintroduce the miserable hack, which doesn't work under wayland anyway Change-Id: I993e71d3553322425a506cd93d812efe081bf3c9 (cherry picked from commit 053a843bccaef2d2323be3ddff6217c592a4c5db) Reviewed-on: https://gerrit.libreoffice.org/26646 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit bda6bce91555861f604a74b8f3d6cc6cd35c11c4)
2016-08-02Resolves: tdf#100813 crash during pagination of particular docxCaolán McNamara1-0/+3
Change-Id: Id2c99cc6c5fe4c3a5bcf3c0b3f16b603cdd46239 (cherry picked from commit f374e01af32c7752b31455642e7d76f2056a2aeb) Reviewed-on: https://gerrit.libreoffice.org/27051 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit f2dcce9155ddd9444f65b26c59c3b873ac603091)
2016-08-02loplugin:staticcallStephan Bergmann1-4/+4
Change-Id: I800eef0517f063ff7e08a95de9da268fb0e9d621 Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/27160 (cherry picked from commit a405a164357d86630d8fbd0386e07f53c5b6c9a1)
2016-08-02desktop: validate OpenCL drivers before use.Michael Meeks14-21/+215
OpenCL validation needs to happen before drivers are used in anger. This should isolate any crashes, and/or mis-behavior to We use app version, CL driver version and file time-stamp to trigger re-testing the device. If anything fails: hard disable OpenCL. We use an opencl validation sheet (cl-test.ods) and install it. It is a minimal CL set - it requires a very short formula group length, and combines several CL functions into few formulae to test more. The sheet structure, in particular the manual squaring / SQRT is necessary to stick within the default CL subset, and ensure that formulae are CL enabled from the root of the dependency tree up. Reviewed-on: https://gerrit.libreoffice.org/27131 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit c44726c48228d9c6a5960e302b1c0bd16b0099c4) + opencl: bail out early in missing OpenCL case. (cherry picked from commit 605a5dc088385ad21c33028d8107125c0316ddb1) + Remove bogus dependency from opencl to configmgr Since f41eb66302208f384a475fb20c98b6d1b0676cb6 "opencl: OpenCLZone, detect CL device change and disable CL on crash" vcl links against opencl (so indirectly linked against configmgr), which caused CppunitTest_configmgr_unit to include the configmgr object files both statically (through gb_CppunitTest_use_library_objects) and through the linked-in configmgr dynamic library, which in turn caused ASan builds to report an ODR violation for a doubly defined 'typeinfo name for configmgr::Access'. (cherry picked from commit 9c711f05fa10dc70e4257a1f48d43f539353541a) Change-Id: I18682dbdf9a8ba9c16d52bad4447e9acce97f0a3 Reviewed-on: https://gerrit.libreoffice.org/27146 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 9befbe1f81a7930e167e0a711666b0779898c12e)
2016-08-02opencl: OpenCLZone, detect CL device change and disable CL on crashTomaž Vajngerl12-53/+214
Guard OpenCL calls with OpenCLZone, so if a OpenCL call crashes we detect this and disable OpenCL so next time the user doesn't encounter the crash at the same calculation because he has a broken OpenCL drivers. Similar has been implemented for OpenGL with good results. Additionaly we persistently remember a known good OpenCL device ID and driver version so we can match this and perform calculation tests when they change. This is to ensure that the selected OpenCL device performs as we expect. In this commit the calculation tests aren't included yet. Remove complex static initializer in opencl wrapper library. Reviewed-on: https://gerrit.libreoffice.org/27064 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit f41eb66302208f384a475fb20c98b6d1b0676cb6) Change-Id: I1a8b81ee31298731efcf63dc6a476955afc035e9 Reviewed-on: https://gerrit.libreoffice.org/27103 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit e1ef22371613f384cc2f6fc75d022cb01bf92af7)
2016-08-02rhbz#1351292 correctly set edit modeDavid Tardon1-17/+40
... when switching between different shells, e.g., from Outline to Slide master. Change-Id: I22ef6f6cac73c52fb1bedd97e653b4b57c5a7a24 (cherry picked from commit b0535f3944975c1f6cdadc149d70502843331f86) Reviewed-on: https://gerrit.libreoffice.org/27110 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 570ad81bcbc56b1d20378c6342c27458fcee430c)
2016-08-02Resolves: tdf#100463 tolerence in contour editor doesn't workCaolán McNamara1-18/+18
probably since commit f51f03a46102333bac6a7fe06bc8538492f413a5 Author: Stephan Bergmann <sbergman@redhat.com> Date: Wed Mar 5 12:24:14 2014 +0100 Do not needlessly truncate MinMax argument before comparison with bounds Change-Id: I5c92f0af3e05ad68ed88fa860b36e8426e160bf9 (cherry picked from commit d5bd18ecac5806b7b4e39a1919b6b56df0f94ce3) Reviewed-on: https://gerrit.libreoffice.org/27102 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 95024423f38a5050f614e2d14837eebdbc348a4a)
2016-08-02tdf#99512 - opencl - restrict scope of vlookup optimization to doubles.Michael Meeks1-1/+30
Change-Id: Iab7316cb167f34c13adafe142af0fdd73eb7d04c Reviewed-on: https://gerrit.libreoffice.org/27100 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit dead5dc1ae3baab5e25d641322d138dd3d242bff) Reviewed-on: https://gerrit.libreoffice.org/27105 Reviewed-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 9613bb90986277f3a222bea9a6d6d11f53a36622)
2016-08-02tdf#100753 propagate error with VAR and STDEV functions.Winfried Donkers1-0/+9
Change-Id: I1b3ece177f5586f5cd64a34d16193d01d4bd5bd9 Reviewed-on: https://gerrit.libreoffice.org/26979 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit b9c9bf666b4eb7ee4568fe155a2c8b50a02c4ad5) Reviewed-on: https://gerrit.libreoffice.org/27061 (cherry picked from commit 88065eebdf9bc557b2c5d982b0beacb19ef2ad36)
2016-08-02Resolves: tdf#100713 on cancel curData points to deleted parents vector entryCaolán McNamara1-6/+8
Change-Id: Ic2f313c357ce9526eb045791e2d27451e52a7572 (cherry picked from commit 17cb84338d6921d012af1e1245f434f90bc25142) Reviewed-on: https://gerrit.libreoffice.org/27041 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit bfbb5906bf85f7e4134d19fbe80216c549185e69)
2016-08-02starmath: Fix missing negationTakeshi Abe1-1/+1
which was a regression from fa614231733800f4a961b77e36c86f8840d12251. Change-Id: Ia7bab72dbd6f82519024809cf6384e1442a02327 Reviewed-on: https://gerrit.libreoffice.org/27033 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 2fcb8022a22b55b6680af57f2b101d56a3d88e36) (cherry picked from commit ccc92a4706c2fa72a17e736cff8fbf70cec2b2f9)
2016-08-02Resolves: rhbz#1353069 don't clear XATTR_FILL* from stylesheet if...Caolán McNamara6-24/+40
the master page is not the sole owner. Which happens when copying and pasting slides which bring along a duplicate master page to an already existing one, and the attempt to remove the duplicate strips the fill properties from the shared stylesheet in use by the other regression from... commit b876bbe2cacce8af379b10d82da6c7e7d229b361 Author: David Tardon <dtardon@redhat.com> Date: Tue Apr 26 09:17:11 2016 +0200 rbhz#1326602 avoid exp. bg bitmaps from deleted slides (cherry picked from commit de4908eb4d2f1f2ce38a37eea18a9efc4a0073b1) Change-Id: I91fb8f622a0e35741ecc37cef14fc93199bb730b Reviewed-on: https://gerrit.libreoffice.org/26976 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit fad4d7877ac8d04ab82e8acd21205f315d6eab1f)
2016-08-02Resolves: tdf#100692 crash in sidebar on deleting image from writerCaolán McNamara1-3/+3
stumbled on this in passing and it has the same bt as http://crashreport.libreoffice.org/stats/signature/vcl::Window::setPosSizePixel(long,long,long,long,PosSizeFlags) Change-Id: I1f19275029b05f353dfa823a2ff435e5045250a6 (cherry picked from commit 675c8faefd8756f7c43312f23eb341797bcbca4d) Reviewed-on: https://gerrit.libreoffice.org/26805 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 34513f90abf15d7b5670fe3732e854d60f7358c5)
2016-08-02tdf#100295 try to cover second place in curl using GetTickCount64Markus Mohrhard1-1/+1
Conflicts: external/curl/ExternalProject_curl.mk Change-Id: I08e51f70c7b0c92a8c1b8b06e7eb2f1437e2f3f4 Reviewed-on: https://gerrit.libreoffice.org/27027 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 6efd6c49003987a58c83bc23d6a3fbb67999ff9e)
2016-08-02cui: add calculation mode to Help->About.Michael Meeks3-1/+22
Reviewed-on: https://gerrit.libreoffice.org/26964 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit adc3932dfc4fe763b7db0af8843b01614bdc6aa2) Change-Id: I4765436bed8a58c5097afcf7dce768d3ec325015 Reviewed-on: https://gerrit.libreoffice.org/27004 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2a93d7221672d4fec38a265780af114d2756dbfc)
2016-08-02Resolves: tdf#100770 crash on loading specific docxCaolán McNamara1-2/+9
use same safeguards as RemoveLastParagraph does Change-Id: I43ed4eb28f44654054fd266bc464840af7014fea (cherry picked from commit 000263f799d4aa9ad21e63f474def55438ce601e) Reviewed-on: https://gerrit.libreoffice.org/26944 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 57144fae2bd2296fe9a842ab87addf9dda5ff91a)
2016-08-02update creditsChristian Lohmaier1-1518/+1568
Change-Id: Id597c51484924f0398bbb30ba419809beb9a96b5 (cherry picked from commit 296c74f61e5534898507529c8ebdd20d6dec73b9) (cherry picked from commit 441b7f75eea20a597da41d71a9d355c3278c304a)
2016-08-02Resolves: tdf#90285 do not reuse the same StartListeningContextEike Rathke1-1/+2
... that after UpdateInsertTab and related may point into broadcasters' ColumnBlockPosition that have been shifted to the next sheet. Change-Id: I6f657021b6102cec427734a8ff3105f0c4309a7a (cherry picked from commit dd7a2c95b86d158be8d0637bdff13b9a0ed9954b) Reviewed-on: https://gerrit.libreoffice.org/26959 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit dff1d0abc3e66277da76c60943ec6bc92c29b14f)
2016-08-02Resolves: tdf#90285 during sheet copying the old sheets retain their old indexCaolán McNamara5-21/+21
at the point that ScDocument::CopyTab calls StartListeners so when void ScColumn::StartListening(sc::StartListeningContext& rCxt... calls rCxt.getBlockPosition(nTab) it calls it with the old nTab index in ScDocument::maTabs, so the return block position is not correct. Here I bubble down the requested ScAddress and use its Tab/Col/Row members rather than trust the members of the indexed-into elements Change-Id: I291e8c1146c2caa4d0976780b1ee6bcc41994e3c Reviewed-on: https://gerrit.libreoffice.org/26552 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 2511e272481172b439d167fd8b09d14c755f223d) Reviewed-on: https://gerrit.libreoffice.org/26958 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit aca8a92b6b78b9d6dbefbcf9784b09675ee8f187)
2016-08-02tdf#98710 check the font is bound, substitute FON fontsTomaž Vajngerl2-0/+14
If we can't bind the font then we can't proceed with rendering and caching of the glyphs. This may avoid the crash but the font won't be drawn. This happens for old Windows 3.1 bitmap fonts in FON format which Direct Write doesn't support. So in addition substitute "Script" and "Roman" FON fonts with "Times New Roman". Reviewed-on: https://gerrit.libreoffice.org/26885 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit b5cd1220b849a9759dd4446032a7e1affbf151f2) Change-Id: I16b480399b47989738a703ad84c0398493f9f4e3 Reviewed-on: https://gerrit.libreoffice.org/26970 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 901bb8527350a81b1631338abedbfd3f77ffbf35)
2016-08-02explicitly disable partial cell shift with change-tracking, tdf#73335 relatedEike Rathke1-0/+20
... in ScDocFunc::InsertCells()/DeleteCells() that can be reached via API but ChangeTrack produces a SC_CAT_NONE action because the partial shift is not handled. UI slots are disabled for this. Change-Id: Ie0f992b05753bb1467d3f7a80263714bfcc1a2d7 (cherry picked from commit 9f8e2065c42f1724ac7a24f1bb0531e8c954698a) Reviewed-on: https://gerrit.libreoffice.org/26923 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 9fb749f520b94d11ebeaf83c1e913dacb742703b)
2016-08-02Resolves: tdf#91995 copying cells to undo doc shallow copied note pointerCaolán McNamara1-0/+4
maybe UpdateCaptionPos isn't needed if we do it this way and deep copy it. surely we have to copy the note here, otherwise it gets deleted by both the source and destination document Change-Id: I6bc885c45b2938d0c775572c48642e67cd1ef5ca Reviewed-on: https://gerrit.libreoffice.org/26913 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 7566851d653ec052e9b7baa98ec2a993328f84e4) Reviewed-on: https://gerrit.libreoffice.org/26940 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7bcd59241495fe474387abb176185d8775aa104c)
2016-08-02tdf#73335 sc: ODF export: ignore ScChangeAction SC_CAT_NONE harderMichael Stahl1-1/+6
ScChangeTrackingExportHelper::WorkWithChangeAction() must not add attributes when it does not export an element. Change-Id: Ia6625b73114ab8bf93c4b7a31b484d11bef2fde9 (cherry picked from commit ed913ce8352dc4ad9f4688180a9b27d02e8f524f) Reviewed-on: https://gerrit.libreoffice.org/26918 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 638a86ec065f43425065d6459fde05bf60c0e575)
2016-08-02Step towards disposing of ScDataFormDlg properlyKatarina Behrens2-3/+9
There were some VclPtrs hiding inside std::vector (twice), so fix that, but the destructor is still not called (getting Window::~Window inconsistency assert). With this patch however the screenshot cppunit test no longer fails Thanks noelgrandin for help Change-Id: I8b46c4608cbab2070e36ef4abec226bcd997425e Reviewed-on: https://gerrit.libreoffice.org/26772 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> (cherry picked from commit ec6956491a0c6553a9fb91f64c6ceb7cd8e8aa52) fix Window::~Window: inconsistency in top window chain leak Change-Id: I4f32b77a4b107e5315e0c2bc9b20db897135c8b0 (cherry picked from commit 937cbdb579820aa1dd0526682df1ea98a34168c5) Reviewed-on: https://gerrit.libreoffice.org/26792 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit aa7f3a3434c60bec0196e763ff56c76a8c9b57ff)
2016-08-02vcl: GTK: fix libstdc++ "irreflexive" assertMichael Stahl1-3/+15
/usr/include/c++/6.1.1/bits/stl_algo.h:4737: Error: comparison doesn't meet irreflexive requirements, assert(!(a < a)). GdkRectangleCoincident is clearly not a less-than operator as required for std::sort. Change-Id: If2e65d420dc8cdf0707081361a40d4eaea28424e (cherry picked from commit e2b267b1906817cc45f0e4896bed58cff5b6b0f9) Reviewed-on: https://gerrit.libreoffice.org/26767 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 92cdfa1cb576cfe5048c17b10208eac71445d3c2)
2016-08-02boost: suppress GCC6 -Wplacement-new=Michael Stahl2-0/+17
function_base.hpp line 308 error: placement new constructing an object of type "boost::..." and size ‘16’ in a region of type ‘char’ and size ‘1’ Change-Id: If905d56bd21dd30a957b50fa3d5eed3a63899d62 Reviewed-on: https://gerrit.libreoffice.org/26769 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0a15048b075a9a610ce7b660dabd3b723d489a6a)
2016-08-02gbuild: recognize newfangled screen TERM=screen.xterm-256colorMichael Stahl1-0/+1
Seems to have changed from Fedora 23, where it was just "screen", to 24. Change-Id: I9078c337093d12d62e9afe10b1f02aaf346d4b43 (cherry picked from commit 4dcba01d97b72db35885c505e647425059740a4c) Reviewed-on: https://gerrit.libreoffice.org/26766 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 1ddc2f93c49660cf651f4faeb1f0f596eab953e2)
2016-08-02tdf#100641 correct OOXML function name is EFFECT instead of EFFECTIVEEike Rathke2-1/+23
(cherry picked from commit ed5bcef57b678cb92c68bf842a72e50f4dd1e2ea) accept EFFECTIVE as EFFECT in OOXML import (cherry picked from commit f3f89f4f3180b0fd63c5290c665894c6a27f2ae2) 18a914972d69a37e9dcf5b18ffbea9177004dad7 Change-Id: Ieb7484afe210e378efd43ba3a181cd90d29619b9 Reviewed-on: https://gerrit.libreoffice.org/26704 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 4c6685a93cc4b82d2a9300f9a4fd64c5c54fb568)
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-20 00:39:17 +0000