New branch 'distro/collabora/libreoffice-4.0.6.2' available with the following
commits:
commit 36f1060e3c5be0946cd1bc811b84cc542fafe70b
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sun Aug 20 06:22:29 2017 +0000
i#32546# - Java UnoRuntime.getUniqueKey/generateOid do not work reliably
In the Java UNO bridge, UnoRuntime.generateOid() generated the
object-specific part of the OID using java.lang.Object.hashCode(),
which is only 32 bits long, and is commonly overriden and could thus
return values from an even smaller range, so OID collisions were quite
likely.
This changes UnoRuntime.generateOid() to use 128 bit UUIDs for the
object-specific part of the OID, and store these in an object => oid
java.util.WeakHashMap, making OID collisions almost impossible.
Patch by: me
Suggested by: Stephan Bergmann (stephan dot bergmann dot secondary at
googlemail dot com)
(cherry picked from commit 6dd83d1c6c5c580d14ca3d0458be4020603ba118)
Change-Id: I8e851a7a69ac2defefa15e9a00118d8f9fc0da95
Reviewed-on: https://gerrit.libreoffice.org/41576
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
commit 4a92919c5b1f94ccc58acc01ad3fb40961fce7ad
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Jun 6 12:34:08 2016 +0200
SwXDispatchProviderInterceptor: implement frame::XInterceptorInfo
With this, framework::InterceptionHelper can make a better decision what
interceptor to call: it can avoid calling SwXDispatchProviderInterceptor
when the sw code would just call the previous interceptor anyway.
Reviewed-on: https://gerrit.libreoffice.org/25961
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
(cherry picked from commit b0d819ac5667a07f629f2acb5d3c542fa76d348b)
Conflicts:
sw/source/uibase/inc/unodispatch.hxx
sw/source/uibase/uno/unodispatch.cxx
Change-Id: I92897f2c8baa264dc9ccbc11b63f415da30a910d
commit b99c91d1d78915fea57ba6b8c905e68ae1ad4632
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Fri May 20 16:48:00 2016 +0200
framework: last dispatchInterceptor gets asked first
Align implementation with API contract as spelled out in
offapi/com/sun/star/frame/XDispatchProviderInterception.idl -
no idea why this change happenend in 2003:
Date: Fri Apr 4 16:16:05 2003 +0000
INTEGRATION: CWS fwk01 (1.1.72); FILE MERGED
2003/04/01 12:40:09 as 1.1.72.1: #107642# change order of used interception
objects
At any rate, with this change extensions actually get a chance to
see dispatch requests first, and process/ignore at will.
Change-Id: I58876150ee6d67e592f41b3e82a9ffc314e091a3
Reviewed-on: https://gerrit.libreoffice.org/25215
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 08cf2fd01064306eef7fdbb5b62320947c4d1089)
commit aa7f4295c0d428f79149228c3b4d38d6212d3906
Author: Thorsten Behrens <thorsten.behr...@cib.de>
Date: Wed Mar 2 15:28:36 2016 +0100
framework: avoid excessive queryDispatch calls
Make better use of the css::frame::XInterceptorInfo interface, to avoid
calling queryDispatch() pointlessly on interfaces that have explicitely
opted out. Since that already broadcasts which urls we're interested in
- so just don't bother calling entries who are not matching.
Reviewed-on: https://gerrit.libreoffice.org/25214
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 27b6cdb5ab5af33dbba561923c8db81e144c88b9)
Conflicts:
framework/source/dispatch/interceptionhelper.cxx
Change-Id: Id5e780568fd60c38f4cee4ee800d747d65a31dae
commit b910152f23678e83b6f6ac0b2ad6728de9ebd92c
Author: shubhamtibra <shubh.ti...@gmail.com>
Date: Sat Jan 16 21:50:24 2016 +0530
tdf#96949 Remove global static variable m_bPreferrFirstInterceptor and ...
... unused code
Remove global static variable "m_bPreferrFirstInterceptor" which is always
true,
and remove the ifs where it is false.
Reviewed-on: https://gerrit.libreoffice.org/21519
Reviewed-by: jan iversen <j...@documentfoundation.org>
Tested-by: jan iversen <j...@documentfoundation.org>
(cherry picked from commit 5d4f1f6f630d4382679087a4fb0da364c9c9692b)
Conflicts:
framework/inc/dispatch/interceptionhelper.hxx
framework/source/dispatch/interceptionhelper.cxx
Change-Id: I54dcea7a6010c825a66020ec3f7448bb32d120b8
commit 3e4efb6902141051374082458626b97e543b0053
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu May 12 20:32:34 2016 +0200
framework: register DispatchDisabler service
Change-Id: I72d9f8b00ba8b2e4e5dc70d7fd77e13ccf9d3bcc
Reviewed-on: https://gerrit.libreoffice.org/24940
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
(cherry picked from commit 1f041bf31e071611a15ffa1559d2f5df05a685f0)
commit 333c2e3ae9c1184ecb2894cb280364a31571eeae
Author: Michael Meeks <michael.me...@collabora.com>
Date: Thu Jan 7 19:24:41 2016 +0000
framework: initial implementation of a dispatch disabler.
This should allow remote, eg. URE dispatchers to trivially disable
lots of the UI without requiring a large volume of round-trip IPC.
Reviewed-on: https://gerrit.libreoffice.org/24938
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
(cherry picked from commit 02833c03ee856a62d7185829b7c47bc088e086cc)
Conflicts:
framework/inc/services.h
Change-Id: Ibd0681ac993196f826b4ed411da5ffedb7f85786
commit 012158ee80a625db21a774dda3463127534a1476
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Jun 29 14:08:55 2016 +0200
Silence javadoc 8 errors
Just the minimal amount of changes to fix the build.
Change-Id: I307f4df108caa96ec489ec151bfa47837480b92d
