summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-03Version 6.0.7.1, tag libreoffice-6.0.7.1libreoffice-6.0.7.1Christian Lohmaier
Change-Id: I6a51316f66d7af50ddbee56061512cf0e2cc1127
2018-10-03bump product version to 6.0.7.1Christian Lohmaier
Change-Id: I970ca00d1ab628ec110248840e9ebe044ee7a3e3
2018-10-03Branch libreoffice-6-0-7Christian Lohmaier
This is 'libreoffice-6-0-7' - the stable branch for the 6.0.7 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: I1fa64290e076ed4f6b2d7362c172021b0762be7f
2018-10-03Update git submodulesChristian Lohmaier
* Update translations from branch 'libreoffice-6-0' - update translations for 6.0.7 rc1 Change-Id: I3d8c568a8fd73465e47c0334ad02679652128020
2018-10-03Resolves: tdf#119954 do not copy the old parent, init with new parent insteadEike Rathke
The parent is always the ScDBCollection that contains the ScDBCollection::NamedDBs container, not the one the ScDBCollection::NamedDBs was copy-constructed from. Change-Id: Ia409347f3aeb9ad7a5e68da7af727adfac98d6a2 Reviewed-on: https://gerrit.libreoffice.org/60833 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 7ea5d339dc4d8412f436f3affa589bfbd0b1ef68) Reviewed-on: https://gerrit.libreoffice.org/60842 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-10-03tdf#118786 WIN just assert in YieldJan-Marek Glogowski
This reminds me - again - that Jenkins doesn't run make check. It turns out InSendMessage() also returns true, if you process a nested SendMessage in the same thread. Therefore we have to remove the SalComWndProc assert and just keep the one in the Yield call. Why? Because there seem to be no way to get the information ReplyMessage has access to, so we could detect the caller / origin of the send message and implement proper nested call checks. The alternative would be to change all call sites of SendMessage to: if ( !pSalData->mpInstance->IsMainThread() ) SendMessage(...) else SalComWndProc(...) which is the same SendMessage already does. Change-Id: I991d68a64952dc5d47ba51edd8635c9e8c46614c Reviewed-on: https://gerrit.libreoffice.org/59538 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit bf0a63dc93a746a008fb1656457c77de8df693ba) Reviewed-on: https://gerrit.libreoffice.org/59565 (cherry picked from commit a42c65176f2791cf5e48578a8898bf03185adc89) Reviewed-on: https://gerrit.libreoffice.org/60726 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-03tdf#118786 WIN allow nested SendMessage callsJan-Marek Glogowski
This bug trips "assert( !pInst->mbNoYieldLock )". There is already a special case, introduced in commit 4baec725e0dc ("WIN run main thread redirects ignoring SolarMutex"), to prevent tripping the assert for a nested SendMessage call. So this implements a general solution for nested SendMessage calls. We just have to prevent yielding in a call from an other thread, as the sending thread still owns the SolarMutex. This way we can also drop the special handling in WinSalFrame::ReleaseFrameGraphicsDC. Conflicts: vcl/win/app/salinst.cxx Change-Id: I7024b081b26f3545af12a3a3a038fe5e5671af3c Reviewed-on: https://gerrit.libreoffice.org/59275 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 35a254750392dcd738481f5d6e8719cee9fb41b3) Reviewed-on: https://gerrit.libreoffice.org/59318 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 3e392904c558d1f9fc91926511d148762813537e) Reviewed-on: https://gerrit.libreoffice.org/60725 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-03tdf#119458 reorganize sw background Idle handlingJan-Marek Glogowski
This is the squashed version of the following commits: - ce68889678bc tdf#119458 always start the SwDocIdle - 107f0e6dba57 tdf#119458 fix sw background Idle state handling - 771544544ee1 tdf#119458 fix sw background Idle unblocking - 3bd8316718fd tdf#119458 just wakeup Scheduler on active Idle While the first commit was really wrong, the third is just an optimization to prevent unnecessary wakeups and Idle task interrups from new calls to StartIdling(). The 4th one contains the reset of the Idle state on run, which was probably the main origin of the problem and allows to wake up the Scheduler without moving the Task to the end of the queue. Starting the SwDocIdle in StartIdeling() just reintroduces the bug fixed in commit 401cba4c20fb ("tdf#116370 cleanup Writer idle job handing"), so trading one bug for the other. For the real solution we have to handle two states: 1. The SwDocIdle being active 2. The SwDocIdle being blocked For the first state we can just use the active state of the Idle itself. Since it's not a AutoIdle, it will be turned of, if invoked. Either some Idle handler will want to be run it again or some other thread might start it again, if needed. Since we're now tracking the wanted Idle state via the active task flag, we can drop the explicit mbStartIdleTimer handling. As a result of the first change, we can't stop the Idle anymore when blocking it. But the Idle itself checks its ready state via IsDocIdle() in its UpdateMinPeriod function, so we have to add the blocking state to IsDocIdle(). But we can't handle the correct state when blocking via a tasks mbActive bool, as this also schedules the task and starts the scheduler timer. So reintroduce a bool for the unblock state. This should prevent fdo#73165, which I couldn't reproduce, but just to be sure. More importantly this patch resets the m_bStartOnUnblock when the Idle job actually runs. This run should already determinates if more Idle work needs to be done, and others can still call BeginIdling() to ensure further processing. Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Tested-by: Jenkins Reviewed-on: https://gerrit.libreoffice.org/59536 (cherry picked from commit ce68889678bca3b51c258452f7bfdd21982e4a0d) Reviewed-on: https://gerrit.libreoffice.org/59586 (cherry picked from commit 107f0e6dba57a5b27366a35a5cdb184079546df0) Reviewed-on: https://gerrit.libreoffice.org/59692 (cherry picked from commit 771544544ee13ec98961f93b5313a7d2e29429cd) Reviewed-on: https://gerrit.libreoffice.org/59730 (cherry picked from commit 3bd8316718fdfed454c01a9c4ae6af6beb34437d) Change-Id: I2d4328f31644017b09786ff4cba45cf7643f0a4b (cherry picked from commit f1fb30cf43eda45137ab96177238a29c3725789d) Reviewed-on: https://gerrit.libreoffice.org/59757 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 20e46a6ca5b62f7177f799eae9e0f26e659fd03b) Reviewed-on: https://gerrit.libreoffice.org/59769 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org> Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> (cherry picked from commit 3abec366a3fdb8657d69e24b69b4338121f80b22) Reviewed-on: https://gerrit.libreoffice.org/60724
2018-10-03tdf#116370 cleanup Writer idle job handingJan-Marek Glogowski
This prevents the start of the idle job, while processing itself, so the fixed WinSalInstance::AnyInput of commit 3bf6c97029d2 ("tdf#112975 WIN correctly handle VclInputFlags::OTHER") won't report the timer events of the re-started idle job to process. Fixes the early abort of the background job, which resulted in the busy loop of the reported bug and this strange printing behaviour. P.S. I'm not sure, why this was just broken on Windows. Change-Id: I6503dcd925c9a0ed843e794a31eea32a4a4b2889 Reviewed-on: https://gerrit.libreoffice.org/59279 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 401cba4c20fbc930f034168872642428d7459218) Reviewed-on: https://gerrit.libreoffice.org/60723 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-10-02tdf#120028 PPTX import: map shapes with multiple columns to table shapesMiklos Vajna
This is a combination of 3 commits. 1st commit: Longer term the core Impress shape has to be improved so that it can have text in multiple columns. Shorter term, map text with multiple columns to table shapes, that gives correct layout in many cases and requires changes to the import filter only. (cherry picked from commit aef569ed83a3ccc02639e5b2a1c7cc131ba262fc) Commit #2: Related: tdf#120028 PPTX import: fix font size of multi-col shape text Normal shapes have a TextFitToSize property for this, but table cell content has to be scaled manually, as the rendering has no automatic support for them. Luckily the file format has the info we need to scale at import time. (cherry picked from commit c8b2849d140677f7b35523096eb2bc715b3dc507) Commit #3: Related: tdf#120028 PPTX import: fix font color of multi-col shape text Not just font color, anything defined via list styles were not imported. (cherry picked from commit 800bf1071a30955ff70373b2fb5886eadce59dee) Conflicts: oox/inc/drawingml/textbodyproperties.hxx Change-Id: Id7942b16882ab1f083ded2f0e577e8c9e128697c Reviewed-on: https://gerrit.libreoffice.org/61244 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-09-21ofz#10523 guard aginst 0 pF->nLCodeCaolán McNamara
Change-Id: I8ef476e06f54ddd57be907488a8a65314abda3ee Reviewed-on: https://gerrit.libreoffice.org/60828 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-09-20tdf#118502 Fix loading of eps images with replacement graphicSamuel Mehrbrodt
Change-Id: Iaf9c8e2ed72115e1f82d2541ae2a1d4803795a46 Reviewed-on: https://gerrit.libreoffice.org/60752 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 088af44063c3e2d1d0e7744a9f9bd7b37ff58a75) Reviewed-on: https://gerrit.libreoffice.org/60768 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-09-20ofz#10526 check with dynamic_cast its really a EMFPStringFormatCaolán McNamara
Change-Id: Ifbe81b851b17858a915105c102af6f4d8f2c81fa Reviewed-on: https://gerrit.libreoffice.org/60800 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-09-20update creditsChristian Lohmaier
Change-Id: I1a8c8bc20ee7e97b47f0602dcfaa3cb1b771de8f (cherry picked from commit bb26bd6148ef7c60d6280b4848c017ba63775242)
2018-09-18tdf#119881: Check if Unity/Gnome is separated by colon in XDG_CURRENT_DESKTOPXisco Fauli
Change-Id: Ie29c2213d8efccd7750396325ce05b4909c09d02 Reviewed-on: https://gerrit.libreoffice.org/60592 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 79093cce6c3a65f84bbafd172b1e9e6702d3ce75) Reviewed-on: https://gerrit.libreoffice.org/60678 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-09-18tdf#119875 sw: fix invalid pos of frame after 0-sized section with laycacheMiklos Vajna
The interesting part of the layout of page 2 is: - frame #40 is a section frame with a text frame which is in a list ("A") - frame #48 is a section frame after that, with the same top=19213 Given that frame #40 has height > 0, they overlap when the page is rendered. What happens is: - frame #40 grows - there are other section frames between #40 and #48 in-between, but they don't have an SwSection - these frames are skipped - then the position of #48 is invalidated So the next time we calculate the position of #48, we look the last skipped (previous) section frame (which still has top=19213, since its position was not invalidated above), and since its height is 0, we conclude that our current top=19213 is valid after all. This is like this since commit 84a3db80b4fd66c6854b3135b5f69b61fd828e62 (initial import, 2000-09-18), so leave the code there that invalidates not only the next frame, but all the way down to the first non-SwSection-less-SwSectionFrame. But instead of just invalidating the last frame, invalidate the in-between SwSection-less-SwSectionFrames as well. In practice this did not cause a problem in case the document has no layout cache. If it does, then the frames are created on pages hinted by the cache, then later moved to their final place. In practice this bug was visible only in this later case. (I.e. such a layout cache can be only created if the machine that saved the document last time does not have the fonts needed by the document installed; and then the document is opened on an other machine which has those fonts.) (cherry picked from commit b5937112d4035fb9ffb472e1bf36567d9c78c820) Conflicts: sw/qa/extras/layout/layout.cxx Change-Id: I02ae9f63d0b4b5e9d014df53ed2cf21a04b15090 Reviewed-on: https://gerrit.libreoffice.org/60658 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-09-14tdf#118881: Fix HTML parsing for personasMuhammet Kara
This is just a band-aid to make personas feature work again. Change-Id: I80b54fe9a8ddc93d93744fcf2c7f739d81f6face Reviewed-on: https://gerrit.libreoffice.org/60432 Tested-by: Jenkins Reviewed-by: Heiko Tietze <tietze.heiko@gmail.com> Tested-by: Heiko Tietze <tietze.heiko@gmail.com> Reviewed-by: Muhammet Kara <muhammet.kara@pardus.org.tr> (cherry picked from commit e98ac43ec42ff398ad489d6719960d595f0327be) Reviewed-on: https://gerrit.libreoffice.org/60468 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> (cherry picked from commit 2f52a8e0f1098a51631434129707cfb0b60fecb3) Reviewed-on: https://gerrit.libreoffice.org/60481
2018-09-11sw: tdf#119742 fix null pointer in SetCursorInHdFtJuergen Funk
In SwWrtShell::ChangeHeaderOrFooter the ChgPageDesc destroys the frames of the header, that's why GetCurrFrame returns null later. Change-Id: I26915237c8b455a5b8ad0bbd5c2de38537dfef08 Reviewed-on: https://gerrit.libreoffice.org/60130 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 77d075facaf4fc8954666ad541ed14f75d964fba) Reviewed-on: https://gerrit.libreoffice.org/60302 Tested-by: Jenkins
2018-09-10tdf#114400 Import drawoo:fontwork-xyz attributesIlhan Yesil
Either the document has attributes in the old namespace or in the new, both will be imported. But export is still in the old namespace. Change-Id: I9f4d1ca0d8af37c13b513f99cc7d254c68867bb2 Reviewed-on: https://gerrit.libreoffice.org/59405 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 278e66488135c8fa2714520d056573c64ea803cf) Reviewed-on: https://gerrit.libreoffice.org/60207 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-09-07update creditsChristian Lohmaier
Change-Id: I946580363eb272f95694b000d6daa997e761285d (cherry picked from commit 01b19afeceb417e258df771677c65c36210a7c4d)
2018-09-06upgrade curl to 7.61.1Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/60042 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit d15d3ce697e88e72cec84b5b9b9619a37a8ae7ed) Conflicts: download.lst Change-Id: I4590f5f705dd08c63a1532ce5afa94a3af953f24 (cherry picked from commit 2a3c28b37dcdce35c35af2b91483b08746a1597b) Reviewed-on: https://gerrit.libreoffice.org/60055 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-09-05Properly encode OAuth2 credentialsStephan Bergmann
Reviewed-on: https://gerrit.libreoffice.org/59986 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 33f7485dedea90e0f80c6348fa8ac5f27c5052e0) Conflicts: external/libcmis/UnpackedTarball_libcmis.mk Change-Id: Ic3edeae035262309e91fb01e3aca5c2f905bc3e5 Reviewed-on: https://gerrit.libreoffice.org/60017 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-09-04ofz#10189 check container sizeCaolán McNamara
Change-Id: Ie99e3b082795989290799d057a99b1bcff94b161 Reviewed-on: https://gerrit.libreoffice.org/59913 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-31tdf#112454 Also consider last SCTAB in loopMichael Weghorn
Since 'rRange.aEnd.Tab()' is valid, it needs to be included in the loop to get a valid result. Reviewed-on: https://gerrit.libreoffice.org/59798 Tested-by: Jenkins Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de> (cherry picked from commit 03b361673d04f31e0602d2988e4df26eaeb53a34) Conflicts: sc/source/core/data/document.cxx Backported. Change-Id: I7b2447e059dc03444c56e7fc0b113e1b618dd510 Reviewed-on: https://gerrit.libreoffice.org/59878 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2018-08-30tdf#117823 Save mail merge config item in new viewIlhan Yesil
The config object is now saved in a newly created document. Regression from commit id 00fa85e701d4a8984cfa3a24c9b7a3963b031fa0. Change-Id: I2265de1dd69038d447e28dfda2e85c7cf89903c6 Reviewed-on: https://gerrit.libreoffice.org/59728 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 9d847ff825c1c94286e8ab864a88fc5375d9341c) Reviewed-on: https://gerrit.libreoffice.org/59803
2018-08-28tdf#118058 sw, sections in tables: no split for multiple columnsMiklos Vajna
The original use-case was "group a few paragraphs together" for the split sections inside tables, i.e. it's safe to not split when the section has multiple columns. And the multiple columns case would mean that we don't find where to put the follow section inside a table, resulting in a layout loop. Reviewed-on: https://gerrit.libreoffice.org/58951 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit d2d996db4806e84ae0bf6aef1c285b498f2d2867) Conflicts: sw/qa/extras/layout/layout.cxx Change-Id: Ifab220e582439d2e757b5645f3167b55a051a379 Reviewed-on: https://gerrit.libreoffice.org/59686 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-08-28tdf#96469 Export Data Point properties in Charts on DOCX/XLSXBalazs Varga
If the color or other property of a datapoint in the chart deviates from the dataseries property, this patch will write it into a separate dPt tag and fixing the lost properies during OOXML export. Reviewed-on: https://gerrit.libreoffice.org/58806 Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl> Tested-by: Jenkins (cherry picked from commit 15035b98dc694bde4c4073fa75bdd2ce9d7e6670) Change-Id: I3d975675ac3691fcafe76de16e46851561eb2807 Reviewed-on: https://gerrit.libreoffice.org/58807 Tested-by: Jenkins Reviewed-by: Balazs Varga <balazs.varga991@gmail.com> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-08-24tdf#117426 don't crash is infobar is disposed in preview viewCaolán McNamara
Change-Id: Iff2dece2ea5f65c5d0896af888e05703ae709c65 Reviewed-on: https://gerrit.libreoffice.org/59520 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-08-23Resolves: tdf#119402 +- typo sign flipEike Rathke
Regression from commit 667aa6ade94a4dee441868d21db037e42c871932 CommitDate: Wed Jul 19 20:13:58 2017 +0200 Avoid temporary Date and normalization that introduced a sign flip from + 5 - eDay to + (5 + eDay) instead of + (5 - eDay) Change-Id: I28194296b20552135e6abd24eb9eefe8634ce7c0 Reviewed-on: https://gerrit.libreoffice.org/59461 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit cadd6c595b250b3ce0025a2a09c160eaae483d5a) Reviewed-on: https://gerrit.libreoffice.org/59475 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-08-23Resolves: tdf#119399 add es-VE currency Bolivar Soberano VES Bs.S.Eike Rathke
Introduced on 2018-08-20 Change-Id: I1b10a0f3b2ff8037310e7cba9caceaacb0858463 Reviewed-on: https://gerrit.libreoffice.org/59462 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit 0e9bdde3c07500abb13c72d2f6bec07aae6848da) Reviewed-on: https://gerrit.libreoffice.org/59469 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-08-22Resolves: tdf#118983 do not expand range if sheet references not affectedEike Rathke
Change-Id: Ib207d3723ce1d370a953e652957aaed399affc9c Reviewed-on: https://gerrit.libreoffice.org/59255 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit da0dc858fc05e7f1d6a60ca61f722044e688d4f8) Reviewed-on: https://gerrit.libreoffice.org/59272 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-22Do not convert YMD date order to YDM and vice versa, tdf#107012 follow-upEike Rathke
Change-Id: I6362caae4dd0764a5f99f1b0453c17ecde4b53f1 Reviewed-on: https://gerrit.libreoffice.org/59213 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins (cherry picked from commit a4c9e4539ee82c409add42e68329d4eb1100d62f) Reviewed-on: https://gerrit.libreoffice.org/59244 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-22tdf#119326 crash when adding "Windows Share" File resourceNoel Grandin
this was a regression from commit ce43d0ae9279edbf1ad108fe0d8325327a038d49 use consistent #define checks for the Windows platform where I converted #ifdef WIN to #ifdef _WIN32 But that was already dead code at that point since we did not define that preprocessor constant anywhere. Change-Id: Ieadafd61fada05fc19d04d83992fba7c42969daa Reviewed-on: https://gerrit.libreoffice.org/59402 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 82034b04e81b74a048595b0eac0f73581ecbc9e4) Reviewed-on: https://gerrit.libreoffice.org/59422 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-21Resolves: rhbz#115937 virtual device leakCaolán McNamara
windows runs out much sooner than the other platforms Change-Id: I8ffbe32babf8854580150edfe741b03fd43e4326 Reviewed-on: https://gerrit.libreoffice.org/59408 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-08-21ofz: check sequence length before useCaolán McNamara
Change-Id: I137a9de49c5a73eb5f277dc1519e5e036abba31c Reviewed-on: https://gerrit.libreoffice.org/58947 Tested-by: Jenkins Reviewed-by: Andras Timar <andras.timar@collabora.com>
2018-08-20ofz#9917 use a WW8SprmIter to find the sprmCaolán McNamara
extend WW8SprmIter to support the needed paramater match feature and drop the custom WW8PLCFx_SEPX::HasSprm logic Change-Id: I5893e04402ed03493add398f0939a578807561ef Reviewed-on: https://gerrit.libreoffice.org/59120 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-17tdf#119128 toggle INSERT/OVERWRITE is brokenMaxim Monastirsky
Regression of 632bc11ce8fab1c4046ab24810b90a7ce9ac5914 ("tdf#117017 Pasting into the formula bar shouldn't retain formatting"). Toggling the overwrite mode sets the EVControlBits::OVERWRITE bit from inside the editeng keyboard handler, so make sure to not override it. Change-Id: I2b5e3fe9cb885ed20e7528fdfe2fd59f5ef05f42 Reviewed-on: https://gerrit.libreoffice.org/58658 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com> (cherry picked from commit 92a4e4eac7520541a433e40836cafa4e29edf47f) Reviewed-on: https://gerrit.libreoffice.org/58718 Reviewed-by: Eike Rathke <erack@redhat.com>
2018-08-17Related tdf#118547: Lock mark on protected sheet tabJulien Nabet
Fix opposite case, see https://bugs.documentfoundation.org/show_bug.cgi?id=118547#c10 Reviewed-on: https://gerrit.libreoffice.org/59035 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit d064ced9e9db3f924dd954b86c40f21addab1c68) Change-Id: I2c4e55f8929b1979e71a4040dfac1ba7cff51aeb Reviewed-on: https://gerrit.libreoffice.org/59041 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins
2018-08-16tdf#117795: not all elements have ChartFontName propertyJulien Nabet
See bt https://bugs.documentfoundation.org/attachment.cgi?id=144114 In this bugtracker we tried to apply a change of fontname on reportdesign::OFixedLine Change-Id: I60ee5ca9f967fc71939e2f57ecd9de7edd680958 Reviewed-on: https://gerrit.libreoffice.org/58895 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 3512079dc42a6472136f9c229fc9ea0b0033ebf9) Reviewed-on: https://gerrit.libreoffice.org/59151 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-15outer loop unrelated to inner loopCaolán McNamara
since original checkin of... commit 9cddf9da7fb256418e1bc3b4719abb55e3b0604c Date: Tue May 22 15:33:44 2007 +0000 INTEGRATION: CWS chart2mst3 (1.1.2); FILE ADDED ... 2006/12/13 12:31:03 tl 1.1.2.38: #i71244# update charts in writer where I think this LockUnlockAllCharts chart2 loop was modelled on the previous chart[1] styles loop of e.g. DoUpdateAllCharts which loop over tables. chart2 objects are unrelated to these tables, so remove the outer loop, which then means the ofz#9689 ofz#9856 ofz9874 crashes that made me look at it will get fixed Change-Id: I7d7ba0a2aa257b5aa399f20d902f01306fbaecff Reviewed-on: https://gerrit.libreoffice.org/59112 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-08-15tdf#117127 crash on inspecting value describing a tableCaolán McNamara
since... commit f86d0413f7cedf096b285c2eb6698653dd99c21e Date: Mon Mar 30 01:26:21 2015 +0200 SwXCellRange:: and SwXTextTable::getDataArray() do the same which used to have more checks than its replacement Change-Id: Id931882ef7c749ffa18ef3474e3e661ba8614ab0 Reviewed-on: https://gerrit.libreoffice.org/58978 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2018-08-15tdf#119141 Revert "sc htmlimp: non-global sheet range names"Justin Luth
This reverts commit 5720c85ccea9f1481bd604b806c5be728e59a13f, which was made in response to the suggestion in comment 6 of bug 114487 and backported to 6.0.6. But ScAreaLink::FindExtRange doesn't bother to search the local rangenames, and the Links to External Files dialog also doesn't give non-global variables as options. Since this was just a "logical" change, simply revert it to repair the regression. Any attempt to support local rangenames is something bigger that isn't appropriate for backport to stable. Change-Id: I8bd4dcc6492da2712e13b2e54cf81609cdc5936e Reviewed-on: https://gerrit.libreoffice.org/58761 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 1597dbb5ba5d68b5807236c1d045f5215f221c91) Reviewed-on: https://gerrit.libreoffice.org/59065 Tested-by: Jenkins
2018-08-15tdf#115086 crash in assignLabelsToDataSequenceCaolán McNamara
since... commit c45358e928b9b9419bba10a0fcb661696cb7647a Date: Mon Apr 24 00:09:08 2017 +0200 preserve "Total" label on round-trip, remove code duplication Change-Id: I83ed20e1cab8d67f2f5aedcaf862756d9548bf9f Reviewed-on: https://gerrit.libreoffice.org/59062 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-08-15Resolves: tdf#118609 crash in calc after some manipulation through basicCaolán McNamara
Change-Id: I518b15359b29c845604d2e9cde64bdb637078ba1 Reviewed-on: https://gerrit.libreoffice.org/59054 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-08-15xmlsecurity: nsscrypto_initialize: try to avoid profile migrationMichael Stahl
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.35_release_notes NSS 3.35 and later will automatically migrate migrate profiles from the old "dbm:" BDB format to the new "sql:" SQLite format. The new format can be read by NSS 3.12 and later, which is old enough that it can be assumed to be available. However LibreOffice still shouldn't migrate the profile on its own: LO typically uses a Mozilla Firefox or Thunderbird profile, and if it is a system Firefox with system NSS libraries, then it's probably a bad idea for LO to migrate the profile under Firefox's nose, particularly considering the "partial migration" scenario if the profile is password-protected. Try to avoid this by checking if the profile is the old format and explicitly using the "dbm:" prefix to prevent the migration. Change-Id: I06480522f830ce74e2fb7bf79fee84ad80979b82 Reviewed-on: https://gerrit.libreoffice.org/58756 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 61688aa1abd9db9adbb8dc5d5aacc6269b21fd27) Reviewed-on: https://gerrit.libreoffice.org/58974
2018-08-15nss: upgrade to release 3.38Michael Stahl
Fixes CVE-2018-0495 and "the ASN.1 code". (Remove one hunk of nss-android.patch.1 that should be obsolete with the current Android toolchain baseline (but that hunk didn't exist in libreoffice-6-0 or older anyway).) Change-Id: I5516edec17b72f53acd2749e8840805eead077bc Reviewed-on: https://gerrit.libreoffice.org/58697 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3ef76067bfa1f9f60ec3989bd6b40a5760137903) Reviewed-on: https://gerrit.libreoffice.org/58722 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-08-15tdf#119234 OOXML Shapes from Word fail to renderNoel Grandin
regression from commit 65e4a776e8315fd61fd67ad00d28985b11f0b79e simplify some OUString::copy calls I got the params switched around Change-Id: I68da0ae681f2b886e35f74bd72de0c482c843ae9 Reviewed-on: https://gerrit.libreoffice.org/58986 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit df71ea1b01c3fd35d959053c84f615f661b69f8a) Reviewed-on: https://gerrit.libreoffice.org/59000
2018-08-14Resolves: tdf#117069 crash double clicking in certain chartCaolán McNamara
Change-Id: I4506a3517eff7f73cf793195e9d605d450b84fda Reviewed-on: https://gerrit.libreoffice.org/58997 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins
2018-08-08sw: fix ignored frames in AppendAllObjs()Michael Stahl
The problem is that AppendAllObjs() doesn't check if MakeFrames() actually created frames, it just assumes success. If there are frames anchored in frames, then it could go through the circular_buffer, find a dependent frame before its anchor frame, unsuccessfully call MakeFrames(), then call MakeFrames() on the anchor frame, and then the vector is empty. A surprising aspect is that push_back on a boost::circular_buffer will silently pop the first element if it's already "full". Possibly this is what caused tdf#112447. 1. insert section 2. in paragraph in section, insert frame 3. repeat 2 4. drag anchor of frame 1 into body of frame 2 5. edit section, click hide 6. edit section, un-click hide 7. only one frame is displayed (regression from 575e222a1742918be052f2b716ddf57ce0008404 and/or ce2fce9a41729774689080c8b5552b60c2e6ee2d) Change-Id: Ie782252ac388524dfb083f655320a50e95239b24 Reviewed-on: https://gerrit.libreoffice.org/58676 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 31e66bd07c1082bb375be8aaf7835f019351d9bb) Reviewed-on: https://gerrit.libreoffice.org/58680 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-08-07forcepoint#69 ditch any unclosed m_pPosAfterTOC before dropping cursorCaolán McNamara
Change-Id: I6b56a48f5449b25fe3bdc2e02d3885388b0da74f Reviewed-on: https://gerrit.libreoffice.org/58498 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
generated by cgit (git 2.34.1) at 2024-06-26 01:31:37 +0000