summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-03-17Bump version to 5.0-27cp-5.0-27Andras Timar1-1/+1
Change-Id: I469fa93cdcb99196646ee97e19883b75d6eb9dec
2016-03-17sc: Improve documentation, and a cosmetic change.Jan Holesovsky2-14/+12
Change-Id: Id99b963602816710a2c6767795343a9518833b43
2016-03-17sc lok: Extend uno commands: .uno:SelectRow/ColumnPranav Kant5-4/+100
Now also accepts a row/column index with modifier key to do various selection/block selection/negative selection operations Change-Id: Idfb56b94ca2eb4553eb9388b786f5d1e89448ec2 Reviewed-on: https://gerrit.libreoffice.org/23256 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2016-03-17upgrade openssl to 1.0.2gCaolán McNamara8-78/+93
We can't "break symlinks after extracting tarball" because they populate that dir during the build now. So instead cripple mklink.pl to copy instead of link. (Configure no-symlinks simply skips the symlink step instead of copying, so that appears useless) Reviewed-on: https://gerrit.libreoffice.org/21880 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 01798050c13fdfc51aff95967f6b0177d5d7f5bd) Change-Id: Ib30b2c1b8b3de72511d09c478297a7a5a4bc691e Reviewed-on: https://gerrit.libreoffice.org/23002 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 1acbba539c0736a3c2fa54195c75f60c2752fac3)
2016-03-17tdf#98052 - even polygons were not drawn on the alpha deviceMarco Cecchetti1-0/+2
Change-Id: I5725ec23869b295c8021bef0330ee6f69f206351 Reviewed-on: https://gerrit.libreoffice.org/23025 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 778d0154755b4c2b35041a1a7ab58a48c9e0de13)
2016-03-17fix nss build when targeting windows XP (using 7.1A SDK)Christian Lohmaier2-0/+11
otherwise build fails because of macro redefinitions warnings (that are now fatal because of warnings=errors) (cherry picked from commit 09e201fcf2813152335d50588dae0c38adc88d51) Change-Id: I0a15083d9ffd032c48ab491695319309f3053fb7 Reviewed-on: https://gerrit.libreoffice.org/23272 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 74c4ae75c06068f8c208973636825603ca49a00e)
2016-03-17tdf#97139: prevent loop while formatting small text linesOliver Specht1-1/+5
when text is inserted at the end of a line then text formatting starts some characters (platform and ENABLE_GRAPHITE dependent) before the insert position. In case of small lines this might even be the start of the line. To prevent going back to the previous line the cursor right margin flag needs to be reset. Change-Id: I73a62ce6c7707469fddeeffe0d7eec064c5989ea Reviewed-on: https://gerrit.libreoffice.org/22641 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de> Reviewed-on: https://gerrit.libreoffice.org/22667 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 40a304eb1f47f27e1a5c2ebda06a0726f22c36e3)
2016-03-17tdf#98416 fix curl's configure check for nss (missing -lnssutil3)Christian Lohmaier2-0/+18
without -lnssutil3, the configure check for nss fails when using internal nss: configure:24028: checking for SSL_VersionRangeSet in -lnss3 […] …/UnpackedTarball/nss/dist/out/lib/libnss3.so: undefined reference to `NSSUTIL_ArgParseModuleSpecEx@NSSUTIL_3.21' causing curl to build without ssl support: SSL support: no (--with-{ssl,gnutls,nss,polarssl,cyassl,axtls,winssl,darwinssl} ) This makes gdrive and other remote file methods fail Change-Id: I098feb10a760c2f80a474d9205d6f1e403477efd (cherry picked from commit 98d48dad9e807a4a40f4c3d1b5280d9e5156cb18) Reviewed-on: https://gerrit.libreoffice.org/23191 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit bfe6eaae2c4e45e830db1e9f1710d251f86fb2a3)
2016-03-17Resolves: tdf#93196 add RecursionCounter guard also to InterpretFormulaGroup()Eike Rathke1-19/+29
... same as for ScFormulaCell::InterpretTail() Change-Id: I444f259fe4e86ed0638a04f1b5d9272edd182e2e (cherry picked from commit 29ee431c1cf859c3d5a5041cff5cb04b89db27a0) Reviewed-on: https://gerrit.libreoffice.org/23280 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 b14cc2f16d00c103cf415a54e163d54764d0a86b)
2016-03-17update creditsChristian Lohmaier1-1348/+1418
Change-Id: I7ea667687d4a11c026d69382d9e62533bc0db4ea (cherry picked from commit b4d9ba8aa9c63c5e527bf640f136c77990eb6747) (cherry picked from commit 96a3261aae5c38cbb303a7c63a7631f13be898a3)
2016-03-17Resolves: tdf#94392 huge negative Y causes length exceptionCaolán McNamara1-1/+8
because this rendering stuff is deleted in later versions of LibreOffice and replaced with cairo rendering, just bodge this case to give up and go home. Change-Id: I4e60184b0919dc719edfe223ebb2d8ef684608e8 Reviewed-on: https://gerrit.libreoffice.org/23154 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 93772371096b4caf542146e673a44d8d346a09ab)
2016-03-17Resolves: tdf#82781 avoid dereferencing invalid iteratorsCaolán McNamara1-4/+9
when using print preview with cursor on 2nd page which consists solely of hidden text with show hiddle text enabled. inner mrParentViewShell.Paint can invalidate iterators, as later detected with the mbNewLayoutDuringPaint flag but we dereference for the purposes of drawing the shadow before we get there. easiest thing seems to be to just grab the bits of info we want before the inner paint occurs. (cherry picked from commit 4eb5f363ed9a3181a817f12d5ec49eede13b9c9c) Change-Id: I09c9b06449db440b7beba7de9e71c239ee64f6ca Reviewed-on: https://gerrit.libreoffice.org/23094 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 416843f69cf62d2f01e2a25f03bda0fdec949cb8)
2016-03-17enable build with gcc 6Caolán McNamara1-3/+3
Change-Id: I391550d243ae7f773d988cb36f45c482d0c97145 Reviewed-on: https://gerrit.libreoffice.org/23153 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 7b56d707440eec27c785368c65feb341048c4b5a)
2016-03-17recurse protection for XFConvertCaolán McNamara9-14/+25
Change-Id: Ib6008d4b07159acad26c7baeb775702119c12e3b (cherry picked from commit 9e0004f2cc64ffa23ecd5c7c82016624eb8a5a20) Reviewed-on: https://gerrit.libreoffice.org/23259 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 8978c75cb0fdb1a5cddbe25545f0455074afecf6)
2016-03-17tdf#94370: Make previews of master pages finally appearKatarina Behrens1-0/+1
Just force the whole ValueSet to be formatted. Individual rectangles are already being invalidated (when PREVIEW_CHANGED event comes), but something naughty must be happening in ValueSet that those changes don't show. Change-Id: I4fd8af36e34c3a445d7b16b59e45256f016fd9df Reviewed-on: https://gerrit.libreoffice.org/23115 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 1b98d7a3c4f1de39226e44e5b27351d8bfbbe6c0) Reviewed-on: https://gerrit.libreoffice.org/23116 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 819166500c1b45e4241fdb47f2de6653e4495372) Reviewed-on: https://gerrit.libreoffice.org/23253 (cherry picked from commit 71f4f7fc85fbc872cd480613e95530f122f530f8)
2016-03-17tdf#98083: Always save cell formatKatarina Behrens5-13/+44
it was pretty bad idea not to save it for rich-formatted cells (tdf#92296) as there is more to cell format than just a font Due to a bug in xpath helper I'm backporting only part of the test (cherry picked from commit 7945cdf0ea570302a04550540848c03c0cd030ab) Change-Id: I0e5e7d7187c69519bb8f4de2b627e385fccd3d46 Reviewed-on: https://gerrit.libreoffice.org/23033 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 5340dc6d735af1eca04b685f1be466a9ed979980)
2016-03-17Resolves: tdf#95428 backspace in readonly macro editor hangsCaolán McNamara1-4/+3
Change-Id: I16568b00e92d18f32818188ba3ab8df92bbd13aa (cherry picked from commit 5b3f84cec471ddbde98a46220096cdb952bb1935) Reviewed-on: https://gerrit.libreoffice.org/23088 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 5c81d2d556a4e3b24440b4f917e0d0b720a0d719)
2016-03-17treat ExtMargins with same recurse protection as MarginsCaolán McNamara3-5/+16
(cherry picked from commit bcecf9b13b7eee0e7c60a6827a310f8b38d13f69) Change-Id: I24640971ea6ca89878043966293492a991f01008 Reviewed-on: https://gerrit.libreoffice.org/23146 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 8ff93a55256e96e1903bfc69b439238d43cabd26)
2016-03-17tdf#96687 - force validation after External InputJustin Luth1-0/+1
After external input (EndExtTextInput), the selection was marked as invalid, but bFormatted remained true, so all the functions that re-evaluated and marked the portion as valid again were skipped and therefore the invalid portion was not painted. Change-Id: Ibb2208bdaeb8ed17a4a34fa378a2fc750abf1b07 Reviewed-on: https://gerrit.libreoffice.org/20986 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 5a217ada5e28e17f052ebec8e53dce05c2aa9cae) Reviewed-on: https://gerrit.libreoffice.org/23190 Tested-by: Justin Luth <justin_luth@sil.org> (cherry picked from commit b170aa84afbbb6c984d739aed15846c2269be9ff)
2016-03-17fix for 10 sec hang with audio-only formats with gstreamer1Caolán McNamara1-1/+2
just do the same as we did for gstreamer 0.10 and set the size found condition once we get the message even if there is no size Change-Id: I826d76dd1097432e5bd33d4acc1a187b8e5068da (cherry picked from commit 702790258c6b3ec05ce04f7c2839a48776381535) Reviewed-on: https://gerrit.libreoffice.org/23119 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 0a48ffb81c62f804d5c9d7f2dd1332385849d7ee)
2016-03-17Revert "fix memory leak in headless backend"Andras Timar1-5/+1
This reverts commit 4b49f9178fdf98ead95d279ac5bb1f1e0a0fbf73.
2016-03-16sc lok bccu#1519: Broadcast cell size changes, they affect the document size.Jan Holesovsky1-0/+3
Change-Id: Icd42c0252c28a24ac9c6c535a146a2f3b3beda17
2016-03-15fix memory leak in headless backendMarkus Mohrhard1-1/+5
Reviewed-on: https://gerrit.libreoffice.org/23248 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit c62afab9d4138583eb22afe46608b323f902f095) Change-Id: I90282c86b45845fc35b23b275301be24a2f18a4d
2016-03-11lok: Avoid dereferencing nullptr.Jan Holesovsky1-10/+12
Change-Id: I40a53cf08e2a789299cd7a05d531b4f920653989
2016-03-10sc lok: Add forgotten file.Jan Holesovsky1-0/+62
Change-Id: I4ef732cb941e0aac6e96cabb2c3305dbe56d3017
2016-03-10sc lok: Don't interact with the user during .uno:SortAscending or Descending.Jan Holesovsky4-2/+197
Change-Id: Ib3679413ba59e86438dac83abfa9b624e291e5a9
2016-03-10nss: upgrade to release 3.22.2 fixing CVE-2016-1950Michael Stahl1-1/+1
Reviewed-on: https://gerrit.libreoffice.org/23070 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 4d77c8088b52c649e80c12e208131a6844a53b12) Change-Id: Idc89778b488f2c84e5b0d495d2f44e623cc542b5 Reviewed-on: https://gerrit.libreoffice.org/23104 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 7864fe9f7c83c865d1dc8e27ae652d2c89673f68)
2016-03-10nss: Fix pointer truncation from 'char *' to 'long'David Ostrovsky1-0/+11
Change-Id: Ie1659c62cbf77f8b685fdf7d79cd62336fa99005 Reviewed-on: https://gerrit.libreoffice.org/22916 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit 59907b36008010d87cc31b1f8ab581d5e4ac1c0b) Reviewed-on: https://gerrit.libreoffice.org/23103 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5e4f1ab7c0450000f46d2c21639e69b96c38b1f0)
2016-03-10Bump nss to 3.22.1 and nspr to 4.12David Ostrovsky6-25/+53
It seems like nss has activated -Werror, even though the code is not warning free: [1]. This applies also to the additional patches that would need to be patched to be a warning free patch, endless recursion. To avoid messing around with something like that: [2], we disable -Werror option for now. Also note, that [2] doesn't fix all warnings, but only part of them so that we let with unsolved non-trivially to fix warnings on different supported compilers if we would choose the warning-free-compilation-path. [1] https://groups.google.com/d/topic/mozilla.dev.tech.crypto/TgnF3tIMxJ0/discussion [2] https://git.fedorahosted.org/cgit/nss-pem.git/commit/?id=ec2b9a90623b1ec5adb6ebe8d6651b35854786ec Reviewed-on: https://gerrit.libreoffice.org/22650 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org> (cherry picked from commit 486c91147c587febdacf3fa95d56633dbd703d5f) Change-Id: I762c03acede6c4eac715d3b0589061eeabbcc7c2 Reviewed-on: https://gerrit.libreoffice.org/23102 Reviewed-by: David Ostrovsky <david@ostrovsky.org> 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 8e6ee22f2bffecff9d85058c6c21312585c6f1cc)
2016-03-10external/nss: -fsanitize=nonnull-attributeStephan Bergmann1-0/+11
Change-Id: Ic3a20f56250d99a347df5deaf785800a2f96e470 (cherry picked from commit 8d2ac08383f894f428da63f4653d0cbd6649e0db) Reviewed-on: https://gerrit.libreoffice.org/23101 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit b99a91b790eedbfddb1ee93c183adb6d2405285e)
2016-03-10tdf#87034 RTF import: fix multiple superscripts after footnote ...Miklos Vajna4-6/+21
... in the same paragraph. The intention was to avoid replaying the supertext buffer and using its contents as a custom footnote mark at the same time. However, it's enough to check if the buffer is empty to do so, and that avoids the mis-import of the bugdoc as well. (cherry picked from commit 93faf178195ca974747849879266783884ae27c5) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I1e3b0c7f0c6d8eb8250d8b1d0d7d196039c40e79 Reviewed-on: https://gerrit.libreoffice.org/23084 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 05ab13e44ab45953c4d4d18d8c9070698c041969)
2016-03-10Resolves: tdf#95226 second case, stack error count in JumpMatrix contextEike Rathke1-0/+14
For the early bail out on errors to work correctly and not prematurely end calculations the current error function needs to be stacked in JumpMatrix context, otherwise we may end up with ((nErrorFunction=74)>=(nErrorFunctionCount=2)) or some such.. (cherry picked from commit 62b40429946c0e5021912072dc79a60fc11fce06) Change-Id: I3559e15180694961585db92f6aa98a46430ae372 Reviewed-on: https://gerrit.libreoffice.org/23091 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 070fbda4edafb27c91c856039880099014f2b53f)
2016-03-10avoid infinite regress in busted documentsCaolán McNamara8-17/+28
Change-Id: I639617e41cd9a9a51a3dd3efa32ac1cf2991b9d2 (cherry picked from commit f16ceae46dd8f3974a379c6fb07feaffb8012b25) Reviewed-on: https://gerrit.libreoffice.org/23031 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 69e4ce0716f7998dbeab954a43b912e72f0f4947)
2016-03-10tdf#97942 Return Ctrl+Shift+Space to the keyword customizeYousuf Philips1-0/+2
Change-Id: I4a886a9312a4b4afbe2451b88941b72dc5c6dadc Reviewed-on: https://gerrit.libreoffice.org/22621 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit f6f66bd6a102239f3d24c257298dc1f6c2fd8199) Reviewed-on: https://gerrit.libreoffice.org/22671 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a0dcfdf37c14f16fe88ed9c0c9f096e2cea1fc03)
2016-03-10Resolves: tdf#98297 exclude error values from COUNT in array/matrixEike Rathke3-9/+25
Backport of b2f5336b08b5f638f890a626eb2aeefaf499a79b Change-Id: I04ef53b8880243b3548e1b7fd926690dcb4a2137 Reviewed-on: https://gerrit.libreoffice.org/22846 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 84f8fa501ac772b40639d7b6e95ebeb752b01bf5)
2016-03-10Resolves: tdf#98389 check memory requirement of matrixEike Rathke4-113/+268
Attachment 123203 of tdf#98389 has external references of the form [1]Data!$1:$1048576 which effectively address the entire cell range of sheet Data and allocating a matrix for a billion cells attempted to allocate 8GB+xGB of memory which the system said no-no ... Some brave soul along the road once decided that a check on the number of elements wasn't needed anymore and dared to remove it during refactoring.. This change reintroduces the check and adds it also to other places that try to instanciate or resize a matrix. When allocation of a matrix for an external range reference fails it is checked whether the request is for such nasty entire rows or entire columns ranges and if so tries to shrink the range to the actual data area used, which at least in this case helps and works. Additionally it fixes a long standing bug in the cached area to array mapping which caused the cache to not be hit but instead the matrix was aquired over and over again for the same range, causing a serious performance bottle neck specifically for VLOOKUP and related functions where the same external range is used in a lot of cells. (cherry picked from commit 9e60bbdb3aa5f80ca80c9c4fdf7accd12c4a5d1c) Change in convertToTokenArray() backported to older code flow. disable means Enable(false), not true.. tdf#98389 related EnableAdjustHeight(true) lead to the side effect that when clearing the range of a pivot table during import, formulas in the same rows were recalculated with then empty data. Through xSheetOp->clearContents() in PivotTable::finalizeImport() of sc/source/filter/oox/pivottablebuffer.cxx In the case of the bugdoc attached to tdf#98389 that lead to all VLOOKUP() calls resulting in #N/A errors because an empty string was looked up. (cherry picked from commit 088ba465d6bb0931c7034d564a3077e21078cb13) e629ce871d255cc871671165c4da974f21041cec Backported to ScMatrix implementation of 5-0. setCellRangeData: check matrix size before operating, tdf#98389 follow-up Now that we can have the one element error matrix we can't blindly call ExecuteOperation() on it that would access elements out of bounds. (cherry picked from commit 9cae3a88587deaf22ee83b2e36487013a1220a3b) Backported to older code flow. b6e5525f685c9324235f128a943dd716ea7a3fca Change-Id: I35f67b48e665bf1cc8d672325c32b889f2e05c57 Reviewed-on: https://gerrit.libreoffice.org/23003 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 23510e0c61dc92eed37129070d2a2b349b43d686)
2016-03-10basic: tdf#87530 if a new password is set, must set mbLoadedSource flagMichael Stahl1-0/+10
... so that the library is stored (and encrypted), and not copied unencrypted from source storage. Change-Id: I9546087ec6f07007aa1ec377d2e959f2bae99a38 (cherry picked from commit 6a351c5cf91d0f667168d834ba2eb5c04121c7d5) Reviewed-on: https://gerrit.libreoffice.org/23043 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 2317420ecee0bf2f01f1555fdaaa56dc9fd6a9c8)
2016-03-10basic: tdf#87530 don't copy storage that doesn't existMichael Stahl2-2/+101
If the Basic library is newly created it may not have been stored to the document storage yet. (regression from 5246fa262450f686674850c53df666422f441c86) (cherry picked from commit aeb43916366b293935314efe9454c66b4877b9d1) tdf#87530 finish the regression test Need to store the document twice to actually reproduce the bug. (cherry picked from commit 7faecc70c286c0e1a3068b77ccde771640928b37) Change-Id: I9c2fc1d7446795b9c1c2224671118b2a671dcad8 Reviewed-on: https://gerrit.libreoffice.org/23042 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit b3f2b2529dc4ed313f423d29551577b6dfed4258)
2016-03-10upgrade neon to 0.30.1Caolán McNamara3-48/+7
Reviewed-on: https://gerrit.libreoffice.org/22977 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 1827987fd11cd726005977e49d001283033f0419) Change-Id: If84ce83cdbde530f7a6743c93ae210b030a41c30 Reviewed-on: https://gerrit.libreoffice.org/23001 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e6a8fb33a948adf367baca31d54e1eb2f3ff0dc4)
2016-03-10Refresh graphite2.win64.patch.1 to apply using sle11 patch binary.Tomáš Chvátal1-12/+12
Reviewed-on: https://gerrit.libreoffice.org/20882 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 817192b3f55be0b0a4a6e877a3c1ab95d3a4b4cb) Reviewed-on: https://gerrit.libreoffice.org/22845 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 7530abcfa82393e22b21a0d54ce796caaecdc915) Change-Id: If43ca99631fab5a3a04e7dead9b694cf52944666
2016-03-10Revert "gtktiledviewer needs gtk3 not gtk2"Adolfo Jayme Barrientos1-2/+2
This reverts commit 9d7e6cd14f82ae8bdb39901ac73999f6c9224307. (cherry picked from commit 6c5c81dad60d603dbbbf001cd32772602e7bbe2c)
2016-03-10gtktiledviewer needs gtk3 not gtk2Caolán McNamara1-2/+2
(cherry picked from commit e451b03e8c21ad23cb1abfd6dd68b6d1e8188121) Change-Id: Iede2008139cb570ff65202762e92f6694548a065 Reviewed-on: https://gerrit.libreoffice.org/22983 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 9d7e6cd14f82ae8bdb39901ac73999f6c9224307)
2016-03-10Resolves: tdf#98399 RET_USER_CANCEL is non-zero and returned on cancelCaolán McNamara1-1/+1
Change-Id: Id4231454dfb34cac6ee89d63beb18a83c63a44c1 (cherry picked from commit cd9a5cf4312a2dc0c1ecbf682c67ca08862cdde0) Reviewed-on: https://gerrit.libreoffice.org/22913 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 40e7a2253a72ee490f97a604bcc94d12d0b84fc8)
2016-03-10lwp: fix infinite recurseCaolán McNamara2-1/+2
Change-Id: Ibd17c0f68a9bac92e591fd2c998de45a84b372aa (cherry picked from commit 0c9c5911b6df0226ef5c8d5465fd02a2bb581eb6) Reviewed-on: https://gerrit.libreoffice.org/22976 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 9a618946ececbfb975c6a069b4db407646afb853)
2016-03-10don't use same file in two testsMarkus Mohrhard2-2/+2
Change-Id: I853e5390cf5c3f6fe8ac8e00a876ed021c35a766 Reviewed-on: https://gerrit.libreoffice.org/22954 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/22960 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> (cherry picked from commit a202c48c6ceeb45ce1cdaaba02ff76eaa3077c68)
2016-03-10Fix the import of line joins and caps from EMF filesStephan van den Akker4-7/+82
Backported fix to 5.0. Note that commit 42f771d6e changed from constant values for line joins to an enum, but that only got into the 5.1 branch so have had to use the old constants. Change-Id: I976336d35366b661e402db484820b4dd9a7b0228 Reviewed-on: https://gerrit.libreoffice.org/22821 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/22947 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> Tested-by: Chris Sherlock <chris.sherlock79@gmail.com> (cherry picked from commit 4a17335d608c2954c482734ce4912100cb0e7aff)
2016-03-10Improve the import of pen styles from EMF filesStephan van den Akker3-12/+70
Change-Id: I643c29befeb29b7b1cdd66375f661f4adb0e6cfa Reviewed-on: https://gerrit.libreoffice.org/22638 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 9db34a7712e277389b2041cfbd77a60476d7f7f1) Reviewed-on: https://gerrit.libreoffice.org/22718 Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com> (cherry picked from commit 86b1846bbbd0a7ec84ed9d87fed411910b747765)
2016-03-10tdf#98052 - polypolygons were not drawn on the alpha deviceMarco Cecchetti1-0/+2
In OutputDevice::DrawPolyPolygon when b2dpolygon are used for drawing the source polygon is not drawn on the alpha device. Change-Id: I54f4e5a13469d9844866cea61b074420219b836d Reviewed-on: https://gerrit.libreoffice.org/22893 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 5bdbf99c3ec6e5e0793c52c34ff4f3a17afab107) Reviewed-on: https://gerrit.libreoffice.org/22902 (cherry picked from commit da2f91b5ceef6d7c6a7b833b25a48f12f58643f5)
2016-03-10tdf#95709 adapt clip polygon for transparence groupsArmin Le Grand1-0/+10
For presentation transparence groups are rendered by the canvas using VirtualDevices and Bitmaps. To adapt for then painting the Bitnmap to the canvas the RenderState needs to be adapted to e.g. reflect the already applied scaling. Missing was to adapt a set clip polyPolygon to be synchronized with the new RenderState transformation. Change-Id: If760a8076e016a6dcf306db71971f1fd2fef7017 Reviewed-on: https://gerrit.libreoffice.org/22720 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 1c85800345239754d5c4ec71c2aad526d0439eea) Reviewed-on: https://gerrit.libreoffice.org/22890 Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit dd37ff21753afe37dc7185fddf34adf33dc9291f)
2016-03-10tdf#98277 Extensions: Display shortcut in toolbar tooltipSamuel Mehrbrodt1-0/+5
(cherry picked from commits 3ff17bda5ba3e627e9b996506dc72b68cf67483b and 398fadca9a82917ed865e328ba454d8015803b66) This patch differs from the one in master since CommandInfoProvider is not available before 5.1. Change-Id: Icc16860d8b47a3724838fdb3dcb72dfb4398167d Reviewed-on: https://gerrit.libreoffice.org/22806 Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 4a8a051e1a29c86d29d5064455226c4f11f69f52)