summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-09-17Version 5.0.2.2, tag libreoffice-5.0.2.2libreoffice-5.0.2.2Christian Lohmaier3-0/+0
Change-Id: I1ad332264ddc91a547c68e2c4196858f110bdfee
2015-09-17bump product version to 5.0.2.2Christian Lohmaier1-1/+1
Change-Id: I75d42b80a5926fa19481ab652f32526c58e986eb
2015-09-17update creditsChristian Lohmaier1-1420/+1521
Change-Id: I0de134ec25add0fa963fa73e5583c721a69e17b7 (cherry picked from commit 3834c12cafd645cdfdcf951b5d7c0c0223f3d79d) (cherry picked from commit 82968ad4d4d84454987141f57de9872d92c49be5)
2015-09-17Updated coreChristian Lohmaier1-0/+0
Project: translations 4dab7ebff46a1fc46552a21cff65ae4984a31310 update translations for 5.0.2 rc2 and force-fix errors using pocheck Change-Id: I75c2c6b364f384a88b94961160609ba4206bb63d
2015-09-17Resolves: tdf#94249 do not remove broadcasters while iterators are in useEike Rathke4-13/+21
EndListeningContext holds BroadcasterStoreType iterators in its ColumnBlockPositionSet and collects broadcasters to purge them at the end. Removing broadcasters from ScColumn::maBroadcasters in between invalidates the iterators. Hence calling the "normal" EndListening() that removes a broadcaster when all listeners are gone while an EndListeningContext is in use is bad. Change-Id: Ibdd88469e91e6173ceff1f391c23ef7cb7c6f596 (cherry picked from commit e4a8ae0bf54476e9a0c9e1f5348c05f3cd838899) Reviewed-on: https://gerrit.libreoffice.org/18619 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-09-17Revert "disable caching of virtual devices when OpenGL is enabled"Tomaž Vajngerl1-7/+1
Not needed anymore.. This reverts commit 812e85a12c7e2c046113a72da9437982926bfb37. Reviewed-on: https://gerrit.libreoffice.org/18648 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 915d3ba9e453a19510f473bb2cdff6a7c5c3abfa) Change-Id: I2b25180a3ddaf5b838197a82eeec2de1c202a7d7 Reviewed-on: https://gerrit.libreoffice.org/18649 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-17opengl: support reading back 1-bit masks from textureTomaž Vajngerl1-12/+46
Change-Id: Ibe8d9140f7a54016f2cd684198856ac27d880aa3 (cherry picked from commit b85d24e430051054e54602aa14bf00b164c3865b) Reviewed-on: https://gerrit.libreoffice.org/18622 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit b12309df2dd529b1d23af4bcd10ed4421fcf92be) Reviewed-on: https://gerrit.libreoffice.org/18660 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-16tdf#93814: Added support for caching shader program binaries.Marco Cecchetti8-41/+369
Reviewed-on: https://gerrit.libreoffice.org/18555 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Conflicts: include/vcl/opengl/OpenGLContext.hxx include/vcl/opengl/OpenGLHelper.hxx vcl/inc/opengl/win/WinDeviceInfo.hxx vcl/source/opengl/OpenGLContext.cxx Change-Id: I21c844b47282f6b3eec443933a86421a074e24df Reviewed-on: https://gerrit.libreoffice.org/18632 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Marco Cecchetti <mrcekets@gmail.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-16tdf#94281 - don't mix legacy and VCL OpenGLContext's.Michael Meeks5-3/+17
Each has rather different assumptions about how life should be. Change-Id: I85fffc77d14f3a5335a077fcb541a2b31c372043 Reviewed-on: https://gerrit.libreoffice.org/18644 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> (cherry picked from commit 464f49e0b88e13c132bcf9cfe250239a1e1b0f8d) Reviewed-on: https://gerrit.libreoffice.org/18645 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Marco Cecchetti <mrcekets@gmail.com>
2015-09-16tdf#93666: use x,y coords when reading texture part + don't bindTomaž Vajngerl1-10/+12
Fixes shrinking shapes with gradients when the VirtualDev is reused to create a alpha mask (and the texture is reused and reading back from just one part of the texture which uses glReadPixels code-path). Binding texture is not necessary when we use and bind it to the framebuffer. Change-Id: Ie3994f749e1a2c17d4d3df44710b7453d7a4f45f (cherry picked from commit 0165da09288b5f6573bda114af664a26557fad8a) Reviewed-on: https://gerrit.libreoffice.org/18621 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18631 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2015-09-16GL paint-flushing guard re-work.Michael Meeks17-88/+77
Unfortunately, since we can have 2x SalGraphics' on a OutputDevice, and one of these can be a printer - things got very confused around which context to glFlush. This de-tangles the various reference-counts. Conflicts: vcl/inc/generic/genpspgraphics.h vcl/win/source/gdi/salgdi.cxx Change-Id: I1062be0b02a91fc9009deaa3ec29c5dbb227df20 Reviewed-on: https://gerrit.libreoffice.org/18611 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18630 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2015-09-16tdf#94252 - avoid switching contexts un-necessarily to reduce flicker.Michael Meeks1-0/+9
Change-Id: Id4ac387174fa03c5886a990d89fd53a4f18db11c Reviewed-on: https://gerrit.libreoffice.org/18610 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18629 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2015-09-16tdf#94006 - need an explicit dispose for slideshow's GLContext.Michael Meeks1-0/+2
Fixes crasher exiting slideshow. Change-Id: I14b6a2c1abc946f590bf91cab19099753172fd95 Reviewed-on: https://gerrit.libreoffice.org/18609 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18628 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2015-09-16tdf#94213 - calc re-size flicker turns out to be the status bar.Michael Meeks2-1/+15
Using vdev's associated with old contexts, is un-necessary and a recipe for context switching & hence flicker. Change-Id: I37ed967a7816e5ca0240908ab4793ce1e68570ee Reviewed-on: https://gerrit.libreoffice.org/18602 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18608 Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18627 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2015-09-16tdf#94213 - defer glFlushing until we've re-rendered after a re-size.Michael Meeks6-5/+39
Avoids a rather horrible flickering problem in GL mode. Squashing: tdf#94213 - release offscreen texture properly on re-size. We need to ensure that we use an initialized context, and that (when we re-parent) we DeInit and so reset the previous OpenGLContext. Make UseContext more paranoid as well for good measure. Squashing: tdf#94213 - cleanup associated GL contexts properly when DCs released. Change-Id: I6b9fb899777d8e460999ac3ff038a1302e434bb5 Reviewed-on: https://gerrit.libreoffice.org/18607 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18626 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2015-09-16Split formula group for OpenCL up into smaller bitsTor Lillqvist4-20/+123
Will make it less demanding on low-end hardware, where the device driver is unresponsive for too long when a OpenCL kernel handling lots of data is executing. This makes Windows restart it which is problematic. I tried several approaches of splitting, both at higher levels in sc and at the lowest level just before creating and executing the OpenCL kernel(s). This seems to be the most minimal and local approach. Doing it at the lower level would have required too much poking into our obscure OpenCL code, like passing an offset parameter to every kernel. Use a simple heuristic to find out whether to split. On the problematic low-end devices, CL_DEVICE_PREFERRED_VECTOR_WIDTH_FLOAT is 4, while for more performant devices it is 1 or 8. Change-Id: Ifd8ea9bae388ac9f1ca8cce2d8cc345d04184fca Reviewed-on: https://gerrit.libreoffice.org/18614 Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: László Németh <nemeth@numbertext.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-16Related rhbz#1259746: Buffer file content read from GIO UCPStephan Bergmann3-35/+13
...for one, this avoids sending seek requests down the GIO/GVFS stack, which can silently fail with corrupt data read from certain broken servers for current versions of the GIO/GVFS stack; for another, it should considerably speed up loading documents via the GIO UCP, as LO's document type detection is notorious for issuing lots of seek and (small-chunk and/or re-) read operations on a file. (This issue has become more relevant after 51e0d789c344547956764c3b5f0ef5a304f4e0aa "rhbz#1134285: Access dav, davs URLs via GVFS," where the old route via the WebDAV UCP was apparently not affected by those broken servers, so happened to start affecting opening certain remote files in LO via Nautilus.) Change-Id: I91f91128b2d1a16f976eafeacf216a91747f4df1 (cherry picked from commit 93a0696e74e96e5a5ca821f33cb791b87e876f49)
2015-09-16Resolves: tdf#93778 fixed crashSzymon Kłos1-7/+10
While opening folders in SvtFileView using doubleclick, sometimes GtkSalFrame::gestureLongPress method is executed with a null frame pointer and LO crashes. I noticed this only with remote dirs, probably this bug occurs only when the doubleclick handler routine takes a lot of time. (cherry picked from commit db33c7853e12e9593a530ce2327e9662bcab1480) Change-Id: I432046994b3e1662bd7e499681bd20e9696b2d52 Reviewed-on: https://gerrit.libreoffice.org/18572 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-16tdf#92145: Writer table rows/columns can't be resizedLászló Németh1-0/+6
with disabled rulers. (This fix was suggested by Tomaž Vajngerl.) (Cherry-picked from the commit ed031895f6f5b361cccc6811b53c6f2b9cfc3e23) Conflicts: svtools/source/control/ruler.cxx Change-Id: I161237cdb4941c0eaf934223b078acd94d72e21d Reviewed-on: https://gerrit.libreoffice.org/18507 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 00379a83cad8a016c54b3d90fef472a2ca6aeb96) Reviewed-on: https://gerrit.libreoffice.org/18563 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-12tdf#94031 - slideshow: bind correct GL context for prepareEnvironmentLubosz Sarnecki1-0/+1
Change-Id: Ib139e81f770531f7d808764dd3a77c7ac8d6fa3c Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18508 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-09-11Resolves: tdf#92995 do not delete caption objects that are held by UndoEike Rathke6-6/+36
Drag&Drop Undo is a special case of ownership.. Change-Id: I2fe7769c4d84efe09d432335d5d8e72d506bf7a1 (cherry picked from commit 44f34c1163882c2e3086282374fee9cd55ee211f) Reviewed-on: https://gerrit.libreoffice.org/18472 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-11OpenGL: use CHECK_GL_ERROR() only when a context is bound.Michael Meeks2-4/+5
Removes a large number of spurious GL errors left & right. Change-Id: I0b5639478812982b39d3b88be2600dad5d3f1fd0 Reviewed-on: https://gerrit.libreoffice.org/18422 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/18446 Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-11tdf#94006 - need an explicit dispose for GLContext's SystemChildWindow.Michael Meeks5-3/+20
Previously we would get an explicit ~OpenGLContext - and potentially leave FMR's around for other OGC users, now we treat the other users properly - we need an explicit dispose() to get Window::dispose ordering right. Reviewed-on: https://gerrit.libreoffice.org/18412 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Conflicts: vcl/source/window/openglwin.cxx Change-Id: I5edcbd73399b6db3dbcfb391570f364f9ab0c70d Reviewed-on: https://gerrit.libreoffice.org/18414 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/18445 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-11tdf#94006 - re-factor and fix OpenGLContext mis-use.Michael Meeks27-181/+141
Squashes two related patches from master: Don't use rtl::Reference for the global / list state, so the ref-count reflects the number of real users. Hold a reference during ~OpenGLContext. Fix mis-use in: gltf rendering, OpenGL canvas, GL transitions & GL capable (charts) Avoid GLX operations on un-initialized contexts. Signed-off-by: Miklos Vajna <vmiklos@collabora.co.uk> Conflicts: vcl/source/opengl/OpenGLContext.cxx vcl/workben/vcldemo.cxx canvas/source/opengl/ogl_spritedevicehelper.hxx Change-Id: I7ea29b544d53bb80b25fa6663d39f345bf8f4e64 Reviewed-on: https://gerrit.libreoffice.org/18443 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-11tdf#93996 - throttle gltf rendering to let UI re-rendering get in.Michael Meeks1-1/+3
Change-Id: I4a61595294c24a609a5952ce72f9f88524969784 Reviewed-on: https://gerrit.libreoffice.org/18384 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-on: https://gerrit.libreoffice.org/18442 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-11tdf#92843: fix disappearing zoom sliderLászló Németh1-10/+2
Change-Id: I2b45b7cf96af7950cf097c2b6a880e9eda021184 Reviewed-on: https://gerrit.libreoffice.org/18448 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: László Németh <nemeth@numbertext.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-11windows opengl: make sure mpLastContext is indeed the current contextMiklos Vajna4-2/+27
There were two problems here: 1) The OpenGLContext ctor registered the instance on the list of contexts, but platform-specific call (e.g. wglMakeCurrent()) was only made later. Add a registerAsCurrent() member function that helps ensuring that the last item in the context list is indeed the current context. 2) OpenGLContext::prepareForYield() is called without the solar mutex being locked, but it still assumes that the last context in the context list is the thread's current context, which may not be true. The result is that during JunitTest_sd_unoapi, we end up in a situation like: debug:4640:5240: OpenGLContext::registerAsCurrent: wglGetCurrentContext() is 00010001, pSVData->maGDIData.mpLastContext is 00FA65F8 debug:4640:7944: OpenGLContext::registerAsCurrent: wglGetCurrentContext() is 000D0003, pSVData->maGDIData.mpLastContext is 00FA6C70 debug:4640:5240: OpenGLContext::prepareForYield: start, wglGetCurrentContext() is 00010001, pSVData->maGDIData.mpLastContext is 00FA6C70 I.e. one thread registers as current, an other registers as current, too (while the other thread has the solar mutex), then once the original thread wants to release the solar mutex, the real current context and the last item in the context list won't match, so the assert at the end of prepareForYield() will fail. Fix this by releasing the GL context in WinSalInstance::DestroyFrame(). With this, JunitTest_sd_unoapi passes on Windows with GL enabled. Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18488 (cherry picked from commits e576227d71788409110108281340005638f78bf1, 57fc41adc9292f8980bb8bbbb0d7983310fe6fe3 and 0e682d47a792497211d33779312ca2cad9874ffb) Change-Id: Icfb9c65c871586b5df69b5a2ab3aa91843dfc799 Reviewed-on: https://gerrit.libreoffice.org/18492 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-11don't use a null displayMarkus Mohrhard1-8/+14
Change-Id: Iab0a53abd723f0309f40742636315079a4b2c532 (cherry picked from commit c94d60d6c164e4552b491d348ab0f5c198b6e856) Signed-off-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/18444 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-09-11avoid some OpenGL calls when vcl OpenGL is not enabledMarkus Mohrhard1-1/+1
There are even more and it is causing a number of performance issues. This just fixes the most obvious place. Change-Id: Id85c13b5b7f4bb0bc077e62c39258067e17c0094 Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18441 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
2015-09-11tdf#92357 clear tab type switcher button of rulerLászló Németh1-1/+1
before drawing the new icon (cherry-picked from commit e74bc6b9a61dbc80caa6d2a8bfb79b3ac61c9899) Conflicts: svtools/source/control/ruler.cxx Change-Id: Ibbdbed448f965848429ace28dcfae47efc982164 Reviewed-on: https://gerrit.libreoffice.org/18376 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Reviewed-on: https://gerrit.libreoffice.org/18447 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: László Németh <nemeth@numbertext.org>
2015-09-11Related: tdf#92982 vcl rendercontext: optimize non-buffered paint of CursorMiklos Vajna1-5/+11
Change-Id: Ic8065d4f656d42f1e2e7d8b4c602010fa0ae2d34 Reviewed-on: https://gerrit.libreoffice.org/18457 Reviewed-by: Andras Timar <andras.timar@collabora.com> Reviewed-by: László Németh <nemeth@numbertext.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-09-11windows opengl: fix CppunitTest_writerperfect_writerMiklos Vajna1-0/+4
(cherry picked from commit b5df051cc5d734ef9fd77a5336d2bb8d1d4557c9) Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 315a112f28b480e8e90d42a8ab45d1b448490939) Change-Id: I4a7199633d0d940ae009ac144989da7d6c9262ec Reviewed-on: https://gerrit.libreoffice.org/18463 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2015-09-09tdf#93884 windows opengl: make space around cached glyphs depend on font sizeMiklos Vajna1-20/+39
Cached glyphs used to have a 2px border in all font sizes, that's too small for larger fonts. Make the border size depend on the font size for larger fonts to make sure that the rendered glyphs are indeed independent. The introduced GLYPH_SPACE_RATIO = 8 constant is the smallest value where I don't see overflows anymore for large fonts. With this, not even the bugdoc renders correctly when presenting, but also the text is OK when the font size is set to the max allowed by the UI (96pt). Change-Id: I52aa5c4444583fc0467291463697a63f2b8fc86c (cherry picked from commit 840248a4c7faa3d1a96155b2d798ae44249b78bd) Reviewed-on: https://gerrit.libreoffice.org/18386 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com>
2015-09-08tdf#93989 - prevent crash with non-vcl OpenGL contextsMarkus Mohrhard1-1/+2
Change-Id: Ia829b0f723c8ded1237e52d48f034da3c1ac249e Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18409 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-05bump product version to <new version>Robinson Tryon1-1/+1
Change-Id: I041a7b6e06d7f5e976537806f526f7fba53650cd
2015-09-05update emoji autocorrect entries from po-filesRobinson Tryon10-86/+293
Change-Id: Ia10e07e428bce001da8fd7e38e07ace820b42153
2015-09-04Updated coreRobinson Tryon1-0/+0
Project: translations 33da995f33241d35f6d1a74509f57cd8555b2fe2 Update translations for 5-0-2 Change-Id: Iaa61ea72368a4619c69c9ec64bb559d30bd495d2
2015-09-03 Branch libreoffice-5-0-2Robinson Tryon4-1/+1
This is 'libreoffice-5-0-2' - the stable branch for the 5.0.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 5.0.x release, please use the 'libreoffice-5-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: Ifc544905e8a8b8c05cc0118ca15efeccb10c6a82
2015-09-03Fix mis-mergeStephan Bergmann1-6/+6
...where fb6f2e1109abdd09e80dbcd6660a9530fc06ff0f "Resolves: #i121407# Gallery reorganizations..." first cherry-picked the younger 8012fae6cedcf325130d70adf0a486e8918f452f before f7d373d18f965b36f310d44044bdba6476f6eb03 "Added ColorDepth change test with assertion to the Bitmap::Scale method" then cherry-picked the older 4be8cc079667cca2cae91dba9e46c16ccff1537f, leading to the two checks at the top of Bitmap::Scale to not return early as intended. Thanks to clang-tidy clang-analyzer-deadcode.DeadStores for flagging this. Change-Id: Id89cc517a9f7efdff040c70f3b0e640d969cf24d (cherry picked from commit 0aa9cd69598e1c022aa676f81dc7bc2f03e58b2c) Reviewed-on: https://gerrit.libreoffice.org/18310 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-03tdf#93892: Un-share maUserBuffer when the BitmapWriteAccess is requested.Jan Holesovsky1-1/+17
Otherwise Bad Things Happen, and we may accidentally overwrite random other / shared data. Change-Id: I463354a6e910a2cb43faa229708fe5c14c79535a Reviewed-on: https://gerrit.libreoffice.org/18309 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-03officecfg: blacklist one more intel opencl driver versionMiklos Vajna1-1/+1
My machine has both an intel and an nvidia vga card, and both support opencl. When the intel one is not blacklisted, then CppunitTest_sc_opencl_test's testFinancialXirrFormula() fails all the time. With the blacklist the nvidia one is used during the tests and the test passes just fine. Change-Id: Ib539faebcaf51867bdc1923f896219afcf92b5ef (cherry picked from commit 452b1872af72d7fb31101aa2fa35aeaf18e41a10) Reviewed-on: https://gerrit.libreoffice.org/18307 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-03disable caching of virtual devices when OpenGL is enabledTomaž Vajngerl1-1/+7
Change-Id: I15c5cca8c31d81026111a3fa3f050f53057d76b7 (cherry picked from commit 6eff03b7d8b77b797f57f2344163ff67a99631f9) Reviewed-on: https://gerrit.libreoffice.org/18308 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2015-09-03doc para property ranges cannot be 0 lengthCaolán McNamara2-0/+13
Change-Id: If946204873343d8bbc0c1d391ca2c65d8b2f8561 (cherry picked from commit ed7d22049596ac91ad75bfad1a5675c13714e203) Reviewed-on: https://gerrit.libreoffice.org/18299 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-03tdf#91882 - make this hideous busy-loop lower priority and less busy.Michael Meeks1-1/+2
This way the rendering code can get a look in. Change-Id: Id100031ffe1c4b415ed4ef1272a0772ec99ab4a9 Reviewed-on: https://gerrit.libreoffice.org/18301 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2015-09-03tdf#93870 - GL accel. via VCL canvas for presentations when GL enabled.Michael Meeks8-3/+53
Change-Id: Ia31a88cb3d9e6baa987b22f77f407a3f592031f1 Reviewed-on: https://gerrit.libreoffice.org/18285 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/18295
2015-09-03tdf#79018: Prevent line break as footnote labelOliver Specht1-3/+8
footnote labels must not contain line breaks Change-Id: I00d334197b960c4ed17fdee3ea8a1c734cbfa4c1 Reviewed-on: https://gerrit.libreoffice.org/18292 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 089d7f53ea232972961c14706a54187f075fa973) Reviewed-on: https://gerrit.libreoffice.org/18297 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-03Fix tdf#93781 Impress copy wrong style name to clipboard whenMark Hung1-1/+2
style name contains Chinese character. Encode style name in multibyte sring (ex,Chinese) properly with RTFOutFuncs::Out_String(). Change-Id: Ibdd1010e28c711d7829643b60b32637ebce58bdb Reviewed-on: https://gerrit.libreoffice.org/18247 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 85c62a36a907bc5ff31627349a80baa51efbd443) Reviewed-on: https://gerrit.libreoffice.org/18296
2015-09-03sc: fix number format button highlighting in sidebarTomaž Vajngerl1-1/+1
When a number format for a cell (for example percent) is applied it is highlighted in the toolbar but not the equal button in the sidebar. This patch fixes this issue. Change-Id: I958b1fd152bc2b756a6320b7cb4ebb15ac601f2c Reviewed-on: https://gerrit.libreoffice.org/18283 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-03tdf#93662 - allow GL by default only on recent drivers on recent windows.Michael Meeks2-101/+63
Feature for triple review for 5.0.2 - enables GL by default for some subset of very recent GL drivers, on Windows 7+. Change-Id: I8777c84920b7cb7b19686e3cd8e943e6967a9a16 Reviewed-on: https://gerrit.libreoffice.org/18289 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-09-03WaE: loplugin:staticmethods in the non-Java caseTor Lillqvist1-0/+10
Change-Id: I1fe771f01edb0ce14da01146191cfe3f48958966 (cherry picked from commit 8002f0ddc805251e6f0f550bf8526aab8603c5df)