summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-06-14bump product version to 5.1.4.2.0+libreoffice-5-1-4Christian Lohmaier1-1/+1
Change-Id: If971a9b44656f7ebe98c19b498e5cb820018ce4f
2016-06-14update creditsChristian Lohmaier1-1474/+1501
Change-Id: Ie4c9f67d07d81c0724c206c3a309dd5ec68fb963 (cherry picked from commit 962b0aca0ee38e25364c6e2dee5267c213d8fc39) (cherry picked from commit f44047ae020f32f15babd9b8a0432a449663fca0)
2016-06-14Resolves: tdf#90419 diminish precision error in Series FillEike Rathke1-4/+39
There may be more elegant ways to accomplish this, go and find one.. Change-Id: Iceaa0783db9cf3d3e1aa20f075fe7e0618a1feb6 (cherry picked from commit e89c0e4fb783bd36d5f5fea154ee8608e542dae4) Reviewed-on: https://gerrit.libreoffice.org/26220 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 191100ff3ab38f6487d0da3b23b8544175b61d33) Reviewed-on: https://gerrit.libreoffice.org/26275 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-06-14Resolves: tdf#92478 avoid crash on using scanner on windows x64Caolán McNamara1-1/+4
which appears to correspond to backtrace http://crashreport.libreoffice.org/stats/crash_details/ad46ef89-6b98-44f9-b060-ccb25015269d (prevents the crash only, does not enable scanning on x64) Change-Id: Ic5a4b66028db6ba4aea08baf5bf4a672f71745a0 Reviewed-on: https://gerrit.libreoffice.org/26197 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 7c983445656e1f1942cf2d7398a77342004ed168) Reviewed-on: https://gerrit.libreoffice.org/26248 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 05258d0277e822908c255da8e3d14da0e0656fc2) Reviewed-on: https://gerrit.libreoffice.org/26255 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-06-14Updated coreChristian Lohmaier1-0/+0
Project: translations cee1aeb93d01a1f87876fe9ee7f6beb3e047302b update translations for 5.1.4 rc2 and force-fix errors using pocheck Change-Id: I4574c1b2e1e4a0dbd1bb8c36cdbef009644d54fa (cherry picked from commit 05976795240823d58b9f15bcbf6c84015338880d)
2016-06-14tdf#99795 drawAlphaBitmap should scale the bitmap if necessaryTomaž Vajngerl1-3/+16
drawAlphaBitmap didn't use a high quality scaler for scaling the texture but used the default scaling method in OpenGL (either GL_NEAREST or GL_LINEAR, whichever is defined when texture is created) which are low quality scalers - especially when downscaling textures. Change-Id: I6236b2ee92b9e5044b176a40a444027072b09b58 (cherry picked from commit 19baa61e1d7b140b9e24717f7080617ab3d324d4) Reviewed-on: https://gerrit.libreoffice.org/26100 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit 86fef4ea205f3001305a6122bfa127b196e2d345) Reviewed-on: https://gerrit.libreoffice.org/26267 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-06-14tdf#96887 vcl: stop using periodic timers on WNTMichael Stahl4-14/+31
Every time the periodic timer fires, it does a PostMessage() to the main thread. The main thread will only process the first message and discard the rest anyway, but with a short enough timer and other threads hogging the SolarMutex it's possible that the message queue overflows and other PostMessage calls fail with ERROR_NOT_ENOUGH_QUOTA. Try to avoid the problem by having the WinSalTimer always be a one-shot timer; when it fires and the main thread processes the posted message, it is restarted with the new due time. This requires creating a new TimerQueueTimer because ChangeTimerQueueTimer only works on periodic timers. Change-Id: I816bd3fa5fbfbea4f26be8ff680a1c916618d3f9 Reviewed-on: https://gerrit.libreoffice.org/24024 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/26259 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2016-06-14tdf#96887 enhance SolarMutex AcquireWithWait for WindowsArmin Le Grand3-93/+34
Currently the Windows-specific method ImplSalYieldMutexAcquireWithWait() uses a messaging mechanism to learn about the SolarMutex being free again. This is not reliable when the MessageQueue overflows (MS allows 10000 messages per queue). It is more safe to use MsgWaitForMultipleObjects. This also allows to not only wait for the SolarMutex to be freed, but also to detect when SendMessage() is used which needs to lead to a reschedule to not block current Window handling. Change-Id: Id317dda62aaa1fe7677d8d28929e6936e5a22705 Reviewed-on: https://gerrit.libreoffice.org/23921 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Armin Le Grand <Armin.Le.Grand@cib.de> Reviewed-on: https://gerrit.libreoffice.org/26258 Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Armin Le Grand <Armin.Le.Grand@cib.de>
2016-06-14Resolves: rhbz#1344042 deb#826654 scale gtk3 smooth scaling events...Caolán McNamara2-44/+35
to give traditional amounts of scroll on a single mouse wheel event ditch non smooth scroll events now seeing as apparently they are always available so the other types are irrelevent now if we get x and y scroll, then like macosx just dispatch x and y scroll events. Note: there seems to be a bug in the stack below us where the first scroll event after getting focus is one of a 0 x and y delta. Because we now check x and y against 0, we don't launch a scroll event in the case of a 0x0 scroll which stops us occasionally appearing to go backwards on the first scroll after getting focus. Which is the same thing I see on e.g. gedit, the first mouse wheel scroll after getting focus doesn't actually do anything. (cherry picked from commit 0159ef4fbfd23ba97b20f97eb0677564bebd4ee7) (cherry picked from commit 23ba7c6c05d6331815a05a01d657f5e30b3bc252) Change-Id: Iec8f2e4627cd84e3896270a0847a5c4907fa083f reported abs narrowing complaint Change-Id: Icd27fea97e720607263e5f8a2d233c462f979e1b (cherry picked from commit f75ead4293d3b9d63f2596d66c411c44c0c70f38) (cherry picked from commit 6ad72c9c613766aabc15abaa676f5647b724b12b) Reviewed-on: https://gerrit.libreoffice.org/26101 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit d0ccf67442a14a1d48435954865c42af744a5117) Reviewed-on: https://gerrit.libreoffice.org/26172 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-06-10tdf#100257 - Data : XML Source does not workNoel Grandin2-11/+21
Revert "sc: boost::ptr_vector->std::vector" This reverts commit 280553e30f4ddc932838f98a9efaac03a988a0df. Reviewed-on: https://gerrit.libreoffice.org/26106 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com> (cherry picked from commit d6a6f587a852ba5c993c658b6b6432a65207f5b7) sc: eeek, a boost::ptr_vector! take it off! take it off! (cherry picked from commit 741077bf1cdb0c9240ee3e90f07a42bef5bb7a8f) Change-Id: Ia50c9cf7902e2e830c6e7f7a13c8f04341556e6c Reviewed-on: https://gerrit.libreoffice.org/26150 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 895468d7388ee17ba33804f19bad52933312ae5d) Reviewed-on: https://gerrit.libreoffice.org/26160 Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit 49b2548231a4eaf3f1304d15b0bb3f050ac99b49) Reviewed-on: https://gerrit.libreoffice.org/26163 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-06-10tdf#96089 sw: fix scope of bBreakAfter in InsertCnt_()Michael Stahl1-1/+1
The problem is that bBreakAfter is passed by reference to SwLayHelper and stored as a reference member there, so it has to live at least as long as pPageMaker. (Unfortunately C++ can't statically check that.) This then somehow caused the number of pages created after initial load to be 812 instead of the correct 396 determined from the layout-cache in the bugdoc, and that then caused Drawing objects to move backward during the following re-pagination, and then SwDrawContact::Changed_() calls SetFlyFrmAttr() and that sets the document to modified, which triggers the AutoSave that was reported in the bug. (regression from b4b7703e4335460cf48bfd6440f116359994c8ff) Change-Id: I14dc4644c2e127b3c3ff0e6876eedcc534e1a68e (cherry picked from commit c488214817516c13603deb1c180fef02f4c700bf) Reviewed-on: https://gerrit.libreoffice.org/26121 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 95ed42cc9f9cd40503ca609f1bcad31c5298889b) Reviewed-on: https://gerrit.libreoffice.org/26151 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-06-09Ensure that OpenCL device id returned from getDeviceSelection() is valid.Mark Hung2-6/+12
Possible fix for tdf#100104 Reviewed-on: https://gerrit.libreoffice.org/24959 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Page <aptitude@btconnect.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 40b0b9ab7703a165295b008f47df14d2ec076fb1) Change-Id: I756bb57d471db3d3ca1d9c3733d359c7c16b4e66 Reviewed-on: https://gerrit.libreoffice.org/25965 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-06-07update creditsChristian Lohmaier1-1504/+1520
Change-Id: I2ab962d75638f2b09ea5b7db52d951b0ea88b73c (cherry picked from commit b14092052f484d6771b7cd212e33dbfc70702410) (cherry picked from commit 561695d21d92a1911fbf64bf1231d0eaae3e67e6)
2016-06-07tdf#100187 fix division by zero in comboFragmentShaderTomaž Vajngerl1-1/+1
When feather is 0.0 (used when anti-aliasing is disabled) then we get a "division by zero" situation. As per OpenGL secs. the shader should not fail in this situation however the result is undetermined. Most GPUs handled this correctly but on some the lines didn't draw at all. This should fix this issue. Change-Id: I56ca2f10c393491807321969c72085ef7690d16a (cherry picked from commit 7aae883b90850af3f3a0aaada5704682f77c3d02) Reviewed-on: https://gerrit.libreoffice.org/25811 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2016-06-07vcl: fix "sgv" import filter on 64-bit MSVCMichael Stahl2-133/+216
This filter reads entire structs at a time from the SvStream, including structs that are derived from other structs. This happens to work fine with GCC by chance, but MSVC AMD64 by default aligns structs to 8 bytes, and that means if sizeof(super-stuct) = 20 then 4 bytes of padding are inserted and that ruins the import. This causes vcl_filters_test to go into an infinite loop reading SaveAsPicture.sgv. Fix this by reading each member of the structs separately, which also means that the filter doesn't need to byte-swap every member on big-endian platforms since SvStream methods already do that. Change-Id: I237725dbcde5232006728179e645776fcb79cac3 (cherry picked from commit af8509fa194e6747c82a9df9a1c465be82a32637) Reviewed-on: https://gerrit.libreoffice.org/25830 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 806da4d7f300396c6c5241ab33efeecae1b8eed9) Reviewed-on: https://gerrit.libreoffice.org/25858 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-06-06vcl: GIF import: don't use __LP64__ to check for a 64-bit systemMichael Stahl1-1/+1
__LP64__ is not defined in MSVC AMD64 builds, since it doesn't have 64-bit longs. This caused the vcl_filters_test to fail because loading the file for which that check is a work-around succeeded. Change-Id: I4df48d4b196a1d08e9bd5ef61b64ec63501037c9 (cherry picked from commit f6ed2305abb0289ad51605ceeaee607a0bc8d7bd) Reviewed-on: https://gerrit.libreoffice.org/25829 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 80d7ed6dc3ddaa364e7be84b4dd7d1783802b8da) Reviewed-on: https://gerrit.libreoffice.org/25857 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2016-06-01bump product version to 5.1.4.1.0+Christian Lohmaier1-1/+1
Change-Id: Ia5a81c02357eb8c7d5f03b7ed011784a37c8a89e
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>