summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-03-21Version 6.0.3.1, tag libreoffice-6.0.3.1-buildfix2libreoffice-6.0.3.1-buildfix2Christian Lohmaier
Change-Id: I9deb30a4dc201700757e1a04309d75a53777261f
2018-03-21tdf#115420 fix DC usecount and drop wrong assertsJan-Marek Glogowski
For DC initialization we check the thread ID to assign a normal or cached DC to the corresponding WinSalGraphics variable. The cached DC has a usage count, as there are some limits on cached DCs count (DCX_CACHE). But for the WinSalGraphics DC init and release the variable just matters for the accounting, and generally which thread is doing the calls: the non-main thread always has to relay them to the main application thread. Since we're releasing all WinSalGraphics in ~WinSalFrame and do all release and re-init in ImplSetParentFrame, there is no way to correspond the thread ID to the WinSalGraphics variable. So this drops the wrong assertions based on the WinSalGraphics variables and renames the GETDC message to GETCACHEDDC to make usage of a cached DC (DCX_CACHE) more obvious. As a consequence of the different release DC handling this also fixes the accounting of the cached DCs, wich was broken in the initial fix; commit c15ea73f960bbd3d2a4b0c43b467ac62eeba3505 Change-Id: I11ce52a1b4005f26567f92588437fa37bf227a2e Reviewed-on: https://gerrit.libreoffice.org/51318 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 8939cb9456ee76a848cc8089747f280751092cf8) Reviewed-on: https://gerrit.libreoffice.org/51549 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 8e870ea9b828166b89a5c3f6c4f060bde6082f26) Reviewed-on: https://gerrit.libreoffice.org/51714 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 17185b48422f4d766e52bbbe38932901969c4f93)
2018-03-16Version 6.0.3.1, tag libreoffice-6.0.3.1-buildfix1libreoffice-6.0.3.1-buildfix1Christian Lohmaier
Change-Id: Ibb300dbda1b7e8ef9b698e370b1698c04e61d9f2
2018-03-16tdf#116163: Limit label height in chart if neededSzymon Kłos
Change-Id: Ia84fd0c3b76886bc6124dc3b59035465aa31b020 Reviewed-on: https://gerrit.libreoffice.org/50700 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/50830 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 87d8df83efd210a322b42f590aaff3d2e8efe2bc)
2018-03-15Version 6.0.3.1, tag libreoffice-6.0.3.1libreoffice-6.0.3.1Christian Lohmaier
Change-Id: Ibc8c759251bf62c48b3cb34d210328466922d00b
2018-03-15bump product version to 6.0.3.1Christian Lohmaier
Change-Id: I36b221744fa747c7612eaa261bbcd0d78dcf690e
2018-03-15Branch libreoffice-6-0-3Christian Lohmaier
This is 'libreoffice-6-0-3' - the stable branch for the 6.0.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 6.0.x release, please use the 'libreoffice-6-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I4e4091f2cb337293f94a0154b7655271e4ac912a
2018-03-15Updated coreChristian Lohmaier
Project: translations 60adb5661648297fcc3df775436778a7e9fb4b2b update translations for 6.0.3 rc1 and force-fix errors using pocheck Change-Id: Ida5ff984298d602119df49bc949c0499fb3e4265
2018-03-15ofz#6827 Bad-castCaolán McNamara
Change-Id: I856d781f122c21c02a0a8cd01369d49f50b8a555 Reviewed-on: https://gerrit.libreoffice.org/51364 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2018-03-15xmloff: ODF import: improve meta:generator checksMichael Stahl
Instead of a hard-coded check for (effectively) one project name "LibreOffice" (which is build-time configurable), check for the string "LibreOffice_project", which has been produced hard-coded ever since LO 3.3.0. This now recognises additional downstreams "LibreOffice_Vanilla" and "Collabora_Office", and also historic "BrOffice". An important point here is that the build-time configurable version numbers of any downstream that retains the hard-coded "LibreOffice_project" *MUST* be the same as the upstream's at least in their major and minor versions (micro and further digits are currently not used), and that such downstreams don't backport changes with ODF export compatibility impact further than upstream. Add a unit test too, with a representative sample of 4372 distinct generators in bugzilla attachments. This revealed that StarOffice 6 and AOO 4.0.1 were falling through the cracks and not recognised, so fix that too. Change-Id: I8105222d3428e7b20cc4a6b8e76732c697812594 Reviewed-on: https://gerrit.libreoffice.org/51171 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 0d6ffe118fd1d03e22fcda2f06d49b4c932d2018) Reviewed-on: https://gerrit.libreoffice.org/51261 Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-15Resolves: tdf#115351 convert boolean equivalent format codes to proper BooleanEike Rathke
Because Excel does not know a Boolean number format, BOOLEAN is saved to Excel as "TRUE";"TRUE";"FALSE" with implicit conditions [>0] and [<0]. This when loaded has no boolean property. Then saved to ODF it is loaded as [>0]"TRUE";[<0]"TRUE";"FALSE" with explicit conditions, which has identical meaning. Convert both equivalent format codes to proper BOOLEAN when reading. Locale dependent representations are treated the same, e.g. "WAHR";"WAHR";"FALSCH" Reviewed-on: https://gerrit.libreoffice.org/50642 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit ce4fc2fc08be8ea2773194e303ed42d2579e93a0) Backported. Conflicts: svl/source/numbers/zforscan.cxx Change-Id: I49383d71fce972fdd7ad9b19ce3bc150d02aba62 Reviewed-on: https://gerrit.libreoffice.org/50645 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-15Resolves: tdf#54197 update input line with new cell content after Ctrl+D fillEike Rathke
This is a combination of 3 commits. Resolves: tdf#54197 update input line with new cell content after Ctrl+D fill ... and invalidate cell slots. Related: tdf#115297 copy AutoSpellData from row above if no selection Related: tdf#54197 copy AutoSpellData from adjacent if no selection 62ebb3579d5c05e71ca10879ae0ade5bda3bbeba 82223a64f5c5ec3c98dba390d88af8369a322bd7 Change-Id: Icbe7784430f7ddeed8fa0bc56352269447ee8cbb Reviewed-on: https://gerrit.libreoffice.org/50608 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-15Resolves: tdf#116149 handle external references in VAR* and STDEV* functionsEike Rathke
Change-Id: I644a5f8f92452ca775ee3b42a73d3f0a0ac3c623 (cherry picked from commit 38b87bbb24c1d1cc088d3d135e7e95b3ec75d386) Reviewed-on: https://gerrit.libreoffice.org/50647 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-15tdf#116163 import testSzymon Kłos
Change-Id: Ie4fd1142e1111e4968941a639a265d169aaa6413 Reviewed-on: https://gerrit.libreoffice.org/50814 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/50831 Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-15tdf#116397 get bounds of full field, not start of char inside fieldCaolán McNamara
The pSpecialPos is set for the StartTag case (#i75130#) and I surmise we only care about it if we are a smarttag Change-Id: Ic764bbf31a7784ab021f306f74a08473c8dd0a77 Reviewed-on: https://gerrit.libreoffice.org/51298 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-15tdf#114858 Use Ctrl+` for Formula Toggle on MacYousuf Philips
Change-Id: I0685eb0d1f6ea7c8502bbaa22f0e90004947282d Reviewed-on: https://gerrit.libreoffice.org/48793 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Yousuf Philips <philipz85@hotmail.com> (cherry picked from commit 532576461654eaf43120d2f693172c07a41275fa) Reviewed-on: https://gerrit.libreoffice.org/50971 Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-15missing error description for ERRCODE_SFX_FORMAT_ROWCOLCaolán McNamara
Change-Id: Ia616486011f92ccfdd743e46f1b583b99b087eb5 Reviewed-on: https://gerrit.libreoffice.org/51116 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Sophie Gautier <gautier.sophie@gmail.com>
2018-03-15tdf#115861 DOCX import: avoid last-paragraph removal when discarding footerMiklos Vajna
Discarding header/footer is necessary when the document or section settings request to ignore first or even headers/footers. In the bugdoc case settings.xml didn't opt-in for different even/odd footers, but there was an even footer to be ignored. Handle this state at two more places, so we don't end up in a situation where we ignore the footer but not its "remove last (empty) paragraph at the end of the footer" action. Also make the debug dumper for text ranges more robust to have a working token dump when we try to get the string for a table. (cherry picked from commit 49cf733effc56c09c5e2eb023120c2d3532b5b3d) Change-Id: I6395f37aa40c42304e2c918d87dadecb21e9d378 Reviewed-on: https://gerrit.libreoffice.org/50884 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-15copy multiple single row cond formats correctly, tdf#115835Markus Mohrhard
Change-Id: Ic20cc27f03edf3dbd27975f99c788bf5bffd4c48 Reviewed-on: https://gerrit.libreoffice.org/50211 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit c557889748292d25996ea8f587d7564c74e6f121) Reviewed-on: https://gerrit.libreoffice.org/50292 Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-15tdf#75256 Sifr update fix for not showing up epub export iconMatthias Freund
Change-Id: Ifa85cb2d99e049295903408bb990e8e37d1f5021 Reviewed-on: https://gerrit.libreoffice.org/51080 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Matthias Freund <matti_lx@secure.mailbox.org> (cherry picked from commit 745998f778c22568c3bd691ffc24e80982e2db44) Reviewed-on: https://gerrit.libreoffice.org/51092 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-03-15tdf#116351: fix re-use of AttributeList on PGP manifesthimajin100000
multiple attributes of the same name on the same element, because AttributeList was wrongly re-used Change-Id: I29b2317ce3d836d7349fa0474709726bed2c5ad4 Reviewed-on: https://gerrit.libreoffice.org/51087 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 32f42d093d4408666151d03f04823e2bb39e46cd) Reviewed-on: https://gerrit.libreoffice.org/51250 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2018-03-15ofz#6891 empty vector accessCaolán McNamara
Change-Id: Ic36d03d2646ebd90bea5fa91bc4dac3596a55d4a Reviewed-on: https://gerrit.libreoffice.org/51229 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-15tdf#115998 base: crash on delete relationshipNoel Grandin
Change-Id: Ida8cc9ef0b812254990ac808f78ae183ae28a1c0 Reviewed-on: https://gerrit.libreoffice.org/50633 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 46b32a022ee3679721e410e470c57b6a0b91ecb0) Reviewed-on: https://gerrit.libreoffice.org/50769 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2018-03-15Adapt solenv/flatpak-manifest.in to recent download.lst changesStephan Bergmann
(cherry picked from commit bca14a7126a8cea12eecd248ae84e3d07db9609b) Conflicts: solenv/flatpak-manifest.in Change-Id: Id9a41e528e45d60a5429be4c51d58badff200f0a Reviewed-on: https://gerrit.libreoffice.org/51336 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-03-13tdf#115649: ensure we own SolarMutex in the callbackMike Kaganski
The crash is caused by releasing SolarMutex we don't own; the release happens in Application::Reschedule() inside SalPrintAbortProc. The crashing callstack: ucrtbase.dll!abort() mergedlo.dll!comphelper::GenericSolarMutex::doRelease(bool bUnlockAll) Line 72 mergedlo.dll!SalYieldMutex::doRelease(bool bUnlockAll) Line 177 [Inline Frame] mergedlo.dll!SolarMutexReleaser::{ctor}() Line 1473 mergedlo.dll!WinSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents) Line 550 mergedlo.dll!ImplYield(bool i_bWait, bool i_bAllEvents) Line 469 mergedlo.dll!SalPrintAbortProc(HDC__ * hPrnDC, int __formal) Line 1308 gdi32full.dll!vSAPCallback() gdi32full.dll!ExtEscapeImpl() gdi32.dll!ExtEscape() [Frames may be missing, no binary loaded for KMUU727V.DLL] KMUU727V.DLL!0000000011d0dc21() Change-Id: I955eab7894186900d0d99e28f62d87cc645e4a5a Reviewed-on: https://gerrit.libreoffice.org/51052 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 43bf50d5ced4b878f747075f8c0f1b32991c290e) Reviewed-on: https://gerrit.libreoffice.org/51153 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-13tdf#107094 backward heading search doesn't always workCaolán McNamara
regression from... commit 84e44386d70e886f9bae633ebe915ea3a52f8dbd Author: Caolán McNamara <caolanm@redhat.com> Date: Wed Nov 12 10:35:18 2014 +0000 coverity#982189 Unchecked return value so put it back the way it was and explicitly ignore the return instead Change-Id: I6f5ef42b38236ea5f70ddbccfa25a81f2f3e976c Change-Id: I0c0084247e8570ace2198fa893db273dab00d2b0 Reviewed-on: https://gerrit.libreoffice.org/51147 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-13tdf#116101 Correct bullet position for linespacing > 100%Szymon Kłos
Change-Id: Ia900636d4013ab2a9c893c8246391db867fe1543 Reviewed-on: https://gerrit.libreoffice.org/51017 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/51086 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-03-13update creditsChristian Lohmaier
Change-Id: If08d6a65d35b3c1d7226e004933bffc3769ba398 (cherry picked from commit e993d98e29faee0947588a326fe9454c8f987ef7)
2018-03-13forcepoint #24 back() on empty vectorCaolán McNamara
Thanks to Antti Levomäki and Christian Jalio from Forcepoint. Change-Id: Idb6723b53a1ae8aaca80847bfe643bc4abaedd21 Reviewed-on: https://gerrit.libreoffice.org/51122 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-13forcepoint #27 check region bands loaded from stream for consistencyCaolán McNamara
Change-Id: I92376b5fb4208c78fa25a94d4dd394256793161c Reviewed-on: https://gerrit.libreoffice.org/51145 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-13forcepoint #26 check input against max valid enum valuesCaolán McNamara
Change-Id: Ide72884c77904ae9495b5189cde086e43923e4bd Reviewed-on: https://gerrit.libreoffice.org/51137 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-13forcepoint #25 ensure null terminationCaolán McNamara
Change-Id: I37f4787fb5772e959c45280d9650adcc15591033 Reviewed-on: https://gerrit.libreoffice.org/51129 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-13tdf#103175: Initialize DrawLayer if requiredMike Kaganski
Change-Id: Ia99dd1e349e807d339dce0ead518a72a31e0fc02 Reviewed-on: https://gerrit.libreoffice.org/51096 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit de53d4690d25b9f1bbc0def6c66ce5b45b2fdc96) Reviewed-on: https://gerrit.libreoffice.org/51110 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
2018-03-12forcepoint #21 pop on empty stackCaolán McNamara
Thanks to Antti Levomäki and Christian Jalio from Forcepoint. Change-Id: I25b1c6361fb0a3ae6b01f2be870c9e1b49bf5b84 Reviewed-on: https://gerrit.libreoffice.org/51115 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-12ofz#6827 drop last anchor pos if it will be joinedCaolán McNamara
Change-Id: Ib36b74b455f741d9dcccbdf244d21453837bda3c Reviewed-on: https://gerrit.libreoffice.org/51099 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2018-03-12tdf#44774: Parent style's msApiName could yet be empty; use GetApiName()cp-6.0-branch-pointMike Kaganski
Change-Id: Ie0e218ea83d34aa7ee22fea1f32b2851a942544f Reviewed-on: https://gerrit.libreoffice.org/51069 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit a8fc81d478f4dcf8600ed9a2b4e0f7adff4a17ee) Reviewed-on: https://gerrit.libreoffice.org/51070 Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-03-11Updated coreLászló Németh
Project: dictionaries d689c8660c0e3335159273af25fd88fe82de4af3 tdf#95024 update Hungarian spelling dictionary Changes from Magyar Helyesírási Szótár (2017), for example "soppingol", "sznekk", "videófilm". Other fixes and rules. Change-Id: I7ba79f48495fc0f6b930ae426e0ce1efdaa66984 Reviewed-on: https://gerrit.libreoffice.org/51020 Reviewed-by: László Németh <nemeth@numbertext.org> Tested-by: László Németh <nemeth@numbertext.org> (cherry picked from commit edcc4e770e287a6ebe1022cb57fda539ceec9188) Reviewed-on: https://gerrit.libreoffice.org/51089 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-03-09tdf#115084: fix sloppy mnemonic IDKatarina Behrens
Change-Id: I8f9df0baa2862eefada8fafeb384e0129df3f7e9 Reviewed-on: https://gerrit.libreoffice.org/50839 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 74a027f927289911b3b712c1ea0f350cf631b0ae) Reviewed-on: https://gerrit.libreoffice.org/50981 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-03-09tdf#115015: make crypto settings better fit allocated spaceKatarina Behrens
Oh dear how much do I dislike fixed size dialogs. Everytime they are enlarged to fit new content (esp. gtk3 is rather space-greedy there) someone starts to whine the dialog is now too large Doing what e6d7d7375221 does is not really an option, since there are some 30+ tabpages to try and test for optimal size here. And two more squashed commits: tdf#1155015: Make sure checkbox text really wraps for :wrap property to be effective, a reasonable height request is needed so the text is not forced into single line again tdf#115994: Extensions' option pages need fixed pref. size as they are fixed size .xdl-based dialogs mostly But because of tdf#115015 calculate this preferred size as approx. 14 text edits + some padding to make sure crypto settings will fit the allocated space Change-Id: I3ffb2d794f76781eb62186093b928289593585cf Reviewed-on: https://gerrit.libreoffice.org/50596 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-03-08Updated coreAndras Timar
Project: translations 962ce48869c8e511ef6034b4cfb857940b61165b followup of core 12a80d5 for Slovenian Change-Id: Ia14f821042850e4c4d4901ff3c4cbbbaa63bc00e
2018-03-08tdf#115420 WIN clean up WinSalFrames DC handlingJan-Marek Glogowski
We still don't return a SalGraphics object from AcquireGraphics without a valid DC. But internally we keep the WinSalGraphics objects around, so we now have to verify the DC before using it. In the end this also fixes the leak of the threaded SalGraphics of the frame. Change-Id: I267c96c04b7d00cb66a6c84c63d1373ebe0f529f Reviewed-on: https://gerrit.libreoffice.org/50908 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit c15ea73f960bbd3d2a4b0c43b467ac62eeba3505) Conflicts: vcl/win/window/salframe.cxx Also includes the following patch: WIN rename SalFrames SalGraphics pointers This renames mpGraphics => mpLocalGraphics and mpGraphics2 to mpThreadGraphics. Change-Id: I649b956abc9587f1be74872d439fefc5f5b21135 Reviewed-on: https://gerrit.libreoffice.org/50907 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 352bd98892c1cdf95756a49f38c84212eebffd7b) Reviewed-on: https://gerrit.libreoffice.org/50958 Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2018-03-08VCL canvas: fix another clipping mistake (related: tdf#115142)Thorsten Behrens
Follow-up to 5d710cf7dda27e78f237211fd92418be4dd1c551 - setupOutDevState() tends to set a clip, better not overwrite that. Change-Id: I52aa7db3ef12e9c2902016460e1bf4914328dc7c Reviewed-on: https://gerrit.libreoffice.org/50920 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit e8ed3dfc35975b9e57da7803168f3e2a117a4004) Reviewed-on: https://gerrit.libreoffice.org/50939
2018-03-08Support for GPG encryption in more ODF filtersKatarina Behrens
not only Writer but also Calc, Impress, Draw and Math Change-Id: I7f9fe86ffe5f9a812a5215617b9e673c73134202 Reviewed-on: https://gerrit.libreoffice.org/45472 Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> Tested-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 9e5e92c4a1415aac8b0107950f577d1679499e62) Reviewed-on: https://gerrit.libreoffice.org/50923 Tested-by: Jenkins <ci@libreoffice.org>
2018-03-07Resolves: tdf#116116 vertically center line in allocated heightCaolán McNamara
Change-Id: Iee4cd859cdc52a2272f5b01c3e4a57336cc336a4 Reviewed-on: https://gerrit.libreoffice.org/50891 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-03-07tdf#115142 Revert "slideshow: clip shapes in secondary screen window"Michael Stahl
This reverts commit 99e373cd4c78084ded349f3e3de7b0504af2dd90. This is bogus as it actually does scaling and not clipping, and the actual clipping bug is in the VCL canvas, see following commit. Also should fix tdf#115652 and tdf#116196. Change-Id: Ief7be653a38626c9902ab5c7c453a133c2b9f882 (cherry picked from commit 0408a590311c837d5f0ab1abfb72a564a266ddac) Reviewed-on: https://gerrit.libreoffice.org/50885 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-03-07VCL canvas: fix clipping of gradients (related: tdf#115142)Michael Stahl
When using the presenter console, the secondary screen has a small view of the current slide, which is called a "Pane" in sdext. Clipping for this is done by sd::presenter::PresenterCanvas, which wraps the full-screen VCL canvas and has a MergeViewState() to intersect the clip region. The VCL canvas has a bug in its gradientFill() implemenation where it overrides the existing clip on the OutputDevice instead of intersecting it. This properly fixes the bug that was wrongly and badly attempted to be fixed by commit 99e373cd4c78084ded349f3e3de7b0504af2dd90. Change-Id: Id02678c2f134fe7b190866d6a6fff5b2e5e3aaff (cherry picked from commit 5d710cf7dda27e78f237211fd92418be4dd1c551) Reviewed-on: https://gerrit.libreoffice.org/50886 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-03-07tdf#115432 footnote separator position wrong (3rd attempt)Noel Grandin
My second attempt in commit dedf5e4f9000e271683dea9a0488e1b45b91176c "tdf#115432 footnote separator position wrong (2nd attempt)" managed to lose part of the change because of incorrect rebasing. Change-Id: I7b18f3e1602c617d1cb414ef0eb2ee456aeb58ee Reviewed-on: https://gerrit.libreoffice.org/50901 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit dcd95c6fff548c7ac46688244e44b95464fb297d) Reviewed-on: https://gerrit.libreoffice.org/50912
2018-03-07tdf#115432 footnote separator position wrong (2nd attempt)Noel Grandin
the first attempt (d4a8d91abd40dee7f7bd739a678a502a6e34cb59) incorrectly changed the type of a UNO property defined in a published IDL file. Change-Id: I75bc75dead0954d1faa6dfb6adab9f4c42c67cfc Reviewed-on: https://gerrit.libreoffice.org/50827 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 1163bcd5da3063e7e988ebf49d9b60dfd6f6c703) Reviewed-on: https://gerrit.libreoffice.org/50894 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-07tdf#116147 guard triggerRequestThreadAwareJan-Marek Glogowski
It didn't help putting a SolarMutexGuard into VCLXButton::ProcessWindowEvent, which was my first suspect in my own backtrace, as VCLXWindowImpl::OnProcessCallbacks releases it to process the callbacks. Since the gtk backend also guards all calls into the file picker code, I think it's save to do the same for the Windows picker. I have no idea where it is actually released again... Change-Id: I3ab3b47904dc3d0033739a82f7afd91e6e80403d Reviewed-on: https://gerrit.libreoffice.org/50783 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 3e38b81a65ced47595e9760bdc622d9434b72cc0) Reviewed-on: https://gerrit.libreoffice.org/50796 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2018-03-07libxml2: upgrade to release 2.9.8Michael Stahl
Change-Id: Ic6802c16b740f6aee59ae2f74b7edcd37461f1f3 Reviewed-on: https://gerrit.libreoffice.org/50835 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit f775b5427bf085577feb5badb762156283d76ae5) Reviewed-on: https://gerrit.libreoffice.org/50841 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
generated by cgit (git 2.34.1) at 2024-07-01 22:45:53 +0000