summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-06-01Version 5.1.4.1, tag libreoffice-5.1.4.1libreoffice-5.1.4.1Christian Lohmaier3-0/+0
Change-Id: I104eb6e3f6e3532afec02de4ce124f90bc7898c5
2016-06-01bump product version to 5.1.4.1Christian Lohmaier1-1/+1
Change-Id: If4e88126b366e8f9b705125277d3e03653ec808c
2016-06-01Branch libreoffice-5-1-4Christian Lohmaier4-1/+1
This is 'libreoffice-5-1-4' - the stable branch for the 5.1.4 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.1.x release, please use the 'libreoffice-5-1' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Id30f049acb8c36892bbec68d34e11626da9768b7
2016-06-01tdf#99643 OLE automation bridge: fix 64-bit pointer conversionsMichael Stahl6-11/+13
XBridgeSupplier2::createBridge() is always called in-process and should therefore expect and create Anys with native-sized encoded pointers, so use sal_uIntPtr. Change-Id: Ia757ff38568b07de8085a1a9d323d806bcca0f63 Note: Currently all calls in LO code are with source=UNO, target=OLE. (cherry picked from commit c11e60f11f34b12bf73a08a96634202a8d3aef0c) Reviewed-on: https://gerrit.libreoffice.org/25740 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jenkins <ci@libreoffice.org>
2016-06-01Resolves: tdf#93386 crash when closing a Database with macro editor openCaolán McNamara1-16/+38
(cherry picked from commit 9a0fd9c7f424fb787e1fae2113f0a42f0895a1e9) (cherry picked from commit 9f21b660fe2ed3805614be5d782137554e32e7d2) Change-Id: Id3ecee744cb10f539f2b57e83a4b6e4c7744d3d5 Reviewed-on: https://gerrit.libreoffice.org/25737 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jenkins <ci@libreoffice.org>
2016-06-01update creditsChristian Lohmaier1-1444/+1472
Change-Id: I0932fb77c37c9e48eb5ecb4b26ee44553b8368a5 (cherry picked from commit cbf36dd473fdc9e8d8b78c9e9317836a7cbbc6c7)
2016-05-31tdf#96097: Can't save a doc with signed macro after autosave/save a copyGuillaume Smaha1-3/+0
Change-Id: Icc886a8d228cb786c6f318cfa2556ef113c553eb Reviewed-on: https://gerrit.libreoffice.org/24081 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org> (cherry picked from commit d7ef7e3e4bc9c6277e5b2d08c2657fea8cf0e639) Reviewed-on: https://gerrit.libreoffice.org/24461 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2016-05-31Updated coreChristian Lohmaier1-0/+0
Project: translations 0e263bb2844639929901eec6d9643ba036a08a87 update translations for 5.1.4 rc1 and force-fix errors using pocheck Change-Id: Ie5bedb80db908a0279c44ed20b83dc93c4f63136
2016-05-31tdf#100160 - Changing OpenCL state doesn't update sheetMarco Cecchetti8-0/+63
now we re-check for vectorization state of formula token each time OpenCL is enabled or disabled Change-Id: I652397dd154f5fbf788cb511c70e53a47cc94293 Reviewed-on: https://gerrit.libreoffice.org/25727 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2016-05-31tdf#100159: On Windows, compile GL shaders in advance, disable GL on failureTor Lillqvist7-12/+120
This is a combination of multiple commits in master, adapted for this branch as necessary: Don't claim to be reading a file before trying to open it Avoid redundancy: The same information was logged in readProgramBinary() Use VCL_GL_INFO here Failing to open a cached shader binary is a no reason for a SAL_WARN. It is normal that they don't exist when first trying, that is the very nature of a 'cache'. Move exithelper.h to include. We will want to use EXITHELPER_NORMAL_RESTART in vcl, too. If the shader compilation or loading of an already compiled shader fails, disable OpenGL in the registry and exit with the EXITHELPER_NORMAL_RESTART status. The wrapper process will thus run soffice.bin once more, and this time OpenGL will not be used. Change-Id: I54d92f150975d3fa72d93f3f679b16c90ee38f02 Reviewed-on: https://gerrit.libreoffice.org/25708 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2016-05-31tdf#84411 - OpenCL: S/W interpreter throws std::out_of_range errorMarco Cecchetti1-0/+4
The problem is that in a array fragment, row start can be beyond data row end. Change-Id: I33658c87c21d1be237f4675241e3eabdd4ec7058 Reviewed-on: https://gerrit.libreoffice.org/25728 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2016-05-31Resolves: tdf#63272 [fi-FI] percentage format with no-break spaceEike Rathke1-2/+2
Caveat, the space needs to be quoted, otherwise it is taken as the group separator that when trailing a number divides the number by 1000. Change-Id: Ic24b90d500a6c9351ef7463b2b1adf9d066442df (cherry picked from commit 5868d927bccfc9594c4f791d0800337a0ce60c18) Reviewed-on: https://gerrit.libreoffice.org/25738 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2016-05-31tdf#93403 check for changed DataSource on all Controls on form reloadLionel Elie Mamane2-2/+13
1) OBoundControlModel: when reload() asks us to connect to database column, redo it even if it was previously done. 2) FmXGridPeer: when getting Reloaded event that we subscribed to (and specifically from frm::ODatabaseFrom), pass along the event to all columns before we treat it. The columns (controls) are themselves subscribed to it, but they may get the event after us, which means our treatment still uses stale data, which we continue to display. The column controls should continue to subscribe by themselves for the case that they are not in a grid, but direct children of the form. Change-Id: I0cbcf2dc792e8650157a69ddc414d755de0e549a Reviewed-on: https://gerrit.libreoffice.org/25549 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2016-05-31we need the space="preserve" also for formatted strings, tdf#96912Markus Mohrhard1-1/+1
Change-Id: I6e245de697c1c42acd916beb75d4d157b2962a9a Reviewed-on: https://gerrit.libreoffice.org/25580 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
2016-05-31valgrind: Invalid read of size 8Caolán McNamara1-0/+1
saw this in passing checking something else ==12972== at 0x6DEF40B0: rtl::Reference<PlacesListBox>::get() const (ref.hxx:169) ==12972== by 0x6DEEF221: VclPtr<PlacesListBox>::operator bool() const (vclptr.hxx:189) ==12972== by 0x6DEED3DA: CustomContainer::GetFocus() (iodlg.cxx:429) ==12972== by 0xD9EC83B: vcl::Window::CompatGetFocus() (window.cxx:3734) ==12972== by 0xD93A604: vcl::Window::ImplGrabFocus(GetFocusFlags) (mouse.cxx:383) ... ==12972== Address 0x2e4b4690 is 288 bytes inside a block of size 424 free'd ==12972== at 0x4C2D22A: operator delete(void*) (vg_replace_malloc.c:576) ==12972== by 0x6DED9F14: SvtFileDialog::dispose() (iodlg.cxx:518) ==12972== by 0xDB04B1F: OutputDevice::disposeOnce() (outdev.cxx:161) ==12972== by 0x6DED1954: VclPtr<SvtFileDialog_Base>::disposeAndClear() (vclptr.hxx:208) Change-Id: I702eab8dbcf07885e4a3415ace6706c25854174e (cherry picked from commit 5b342e10cbec2487085216346c055875a8eb9657) (cherry picked from commit 543822b6b661ebbffad9339b5395ea810ba75de2) Reviewed-on: https://gerrit.libreoffice.org/25670 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2016-05-31tdf#100092: Deterministic scheduling to prevent unpredictable behavior.Jan Holesovsky5-9/+67
Low priority idles can fire more or less randomly, and consequently two consequent runs of LibreOffice differ in the amount of the idles that have been performed during an operation. This commit adds a possibility to turn on a 'deterministic mode' where two subsequent runs of LibreOffice trigger about the same amount of events when they perform the same set of operations. Change-Id: I92566ef4eee20e7d604cfd48f01c4df30c77e653 Reviewed-on: https://gerrit.libreoffice.org/25712 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2016-05-31tdf#98226: fix undo of table AutoFormatMichael Stahl6-11/+29
The new call to SwTable::SetTableStyleName() was not recorded in SwUndoTableAutoFormat and hence persisted even after Undo. (regression from 73f4a06c0bce51c7c8b9ae9adfdc7ffac27d06b4) (cherry picked from commit 7b042d2865c5bb2c2dde1dd47de124bc0df61ae8) Change-Id: Ia7f769dafa62f02ff8e4b0596b48266190c7a69b Reviewed-on: https://gerrit.libreoffice.org/25713 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-31Resolves: tdf#92695 protect both branches against missing ToolItemCaolán McNamara1-8/+7
(cherry picked from commit ab0dc9524a36a394e97df9499bf1f5e4b94cfdca) (cherry picked from commit c845c7bf597caa11b1617ab71029c499819028bc) Related: tdf#92695 we already have ImplGetItem from mnHighItemId here no logic change intended (cherry picked from commit c380f0fc125f50ad8efca2ce032d3d2a67d78f0a) (cherry picked from commit df668868917d1dac11d49f1f650c43666fadea54) Change-Id: Ide54fddf7b217e65a405bd80853d5302a419f046 a53a21db56c857e1274c60f846fc955fef9e3dfb Reviewed-on: https://gerrit.libreoffice.org/25711 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-05-31tdf#96516 do not increment position counter when an entry is removedLionel Elie Mamane1-1/+3
Change-Id: I81a4455df1fd5962d0362f4e5fa3396764a0ae5a Reviewed-on: https://gerrit.libreoffice.org/25548 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-31Don't use pInsert after it has been movedStephan Bergmann1-1/+1
Regression introduced with 38ea2d0ecc1d59844f9371ae6da7980c4e3a9e10 "sw: replace boost::ptr_vector with std::vector<std::unique_ptr>". Change-Id: I15f556319693c4728812d5ffd5002d0eba58ae82 (cherry picked from commit 9d8184b34e9e4c53f93e4d44ac53590e9231c520) Reviewed-on: https://gerrit.libreoffice.org/25710 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-05-31Resolves: tdf#97158 CopyOneCellFromClip() does not handle multiple sheetsEike Rathke1-0/+4
... so check that and bail out to let the remainder of CopyFromClip() handle it. (cherry picked from commit dc9eac5a5f4f247ba5efb67931ffde61f2c8d5b6) 9d07f557572bdeaeda8e923525c8895d79fc0d22 f65b29ff13211449144455668014a80aa8b331a3 Change-Id: I9d139de905fd108ae41fed79a38860058525272c Reviewed-on: https://gerrit.libreoffice.org/25682 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-31prevent out of bounds string accessEike Rathke2-12/+15
Yet another reminiscence of String to OUString conversion.. where the terminating NULL-character was obtained and SvNumberformat::InsertBlanks() effectively did nothing. Could be triggered already by entering an '_' underscore character as number format code, which is a place holder for blanks of the same width as the following character, which there isn't then yet. Change-Id: I0534e1417d4bd35e9e7ed4bd0170b9ea3b5fb575 (cherry picked from commit c75ce37560c05271ba56c9dd0d98c5001e83cc2f) Reviewed-on: https://gerrit.libreoffice.org/25693 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-05-30tdf#100134 xmloff: only update the progressbar twice for every percentMiklos Vajna2-3/+9
This restores the state before commit e1b78d36008d1fd188ca8dc154ad069d3476520c (#95181#; call the setValue method of the XStatusIndicator as often as possible to enable reschedule, 2001-11-26), which doesn't seem to be necessary anymore, perhaps due to the current scheduler that has priorities. Rather than a plain revert, still allow the progressbar to jump back, as that seems to be used relatively frequently. So just filter out the calls that would increment the value, but only with a small difference, compared to the shown value. (cherry picked from commit 20ad9893d5d3be13d8aa17764e483afaa083b5c0) Change-Id: I7136b20f1c64e267b0b4a35bbe2564e5163d9468 Reviewed-on: https://gerrit.libreoffice.org/25666 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2016-05-30tdf#100080 set unused shader attribs with values, fixes GL on AMDTomaž Vajngerl4-28/+78
AMD drivers don't work well if a shader has a defined but not enabled shader attributes. For this reason we need to make sure that all attributes are set to some value even if the shader doesn't use that attribute. Intel drivers, on the other hand, crash if you enable an attribute and don't set it (set it to null) - so we can't use this workaround. (cherry picked from commit fdcd13c1c2b8b9fbc3480c8fa92920d8c8d4e5a7) Change-Id: If0abcfb664c3b71bb657b9a810d2d2a14fe5d9b4 Reviewed-on: https://gerrit.libreoffice.org/25592 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30tdf#98666: Don't cache progress bars eitherTor Lillqvist1-0/+1
Fixes the bug only partially, though. (cherry picked from commit 483b4d6bfdb4800811e87a07f25b24e3f6019e38) Change-Id: I262f671659e8ad0a3ecd735f5b36362c4119b26c Reviewed-on: https://gerrit.libreoffice.org/25655 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30tdf#100115: _nColId is sal_uInt16Julien Nabet2-4/+4
like the other methods, so fix it in canCopyCellText + copyCellText Change-Id: I3395f8823602f0a1791908945e3dec5034d3d612 Reviewed-on: https://gerrit.libreoffice.org/25605 Tested-by: Lionel Elie Mamane <lionel@mamane.lu> Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu> (cherry picked from commit 634fd0016ef7396a782d28272852302841f37201) Reviewed-on: https://gerrit.libreoffice.org/25622 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-05-30Resolves: tdf#100097 dbaccess self-dnd depends on getting its own transferableCaolán McNamara4-9/+41
on drop that it set on drag. It does some uno tunnel foo to drag the data it needs back out of it in some grotesque fashion. So we have to follow the same style of hackery as under MacOSX to detect on drop that there is an active drag started by ourself and so use that active drag's transferable as the source transferable for the drop, rather that use the intermediate universal GtkDnDTransferable. Change-Id: I3c3a94416db908603bde8f15dc5b1c9d726b8dbd (cherry picked from commit 73f84ab139cb1d2564f9292fba08d69a0ab822c1) (cherry picked from commit 6f41a9b06219c2d8e176f84a5ae4b80b22dc9ce5) Reviewed-on: https://gerrit.libreoffice.org/25659 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-05-30tdf#99870 writer: don't delete selection with delete-commentJustin Luth1-0/+1
When using the keyboard to select text and then deleting a comment, all the text between the cursor and the comment would also be deleted. (Not necessarily the selected text, but everything from the point or the mark would be included in the delete.) Change-Id: Id15a00d112d118227bc4a34b5102bb09d8d167b0 Reviewed-on: https://gerrit.libreoffice.org/25651 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30Resolves: tdf#97839 a single character may be more than 1 utf-16 code pointsCaolán McNamara1-1/+1
Change-Id: Iba2460bfb9335615796db3f5e233b870a8d63339 (cherry picked from commit 847cdd8efd0662d61d288a4d944edc30e864d145) (cherry picked from commit f0e35cb2fb6f0f595d44c7a7c01ddaf60b19d642) Reviewed-on: https://gerrit.libreoffice.org/25638 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30Related: tdf#87967 valgrind reported invalid reads on 1 pixel wide bitmapCaolán McNamara1-5/+5
Change-Id: Iddd18280c780d8b9f5e11fcc2af80749917192c4 (cherry picked from commit a9d2302d4d0732a0c1203bbb7c0182b8de59403d) (cherry picked from commit 6fb88a0c67150a751f59ebcba5f5419b24e6f4a7) Reviewed-on: https://gerrit.libreoffice.org/25533 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30Resolves: tdf#97854 crash on deleting inner join relationshipCaolán McNamara6-63/+64
seems to be a regression from... commit 356bc0f697299e5fb6156ce25dc69845eaa6f9e6 Author: Michael Meeks <michael.meeks@collabora.com> Date: Wed Jul 1 19:03:55 2015 +0100 tdf#92434 - fix iteration, and remember to disposeAndClear. which is part of the VclPtr stuff so hold the connection by VclPtr when removing it from m_vTableConnection and only call dispose on it when _bDelete is true, not always. Change-Id: I38e65c6928499dc1e8bbf6b71e9901a4eaa5d913 (cherry picked from commit e55f83e1731e1031c63d8463b57c434cceb126e3) plus (easier to read as individual commits) Related: tdf#97854 confirm that on !bDelete there's a ref to the connection so that its not deleted on removal from the vector Change-Id: I6c1f7691ee415abf0f419fdd7fcf2341fe2bd1f3 (cherry picked from commit 3185d9b8fbaad56fc7170a277569b5e441d946f4) Reviewed-on: https://gerrit.libreoffice.org/25508 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30Resolves: tdf#97879 loop in style hierarchy on odt loopCaolán McNamara2-1/+7
Change-Id: I0098c434b89b6a57e8b888a4d4f643e4d0865d29 (cherry picked from commit e954697a9d39e40473fb9f59a791ccb7129e763c) Reviewed-on: https://gerrit.libreoffice.org/25498 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-30Resolves: tdf#98436 crash trying To create remote folder before connectedCaolán McNamara1-0/+3
Change-Id: I953167c9b78f9c9eba560390ecef7ccd8e5f1f68 (cherry picked from commit 7d397201060ba71a188b5ef9853984a635e70531) Reviewed-on: https://gerrit.libreoffice.org/25500 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-28Estonian localization of aboveWord and belowWordMihkel Tõnnov1-2/+2
Change-Id: Ie872c593c531b99360efe7fcf807e76cb88acb79 (cherry picked from commit 91244b95b7826ec5c1075c00e6b4013804c4ab2f) Reviewed-on: https://gerrit.libreoffice.org/25589 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2016-05-27Typo fixTor Lillqvist1-1/+1
Change-Id: Ibf279e723c11a4a5f62ce082938e723a46e40f6d Reviewed-on: https://gerrit.libreoffice.org/25541 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2016-05-26tdf#86282 handle both, base name and Sheet1, as external reference sheet nameEike Rathke4-32/+192
This is a combination of 4 commits. Resolves: tdf#86282 do not use file name as sheet name for linked documents ... and external references. (cherry picked from commit 43030487c45f49bccdfad987c60d9483b938ebac) tdf#86282 handle both, base name and Sheet1, as external reference sheet name While 43030487c45f49bccdfad987c60d9483b938ebac fixed things for older 'name.csv'#Sheet1.A1 references, loading documents that meanwhile stored 'name.csv'#name.A1 lead to #REF! when the external links were updated. Now recognize both, the base file name and Sheet1 name and set up one as the alias of the other, so both variants can be handled. (cherry picked from commit ec693d9b9df631605028271f62daa7dfbe8e273d) tdf#86282 switch to base name sheet name again for external references CSV ... now that we can handle both, a base name and Sheet1 name. For the following reasons: * Since 4.3 we write and expect the base name as sheet name for CSV. While 43030487c45f49bccdfad987c60d9483b938ebac switched that back to Sheet1 or its equivalent to be able to load older documents, a mixed environment of earlier and later versions gets confused by this. * The name Sheet1 can be localized and even customized by the user and thus fails to update/refresh in a different localized or customized environment. This also was already the case for all versions prior to 4.3 but apparently wasn't recognized or brought in connection with some possible failures when updating externally referenced CSV files. * Deriving the sheet name to be stored from the base name prevents all problems related to localized or customized environments, and keeps interoperability with all versions from 4.3 on. (cherry picked from commit d9e7a54809c88c4ac166630c11038188c8f50a6f) remove now moot comment, tdf#86282 follow-up (cherry picked from commit 386b284241a16d96eaf792e2385c41f57ce3d870) Change-Id: I6e23eeff39086091f13914a3f964aec1016a7de4 e9314e11be19c3316a06e10583777e2d5f5ec1b8 8d71b3ad6370747115ea419a21094b649326642c 7e720de93a5f47ca6a81addbb75c113dc2fe53f0 Reviewed-on: https://gerrit.libreoffice.org/25471 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-26tdf#74795 RTF import: handle row-level default cell marginsMiklos Vajna3-0/+88
(cherry picked from commit db1a4f8d1d44351ca65742d3d94371a0c0536ff2) Conflicts: writerfilter/source/rtftok/rtfdispatchsymbol.cxx writerfilter/source/rtftok/rtfdispatchvalue.cxx Change-Id: I5bdd7b8624a9e2ac1aef963ccc5ed457ebda3f84 Reviewed-on: https://gerrit.libreoffice.org/25493 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-26tdf#100051 Partially revert "loplugin:constantparam in sw"Miklos Vajna1-8/+4
This partially reverts commit 9585c8b8c8d8724cc1bad4a2060c828c15599929. Instead of removing the nCount parameters, make use of them in SwXTextViewCursor::go{Left,Right,Down,Up}. For the following testcase: a document with 1000 lines, and calling goDown(1000, true) the spent time goes from 4 secs to 1.8 secs with this for me. (cherry picked from commit cbe78f817da8db78d226b3ad2b1a10d0c2dcf188) Conflicts: sw/source/uibase/inc/wrtsh.hxx sw/source/uibase/uno/unotxvw.cxx sw/source/uibase/wrtsh/move.cxx Change-Id: I10351a6dbaa6d3fff883520c85701f60b05b4873 Reviewed-on: https://gerrit.libreoffice.org/25496 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-26Resolves: tdf#96244 get the right Writer window view for Formula windowCaolán McNamara2-4/+7
if you hit F1 and F2 together, then the help window is a writer window too (in disguise) so asking for the "active view" on processing the F2 in the real writer will get the help window as the active view, which doesn't match expectations. Take the view from the bindings, where its correct from when the event has been dispatched. Investigating a bit further, the F2 formula window only works correctly when its in an "active" window. So get the correct view from the dispatcher but only accept that view if its the active one. Change-Id: I2fd52ca6b68e887d34b07b70b830722f1d00b37a (cherry picked from commit 77e7dc648ebb8b7d946111e2be4dfdbba72840b2) Reviewed-on: https://gerrit.libreoffice.org/25446 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-26Resolves: tdf#99874 gtk3: all-black xbm cursorsCaolán McNamara1-7/+17
(cherry picked from commit 81a8d1250319023f6ca272e0b233ef638cae40f7) Change-Id: I1feca80dd75f7a09e05ac43293e8645da391a775 Reviewed-on: https://gerrit.libreoffice.org/25436 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-26Resolves: tdf#100024 CRASH when setting a background imageCaolán McNamara1-1/+1
possibly triggered by changes like... commit bb3671180eb7327be9ac178e0d8341322f63d72a Author: Caolán McNamara <caolanm@redhat.com> Date: Tue May 17 20:38:37 2016 +0100 Related: tdf#99523 NotifyPageEvent ultimately comes from HINT_PAGEORDERCHG... which is called for removepage, insertpage *and* change page number. e.g. ctrl+shift+end and similar *move* the page, in those cases not removing before adding results in duplicate pages/slides in the list, causing inconsistencies on what gets selected on undo which made things not get arbitrarily duplicated during page changes Change-Id: I0acf241947c9688f3512b54cc3d8f6892126495b (cherry picked from commit c5ab14e2bca0cc4fabd25b27f078a1c38fda4fa7) Reviewed-on: https://gerrit.libreoffice.org/25435 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-26CVE-2016-0718 and CVE-2015-1283 expat woesCaolán McNamara3-0/+794
Change-Id: I83691e616bf964db2cb1e708b57f65b92ea2697e Reviewed-on: https://gerrit.libreoffice.org/25401 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 b33fb0a8a09c2c383b5ed7915da52742cd457fec) Reviewed-on: https://gerrit.libreoffice.org/25407 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-26update creditsChristian Lohmaier1-1463/+1521
Change-Id: Ia4d4e0687e79d546876042beebea4eafe66d3f37 (cherry picked from commit 5b168b3fa568e48e795234dc5fa454bf24c9805e)
2016-05-25tdf#38097 min numerator/denominator at least 1Laurent Balland-Poirier1-3/+3
In <number:fraction> attributes min-denominator-digits and min-numerator-digits should be at least 1. Gnumeric can create file with 0 values Change-Id: I08ef51c23ce686136f51277671bf630807353484 Reviewed-on: https://gerrit.libreoffice.org/24670 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit a75aa73b2bf793faac1adb3b5f67e09d252d5fe9) Reviewed-on: https://gerrit.libreoffice.org/25449 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25tdf#95339 Extend test to distinguish minute/monthLaurent Balland-Poirier1-0/+4
Detect minute in user number format such as SSMM or MMHH Change-Id: Iadb29dabba167b8f59903ff05e7367857378738a Reviewed-on: https://gerrit.libreoffice.org/25222 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit c9ed6e832213129cc579c1c309ce9dbd3593c57a) Reviewed-on: https://gerrit.libreoffice.org/25448 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25tdf#61996 Skip quoted text in number formatLaurent Balland-Poirier1-5/+32
Quoted text should be detected and skiped before detecting conditions Change-Id: I1c78fed7f543fb335fbb8ec9ed50d9ab9dd10aa7 Reviewed-on: https://gerrit.libreoffice.org/24550 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 88a79589843efc24f8af99bd511a1fff0f7bebef) Reviewed-on: https://gerrit.libreoffice.org/25453 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25tdf#31449 Correctly test if fraction has no integer partLaurent Balland-Poirier3-2/+14
Test if fraction format has no integer part is modified to take into account all cases: ??/?? or ##/## and do not detect false positive like ? ??/?? Change-Id: Ia8677a5ad496e5df56ce6bf1290323555e46ba0a Reviewed-on: https://gerrit.libreoffice.org/24540 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 3beb146b34fa931e2d63f4738a3ae69fe286545f) Reviewed-on: https://gerrit.libreoffice.org/25452 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25tdf#97835 No decimal separtor for empty decimalLaurent Balland-Poirier2-14/+9
If decimal part is empty (with #) decimal separator should not be added. It was not removed if there was text after value. Change-Id: I891cad8b6bec0f27f4cef8aea80c5dad264f062d Reviewed-on: https://gerrit.libreoffice.org/24586 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 48435bfddf38de2b31df50e70438ef7946a0c3cb) Reviewed-on: https://gerrit.libreoffice.org/25451 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25opengl: use existing code for "legacy" polyline, polygon render.Tomaž Vajngerl9-294/+306
Rendering polylines, polygons, polypolygons which take an array as parameter ("legacy" code) can re-use the other, already existing code paths (same thing as "headless" svp backend does). (cherry picked from commit 6473093d4f6ee7d06905ddd71c90180fcffb0bef) opengl: use line shader for all line drawing not just polylines Line drawing using the line shader was used only when drawing polylines. With this commit every line drawing is using the line shader. This gives a marginal performance win and removes the old code for doing anti-aliased line drawing. (cherry picked from commit c8fc1f40ad8e20af32574e0aa73bdec51ae64e14) opengl: combined shaders to reduce shader switching Combine most common shaders for non-texture drawing and texture drawing into two combined shaders. Inside the shader we switch between the code paths with if statements. Using if statements (or any other branching statements) is discouraged inside shaders but on the other hand we reduce program state changes if we have less shader changes - which is more important for us as we want to push more work to the GPU. (cherry picked from commit 3cac38b2311538a0aecca765eb62c30c5098a85c) Change-Id: I19a486b6f65b1c4db0b15a54e5e4d12f42a9f6d5 Reviewed-on: https://gerrit.libreoffice.org/25382 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-25ruler: close the polygon when drawing indent handle (gtk3, gl)Tomaž Vajngerl1-1/+3
Change-Id: I9d1d20f889f73c73a1b861485a956a25f743e245 (cherry picked from commit 17e329e4092a2e49f47452d89fea51eb702d4fd2) Reviewed-on: https://gerrit.libreoffice.org/25383 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-22 14:19:16 +0000