summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-12-05Bump version to 6.0.8.2feature/cib_contract138bSamuel Mehrbrodt1-1/+1
Change-Id: I87c43774689b6722e1a1ad1dcb9cebf40752081f
2018-12-03Fix unnecessary wrong downcastStephan Bergmann1-1/+1
...from ScFormatEntry to ScCondFormatEntry instead of just ScConditionEntry, introduced with 3f614f431475e1bf3bb3bbeac59b0681309628b7 "tdf#95295: don't add duplicate conditional formats". Caused e.g. CppunitTest_sc_bugfix_test to fail under -fsanitize=vptr, when trying to downcast a ScValidationData. Change-Id: I913076d3538bafbdb2ac57b6bb1bd89199b048a6
2018-11-30tdf#95295: don't add duplicate conditional formatsMike Kaganski5-48/+127
This tries to make sure that on copy, any conditional formatting that has same entries (conditions and formats) as another condition in the table, is not appended to the conditions list, but updates existing condition's range. This should prevent multiplication of entries with duplicating conditions and formats, and fragmenting ranges. Existing unit tests had to be adjusted, because they had ensured exactly that behaviour that is changed in this commit: that new items are added to the list, and e.g. multiple elements are created when a single cell is copied to a range. Change-Id: I46adb883bab7249571b912d56fea0c7918b3516d Reviewed-on: https://gerrit.libreoffice.org/45656 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2018-10-29Bump version to 6.0.8.1Samuel Mehrbrodt1-1/+1
Change-Id: I5b6949214031817471900b929e1281eba11c47c6
2018-10-29unopkg: Log deployment output with the same logger as unopkgSamuel Mehrbrodt1-75/+11
This prevents overwriting the existing logfile by using the same logger as unopkg does. Reviewed-on: https://gerrit.libreoffice.org/62393 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 5bd0212b54ea8c98fe401e8b1ad6d0b626a4b7e1) Change-Id: Iaad4c5b99a4f428d3a4ad8a046c88404aecb5652 (cherry picked from commit ad9d295c13d4c176643a26898f1b697b2a406ee7)
2018-10-29unopkg: Write to console when no UNO availableSamuel Mehrbrodt1-1/+2
Change-Id: I159b7e85f53e33c5359cca83aa958387d888f6a2 Reviewed-on: https://gerrit.libreoffice.org/62391 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit d2a4fac09bc6d17b85fd34a3f0777ecc5e3bd286) (cherry picked from commit 40c4c0f17ad5871861b64014fc7f8ae04d3f8971)
2018-10-29Introduce SimpleTextFormatter and format unopkg output using itSamuel Mehrbrodt6-2/+169
This will write log messages as plain text (no timestamp and other stuff like PlainTextFormatter). Warnings and errors will be prefixed accordingly. Reviewed-on: https://gerrit.libreoffice.org/62370 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit e4583f1ce81fc76dbfe55bcfd86d63ffe3518e5b) Change-Id: Id82512d7dd3907a4c7cd69a963a375966189dc20 (cherry picked from commit f5b786e8749ce5622138f800ca620942e8921854)
2018-10-29Log unopkg errors to log file if requestedSamuel Mehrbrodt3-41/+62
Before only the output generated by extension add/remove/... functions were logged to file, but not the error messages of unopkg itself. Change-Id: I4451aa51e2877ae48c453ee4791e36d970832567 Reviewed-on: https://gerrit.libreoffice.org/62369 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit e8d130e7c6b2ff2a941372f386ee46fe8a95f218)
2018-10-29Update .gitreviewSamuel Mehrbrodt1-2/+1
2018-10-29Sync extension registration on startupSamuel Mehrbrodt1-3/+6
There are cases where the extension registration becomes invalid (empty rdb files) which leads to extensions not starting up, although installed and active. Syncing extension repos on startup fixes that. The performance impact is negligible (1ms in my measurements). Change-Id: I10475ce6a054b43c4591b17a8486648ca6a30068 Reviewed-on: https://gerrit.libreoffice.org/61943 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 8959bb300b05be9fafbf30e553b35fb517bdf786)
2018-10-29Add entries to switch back to std toolbars to hamburger menuKatarina Behrens2-0/+8
Partial backport of 0d3d7be7632902ebc4844f12dfc820f05be2021a with less changes, not all of them are wanted Change-Id: I34d44a7c7989f5b7d5ce74a7b36280dff444d680
2018-10-29tdf#117549 crash with focus setting during disposingCaolán McNamara1-1/+4
Change-Id: I1ab492a4c6fab89debac90224a5f78102d33d664 Reviewed-on: https://gerrit.libreoffice.org/54122 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 3aa01898e58c4a3bea64fea33778ac455f1f5253)
2018-10-29tdf#119235 svx,sd: fix drag&drop from ColorBarMichael Stahl5-39/+52
This was using the SfxPoolItem serialisation of XATTR_FILL* items, where only XFillColorItem and XFillStyleItem were actually used; the binary serialisation was removed without being aware of this feature. Fix this by using uno::Any instead, rather than reviving the binary serialisation. Also change the clipboard format strings, just to be safe. (regression from 97b889b8b2b2554ce33fd6b3f0359fc18f39832d) Change-Id: I1828621a9aae606a1ca47835eef608062efe64a0 Reviewed-on: https://gerrit.libreoffice.org/62455 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 0a6813ad5d57d0df72562c797a8b0581bfd65a11) Reviewed-on: https://gerrit.libreoffice.org/62472 Tested-by: Jenkins Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
2018-10-28tdf#120376 sd: fix duplicated styles on copy/pasteMichael Stahl1-2/+3
Unfortunately the comparison was inverted, so a style is copied iff it already exists, which is clearly the reviewer's fault... (regression from 57db6e24b5ad43d447c30e44a112c74c7e75b46b) Change-Id: I3425982feb08e980eca9243cc16120897b65a70f Reviewed-on: https://gerrit.libreoffice.org/62436 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit be9f3db2306150a37ef18e4ccc8d8f4a1934c5c1) Reviewed-on: https://gerrit.libreoffice.org/62452 Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de>
2018-10-26tdf#120807 check for valid ImplGetWindowImpl()Jan-Marek Glogowski1-1/+1
Change-Id: Ia1135d11990abc303849bd1b6a549c82008c79de Reviewed-on: https://gerrit.libreoffice.org/62260 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit db0051744330d82986e8f2629a027bc4a5dc1b4a) Reviewed-on: https://gerrit.libreoffice.org/62280 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-19keep pyuno script processing below base uriCaolán McNamara1-2/+28
Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7 Reviewed-on: https://gerrit.libreoffice.org/61969 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2018-10-18update creditsChristian Lohmaier1-1887/+1921
Change-Id: I666805e38c40826328d8c4226c394d4c3072b2a7 (cherry picked from commit c3eb1c85f95168f8e84b8f655c839eff23c7e98a)
2018-10-17Update git submodulesChristian Lohmaier1-0/+0
* Update translations from branch 'libreoffice-6-0' - update translations for 6.0.7 rc2 Change-Id: I2fbf6583f2f1c8cf73077a0325bfa0be3e7de893
2018-10-16Resolves: tdf#93372 format table in base is ignoredCaolán McNamara1-2/+20
since... commit b4bbb5e5d7b31caad2fbcc00382ad27df3c81001 Date: Sun May 17 22:56:46 2015 +0900 refactor how font, fg. and bg. are applied in widgets/controls revert the relevant piece, in this case there are two Windows/Contexts getting their settings manipulated, rather than the usual one Change-Id: I0a228aee6aaf1f58b2235fccf14dc63ffa96dd2d Reviewed-on: https://gerrit.libreoffice.org/61317 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0be3a5eea3089c2b63cc821ffb282fd4ab8ec455) Reviewed-on: https://gerrit.libreoffice.org/61525
2018-10-16tdf#90376 revert the dock windows' Idles to TimersJan-Marek Glogowski1-19/+17
The dock windows' Timers were converted to Idles in commit eef25e0e7c03 ("changed timers to idles"). Since the Idles poll the mouse buttons, they starve all lower priority events. From the comment in ImplDockFloatWin2::Move, this is a hack to get the mouse release event from the window decorations in X11. Change-Id: Ibba3c58dd8b3d95dbd9296cc111ab32968bee230 Reviewed-on: https://gerrit.libreoffice.org/59590 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit afd49c198769b5e7fc01a68ce7a6847aa0d0ddd8) Reviewed-on: https://gerrit.libreoffice.org/60720 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit e3a745f7604b084a7bb5fb6f18d5b50b5e137a98) Reviewed-on: https://gerrit.libreoffice.org/61466
2018-10-15sw: fix invalid cast in SwEditWin::RequestHelp()Michael Stahl1-1/+1
This results in a garbage OUString. Change-Id: I03b8030a812d7016df5c29f1341749fbdedf1729 Reviewed-on: https://gerrit.libreoffice.org/61652 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit bf0276f0b53c01ac434fef88e97f6b0dd4c41787) Reviewed-on: https://gerrit.libreoffice.org/61674 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2018-10-12ofz#10879 stay inside sSecStr boundsCaolán McNamara1-2/+2
Change-Id: I0ca70cdb9b80305c5339668d65d2c4c9977e7160 Reviewed-on: https://gerrit.libreoffice.org/61606 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2018-10-03bump product version to 6.0.8.0.0+Christian Lohmaier1-1/+1
Change-Id: Ida05fd143fbb2a5f8f1a307e888daa4144d45ee5
2018-10-03Update git submodulesChristian Lohmaier1-0/+0
* 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 Rathke2-4/+5
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 Glogowski2-13/+11
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 Glogowski2-15/+35
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 Glogowski5-26/+53
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 Glogowski5-35/+37
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 Vajna12-2/+167
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 McNamara1-1/+1
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 Mehrbrodt3-0/+12
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 McNamara1-2/+2
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 Lohmaier1-1566/+1561
Change-Id: I1a8c8bc20ee7e97b47f0602dcfaa3cb1b771de8f (cherry picked from commit bb26bd6148ef7c60d6280b4848c017ba63775242)
2018-09-18tdf#119881: Check if Unity/Gnome is separated by colon in XDG_CURRENT_DESKTOPXisco Fauli1-5/+16
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 Vajna3-4/+39
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 Kara1-9/+9
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 Funk1-1/+2
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 Yesil1-0/+15
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 Lohmaier1-1859/+1890
Change-Id: I946580363eb272f95694b000d6daa997e761285d (cherry picked from commit 01b19afeceb417e258df771677c65c36210a7c4d)
2018-09-06upgrade curl to 7.61.1Thorsten Behrens1-2/+2
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 Bergmann2-0/+60
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 McNamara1-2/+6
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 Weghorn1-1/+1
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 Yesil1-0/+1
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 Vajna3-1/+61
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 Varga4-0/+91
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 McNamara1-1/+1
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 Rathke1-1/+1
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 Rathke1-1/+8
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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 16:26:07 +0000