summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-01-11tdf#96550 - vcl opengl - fix BGR/RGB swap for some 8-bit icons.Michael Meeks
Change-Id: Ic71b8a94cabc392e7b83df70c1691de8f4c12b43 Reviewed-on: https://gerrit.libreoffice.org/21295 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2016-01-11tdf#96919 - vcl opengl: implement missing XOR mode.Michael Meeks
Also revert "tdf#96257: Silly work-around to produce same result ..." from commit ec8bc265050d86a749140c353360a78cce4e3fce. XOR rendering (it turns out) behaves oddly, and not for all operations. Change-Id: Ie07d988bbf7fed10fb5625ac547a01a306b05319 Reviewed-on: https://gerrit.libreoffice.org/21282 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/21288 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2016-01-11Fix Addons.xcu toolbar items width handlingMaxim Monastirsky
This is useful for some complex controls (e.g. Combobox). Regression of cb4177b5f6d2c63548fa544a19b36001c57193e4 Change-Id: I683cc20e9db72a4dd58d89063ec6bfcd05a1068e (cherry picked from commit ee3cd777e187669f2d9dec156854c00cab948a50) Reviewed-on: https://gerrit.libreoffice.org/21296 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2016-01-08tdf#96674 drawingML import: fix handling of zero width/height linesMiklos Vajna
(cherry picked from commit 627c2469843c9461b665c4571f1214aca7fc36a4) Change-Id: If3d9f6272031e08ab228cfa58963d60ceede2498 Reviewed-on: https://gerrit.libreoffice.org/21115 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-01-08The OpenGL Windows driver blacklist file should be in share, not user configTor Lillqvist
We don't want a potentially outdated copy to be used. Besides, when it was in the user profile, it did not exist the first time after an installation, or a user profile removal, when we attempted to read it. Change-Id: I21290090a3bbb44864730dff84c81e80add89fb3 (cherry picked from commit 989f0fa8dbe6af56aa33fc6b8c63364811f8635c) Reviewed-on: https://gerrit.libreoffice.org/21204 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
2016-01-08Don't use the "marketing" version number for the Intel driverTor Lillqvist
The 15.x.y.z.d number is not the real version number that our code sees. Change-Id: I8e434c0c3e3c4ff6ea8a6810f0b09f9b2befc438 Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
2016-01-08tdf#96420: Avoid drawing ugly black boxes on top of replacement glyphsTor Lillqvist
When UniscribeLayout::DrawText() was used from MultiSalLayout to draw the base layout level after having drawn fallback glyphs, it mis-rendered the runs that contained the missing glyphs. Avoid this by handing the pRectToErase parameter also here. Change-Id: Ib40aa9e9e60d72db1cdd331ba03ae8230aadbba8 Signed-off-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/21203 Tested-by: Jenkins <ci@libreoffice.org>
2016-01-08Bump copyright year to 2016Adolfo Jayme Barrientos
Change-Id: Ifbd88aa55d5aa32a7b8dc11d7ac0310d0ef1e5d1 (cherry picked from commit 8085555f6de5905028fdc0761c9e5b2fd4a3609a)
2016-01-08tdf#96198 postpone conversion from WEEKNUM to ISOWEEKNUM, tdf#50950 follow-upEike Rathke
Have two releases be able to read ISOWEEKNUM first. Change-Id: I7ea8141043d18076a65396374dec40a806c8ab6a (cherry picked from commit 7994b77819a5de7a6da46ab01386883559e7a7d1) Reviewed-on: https://gerrit.libreoffice.org/21229 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-01-08tdf#89236: Don't deflate encrypted document in parallelMatúš Kukan
I see "warn:legacy.osl:22439:1:package/source/zipapi/ZipFile.cxx:583: Can't detect password correctness without digest!" when opening file saved with password. Obviously css::xml::crypto::XDigestContext used in ZipOutputEntry does not work properly when encrypting files in parallel, so don't do that. Change-Id: I4b354535240a4f31a6bc6855cf7f9af527634e7e Reviewed-on: https://gerrit.libreoffice.org/21238 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Matúš Kukan <matus@libreoffice.org> (cherry picked from commit eaed822c9cf6b3762f727f1281003dafd300df6d) Reviewed-on: https://gerrit.libreoffice.org/21241 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2016-01-08set reasonable default size for new draw/impress tablesJustin Luth
The width was decent, except that on small paper (A6) it was wider than the paper size. The height was terrible - the minimum size possible. It was too small for even a single line of text. That made it hard to grab the table edge (instead grabbing a row edge) when trying to resize. Now the height and width are limited to the page/view size, and based on the number of rows created. One possible enhancement would be to use the border width instead of the page width. Change-Id: I4e106a7bc34f65886e3c80d308499242c0fdd7d8 Reviewed-on: https://gerrit.libreoffice.org/21171 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 66b8b09d0aa97e4009d2019a9d93b74cd1e11a09) Reviewed-on: https://gerrit.libreoffice.org/21214 Tested-by: Jenkins <ci@libreoffice.org>
2016-01-07Updated coreNiklas Johansson
Project: dictionaries b186814ea5952df5ee543b218a265fc0fe4d48fd Update the Swedish spelling dictionaries Update to the latest dictionaries version 2.39. Change-Id: I464aa0bbc9d58b0ec2f3b82906dabe60a49c020e Reviewed-on: https://gerrit.libreoffice.org/21151 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 3f7bdd798006d506d83d58e699d52878326bbd62) Reviewed-on: https://gerrit.libreoffice.org/21199 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2016-01-07Resolves: tdf#94208 broadcast fill undo (for deleted cells)Eike Rathke
Change-Id: I0fb54956bffc77dad4236b326eee3af836017623 (cherry picked from commit ece5cc21aa7814be79016e0d285981c6ced4d9ee) Reviewed-on: https://gerrit.libreoffice.org/21206 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-01-07configure: hard-code /usr/bin/{sort,find} for CygwinMichael Stahl
... to avoid calling C:/Windows/system32/{sort,find}.exe, if those happen to be first in PATH. On a Windows 7 system, the other conflicts appear to be harmless, we don't use "more", "expand", "timeout", "whoami". Change-Id: Iceefeb7ee6725291b04c0eba465991bb1df96b57 Reviewed-on: https://gerrit.libreoffice.org/21175 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit e9cd5087366f930efd89a95c0a5610fe8f375581) Reviewed-on: https://gerrit.libreoffice.org/21205 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-01-07tdf#93565 Use multiple docs for individual PDF MMJan-Marek Glogowski
There is actually a comment in the mail merge code: // convert fields to text if we are exporting to PDF // this prevents a second merge while updating the fields // in SwXTextDocument::getRendererCount() This was included to fix i#93714. But the reference to 2005-05-23 #122919# in the actual code doesn't help to understand, why the original code is needed. I would like to get rid of it, but currently don't have time for tests. So the optimization to skip ConvertFieldsToText() and use a single working document for individual document mail merge breaks for PDF, as the working document won't contain any fields after the first document is written. This uses multiple working documents for PDF export again. (cherry picked from commit d7e0d0135ba65243fab5ee038c21290b8e74e548) Conflicts: sw/inc/dbmgr.hxx sw/source/uibase/dbui/dbmgr.cxx Change-Id: I0cf1c64da27863fc5fb4bb6c7812fed90b737d13 Reviewed-on: https://gerrit.libreoffice.org/21136 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-01-07Fix build with gtk2 older than 2.20 by using the old definitionTomáš Chvátal
Change-Id: I3355d25f04a3c57063fd3d03e72a75da32e16efc Reviewed-on: https://gerrit.libreoffice.org/21109 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/21195 Tested-by: Jenkins <ci@libreoffice.org>
2016-01-07Fix distro-filelists after removal of kde3Tomáš Chvátal
Change-Id: Ie11281285de012dfd61f4b3b04b4144cd90d382a Reviewed-on: https://gerrit.libreoffice.org/20989 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/21196 Tested-by: Jenkins <ci@libreoffice.org>
2016-01-07Pyuno add compat for python 2.6Tomáš Chvátal
Change-Id: I3e40a8006278b094d494820e6f47628c6579e78a Reviewed-on: https://gerrit.libreoffice.org/20883 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/21194
2016-01-07Refresh graphite2.win64.patch.1 to apply using sle11 patch binary.Tomáš Chvátal
Change-Id: If43ca99631fab5a3a04e7dead9b694cf52944666 Reviewed-on: https://gerrit.libreoffice.org/20882 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/21193 Tested-by: Jenkins <ci@libreoffice.org>
2016-01-07Related tdf#96833: breadcrumb: setting URL, host port gets lost.Giuseppe Castagno
At the same time added a log in WebDAV, useful to discover the issue. Change-Id: I3435f8d3da28f7d6b4c2e154cf2bb5ee33a9a690 Reviewed-on: https://gerrit.libreoffice.org/21047 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5c4de8f1991f1a9964e661717dc6b46f6a6a3608) Reviewed-on: https://gerrit.libreoffice.org/21172 Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
2016-01-07the idea behind the test can't work right nowMarkus Mohrhard
The Test currently tries to test the OpenCL and the SW interpreter and assumes that it will show different results. However if we succeed in generating an OpenCL interpreter we will never generate a SW interpreter. There are a number of problems with the approach taken in this test. 1.) Assuming that we are able to execute OpenCL is an invalid assumption. 2.) Changing the configuration inside of a test needs to be exeption save as we are otherwise left with a strange config for the remaining test cases. 3.) Changing the configuration does not change the formula group interpreter. This needs to be done explicitly. Change-Id: I679985ee7551b21aaa52038e107324980e7e1bb6 (cherry picked from commit f4dc8a869ac49f19c20fc5fa606448e9103726bd) Reviewed-on: https://gerrit.libreoffice.org/21202 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-01-07tdf#96708: don't modify document while copying to clipboardMike Kaganski
I.e., don't try to create auto-layout for clipboard pages which don't contain one; don't resize objects to text. Also, don't invalidate items that are equal to defaults, because explicitly set items are not the same as absent items: pasting an object without an item makes the property to inherit new target's default, while when the item is present, the default doesn't apply. Also, don't consider selected state of the page while stringifying - this makes selected page string to differ from not-selected clipboard page. Change-Id: I172e03e1a8c428e5fcae3a116cc9ad8de79f1a87 Reviewed-on: https://gerrit.libreoffice.org/20871 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 3b4059dc53ec764be5423517363223043d6dbfad) Reviewed-on: https://gerrit.libreoffice.org/21104
2016-01-07tdf#96894 - get ordering right for TextureAtlas cleanup on shutdown.Michael Meeks
Do it much earlier - while we have a valid OpenGLContext. FixedTextureAtlasManager should also use ref-counted textures properly. Also - dispose embedded textures early in VCL shutdown while we have a valid OpenGLContext. Also - dispose the native widget control cache earlier too. Change-Id: Ie258283147d02984b6f507c0075d114ae7288051 Reviewed-on: https://gerrit.libreoffice.org/21089 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/21119 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2016-01-07Add --with-prebuilt-opensslTor Lillqvist
Don't ask. Oh well, if you want to know: For some people, like me, Cygwin and its Perl run into horrible trouble with the fork() emulation when building OpenSSL. (But my Cygwin works fine for all else in the build. Go figure.) So I came up with a way to use prebuilt OpenSSL binaries. Not to be used for release builds, of course (and the configury checks for that), as long as our policy is to build all we can from sources. Change-Id: Ic303bdf0c620c5122aca3d646fa1f0587221e70f (cherry picked from commit cf029192e4ac9ce0e24ddfd880f5f9d557cf9c28)
2016-01-07Fix dbgutil build in case GL_DEBUG_SEVERITY_NOTIFICATION_ARB is undefinedTor Lillqvist
Change-Id: I14628e9dee8651e87b4782057c4681fded5e4643 (cherry picked from commit 1fd7994a4ea7daf8bdbf394f4d5cd8f678d00758)
2016-01-07OpenGL transitions: squashed 5 commits into this oneEmmanuel Gil Peyrot
vcl: Ignore i965’s shader compiler debug (cherry picked from commit 928fe134ff6ea85f732b36a1ab11336f1d829531) slideshow: Fix a few issues in the Glitter transition Remove an unused variable, add comments, reduce the time a tile stays black, and don’t rely on implicit casts of integers into floats. (cherry picked from commit 22480b20130d10f4691cdf0a658040be7f36e47b) slideshow: Improve the Ripple transition to match PowerPoint better (cherry picked from commit 1d411cad5a7d78ead8cffb5da522f1e0fba31187) slideshow: Improve the Vortex transition to match PowerPoint better (cherry picked from commit d886fef25c5978dd4b07fa0e3ce2402874a6c29a) slideshow: Define inverse() to bring back the GLSL version to 1.20 (cherry picked from commit a301da7cb6c562cd21983d9b3b34dc01235a82a5) Change-Id: Ifd33ae982b762af3ea8d88b2b2de259aabeebc9a Reviewed-on: https://gerrit.libreoffice.org/21116 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2016-01-07We should compare an Intel version to 15.40.4.64, not 15.40.4.64.4256Tor Lillqvist
That's what the code originally did, when the versions were hardcoded in the C++ code. The 15.40.4.64.4256 is the "marketing" number for the version that was suggested to use instead. The code can not handle five-number versions anyway, and this blacklist entry was ignored. An actual version as reported by the system always has four numbers, to the best of my knowledge. Change-Id: If7e2e91bbd81fc75d03eacb38580df16c6e09d78 (cherry picked from commit 90e1baf4ed1cf03bec430870d870ede0984f9adc)
2016-01-07Avoid indexing out of array boundsTor Lillqvist
Change-Id: I65022f30e21cb94fc8c653ef8e2797da3746875c (cherry picked from commit d12dcbcb61b1818c7ea58650fc06bf4aa04057cf)
2016-01-07vcl: opengl - Kill the last glErrors on common paths.Michael Meeks
Re-work the makeSomeOpenGLContextCurrent logic into a shared function with the existing AcquireContext logic in the SalOpenGLGraphics impl. Use an OpenGLVCLContextZone placeholder to do both context and zone management - to include destructors into the zone. Fix a number of error cases around SalBitmaps where we did not have a GL context associated when allocating, and/or freeing textures.. Don't drag a (potentially) slower context around in the OpenGLSalBitmap when we're going to check / fetch a better VCL context anyway. Remove ScaleOp pieces to synchronize with master for maintenance. Change-Id: Ibbb2358c47156cd078ad28b6aad4f03af36aaf23 Reviewed-on: https://gerrit.libreoffice.org/21149 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2016-01-06Updated coreAndras Timar
Project: translations 43f43172246e258a65afd8c6252cbf0181560811 Updated Slovenian translation Change-Id: Id3cef09e9da3b2d1711d8a6a551c53ec11b86c9f
2016-01-06let us try to use the pid as well on windowsMarkus Mohrhard
I'm a bit worried that some of our random test failures are related to trying to reuse the same temp file in different tests. Change-Id: I0ca4ace088a96530e6a62d01f979fefe63822b22 Reviewed-on: https://gerrit.libreoffice.org/21090 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/21144 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-01-06don't use the same files in different unit testsMarkus Mohrhard
I currently assume that this is responsible for some of our heisenbugs on windows. I think the windows file locking is causing issues when two test try to access the same file in parallel. This is more likely to happen on the fast windows ci boxes. Change-Id: I423f6c723c2ec558026867a118972e98279bd2c2 Reviewed-on: https://gerrit.libreoffice.org/21145 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2016-01-06tdf#82775: Make NumberFormatCodeMapper MT safeStephan Bergmann
Change-Id: I77f49f09ce9fe5897f78044c0522210978c904d1 (cherry picked from commit d01888302b03a79bf7ccde6cbe8434b427164a75) Reviewed-on: https://gerrit.libreoffice.org/21130 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-01-06Use OUString::replaceAllStephan Bergmann
...instead of a local function using a static (!) buffer, which just cannot work in a multi-threaded environment. Change-Id: Id28e1c55c32aa2e35cd3c1756f5d392241092a30 (cherry picked from commit c83b55564dab042e3fc1889920cbb4db8fe40117) Reviewed-on: https://gerrit.libreoffice.org/21131 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2016-01-06Related tdf#96833: fix behaviour of 'Remote Files' edit dialog.Giuseppe Castagno
Fixed: - TCP port got lost/reset when editing a server; - in Gtk widget disabled comma; - secure protocol checkbox always unchecked when editing a server. Change-Id: I358fc7375552b29e4840a3616e4e47b95b88ed2c Reviewed-on: https://gerrit.libreoffice.org/21039 Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Tested-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit d373cb7e15ceca249c33be39583a0515b413e417) Reviewed-on: https://gerrit.libreoffice.org/21143 Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2016-01-06tdf#96687 - force validation after External InputJustin Luth
After external input (EndExtTextInput), the selection was marked as invalid, but bFormatted remained true, so all the functions that re-evaluated and marked the portion as valid again were skipped and therefore the invalid portion was not painted. Change-Id: Ibb2208bdaeb8ed17a4a34fa378a2fc750abf1b07 Reviewed-on: https://gerrit.libreoffice.org/20986 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Justin Luth <justin_luth@sil.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> (cherry picked from commit 5a217ada5e28e17f052ebec8e53dce05c2aa9cae) Reviewed-on: https://gerrit.libreoffice.org/21117 Tested-by: Justin Luth <justin_luth@sil.org>
2016-01-06Related tdf#96833: Allow port with more than 4 charactersJulien Nabet
Change-Id: Ib6676f6f940ce497ac6fe28189e1c3a4ed4ec0bf Reviewed-on: https://gerrit.libreoffice.org/21032 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit 9236a99ad4640cd568abe9040ac37e398c60061f) Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2016-01-06tdf#96713 OdfFlatXml: Seek to 0 before readingMaxim Monastirsky
Similar to tdf#45418. The problem is that sfx2 DocumentInserter code calls SfxMedium::IsStorage, which reads the stream but doesn't correctly seek back to 0. Actually SfxMedium_Impl has 2 members for the input stream, one of SvStream type and another one as Reference<XInputStream>. Turns out that reading with SvStream::Read changes the position in the object referenced by Reference<XInputStream>, but SvStream::Seek doesn't, so Seek(0) doesn't do the desired effect. My current solution is to ensure that we're reading from 0 inside the filter. I think it's a good thing to do anyway, and should be sufficient, given that other filters doesn't seem to be affected by this bug. Change-Id: I49b41077032d3e395c675e4f7824cc778c075473 (cherry picked from commit 5e4124396cafc2b0a435f17a66b33e36303ae4e4) Reviewed-on: https://gerrit.libreoffice.org/20969 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2016-01-06tdf#82775: Don't prematurely dispose single-instance servicesStephan Bergmann
...that happen to be requested concurrently from multiple threads Change-Id: Icecfb0b8d88c9123064689643eddf90a99d3b1b8 (cherry picked from commit e83f31724e0f2cd4242e0b398c48578da53cb5c1) Reviewed-on: https://gerrit.libreoffice.org/21129 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-01-06tdf#94715 - ensure we remove ourselves from the same event source.Michael Meeks
Seemingly event removal was not occuring; also clean up historic duplication of UNO and C++ references using rtl::Reference. Change-Id: I56dfb76501929886f70495804670f8c4f70e796b Reviewed-on: https://gerrit.libreoffice.org/21088 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/21108 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-01-06do not require newest libe-book for buildDavid Tardon
(cherry picked from commit 22d0a7bf86da9e795b1bcedae9e18f18245dc2fe) Change-Id: I4be3de970eabf00fd73b466adc15b6a84528a2d1 Reviewed-on: https://gerrit.libreoffice.org/20940 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-01-06do not require newest libwps for buildDavid Tardon
Change-Id: Iba0090da0591b6f9a6d74bb18ebaabef53448063 (cherry picked from commit 36b087f8b04ea46428a2c20e26d4230e59cdfd4d) Reviewed-on: https://gerrit.libreoffice.org/21122 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-01-06add more URLs to appdata filesDavid Tardon
Change-Id: If32565d244d7882e1fca514214e5be1351ead41f (cherry picked from commit 5f981642889b1b9980e98ebccc3150e022a73bed) Reviewed-on: https://gerrit.libreoffice.org/21126 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2016-01-05for new'ed FormulaToken use FormulaTokenArray::Add()Eike Rathke
... instead of AddToken() that just clones it again. Change-Id: I99b02b0924d0a0c070435501f8ecd45f030e9c2c (cherry picked from commit c3d2313eca8fdab9eb3b4c9a49fd14e255feb2c0)
2016-01-05tdf#96198 add WEEKNUM_OOO compatibility function, tdf#50950 follow-upEike Rathke
The remaining cases when loading old and wrong ISOWEEKNUM that can't be mapped to either new WEEKNUM or ISOWEEKNUM now are mapped to WEEKNUM_OOO(date,mode) with calculations identical to the old and wrong OOo WEEKNUM. These WEEKNUM_OOO cases are still wrongly saved as ISOWEEKNUM so can be read by 5.0 or earlier versions as the old WEEKNUM, which should be changed for 5.3 or later. WEEKNUM_OOO is not offered in the Function Wizard to prevent deliberate usage. Also reverts the interim unit test change to sc/qa/unit/data/contentCSV/date-time-functions.csv that was necessary to catch the error generated by ISOWEEKNUM with two arguments. (cherry picked from commit 902c593196741ffec2d096855369313f6bbe756e) Conflicts: include/formula/compiler.hrc sc/inc/helpids.h sc/source/filter/excel/xlformula.cxx Change-Id: I874c4c7225900f03b879f2947512ae02270cbd4f
2016-01-05sysui: add "kudos" to AppData filesRichard Hughes
(cherry picked from commit c7fee34686d22d164dd1f42f9d68c53832011d0f) sysui: also add `HighContrast` and `UserDocs` to AppData (cherry picked from commit 6cf31f69b41b7155a208362f0d913f854fa70c43) Change-Id: I36cf0a8aa2f501fa30d86de35ae083e78ce0904b Reviewed-on: https://gerrit.libreoffice.org/21114 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2016-01-05tdf#92623 Handle StartOfContent node for copying bookmarksJan-Marek Glogowski
For SwDoc::AppendDoc we use the StartOfContent node as the starting copy node to prevent merging of the first node in CopyRange and to get a 2nd node needed for CopyRange in case of single content node documents. This correctly counts StartOfContent as a non-copy node when adapting the bookmark ranges for copying. Change-Id: Ia3ee0328a1be5548f8751aa2240812c4662fb73f Reviewed-on: https://gerrit.libreoffice.org/20383 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 689962feae2054f965a7378c3408b0ccfad2bbd5) tdf#92623 MM: add unit test Adds the missing unit test to the bugfix. Actually the original bug was a crash, so this just does some test on the resulting MM document. Change-Id: I4c9f031e57157fe5744aa8290b7503b7e1990fc7 (cherry picked from commit 480e943f0100154fa82942db092ed1f66b76ef66) Reviewed-on: https://gerrit.libreoffice.org/21076 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-01-05tdf#96479 workaround bookmark end pos handling...Jan-Marek Glogowski
... when inserting text into a text node. Seems SwTextNode::InsertText doesn't handle bookmark end positions correctly. This is just handled correctly, if it also contains the bookmark start. This workaround simply concats the three strings to be inserted in advance, so we just have to call SwTextNode::InsertText once for the whole string. (cherry picked from commit c91024891ff10c2ae01e11a28a9aecca2f36b6c3) Conflicts: sw/qa/extras/uiwriter/uiwriter.cxx Change-Id: Iab7708b4cc4df406bdbc3a685c7410e0e797fdc4 loplugin:stringconstant Change-Id: I588a9c0205e03f701b617fd1775e7f9b9b88c6b0 (cherry picked from commit 67d440e6bd2c895833fa22d0f9bf5dc6901723e8) loplugin:stringconstant Change-Id: I60ee2ccc6090c305ade4ba16d3d298866cf89c4e (cherry picked from commit 6aa4496c789fec271dcdc7995cf62ef2dabf1f96) Reviewed-on: https://gerrit.libreoffice.org/21077 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-01-05do not require newest libmwaw for buildDavid Tardon
Change-Id: Ic0f9e47c2128b74deb0a948c1853afb13ae5fd1d (cherry picked from commit 3fd652b3de435e85d91154352f9a2029fd47b2d4) Reviewed-on: https://gerrit.libreoffice.org/20939 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-01-05do not require newest libetonyek for buildDavid Tardon
Change-Id: I6e023cd25a1481dd18e3a16b8756c43dde4560ce (cherry picked from commit 71f92e9a6959b2b468aa4310633e4785d4bd0ea0) Reviewed-on: https://gerrit.libreoffice.org/20938 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
generated by cgit (git 2.34.1) at 2025-03-10 16:45:21 +0000