summaryrefslogtreecommitdiffstats
path: root/cppuhelper
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-10-25 13:54:03 +0200
committerCaolán McNamara <caolanm@redhat.com>2012-10-27 15:30:59 +0000
commitc309ce0227a14330094191c1ef15fa00899defcb (patch)
tree82d7dacfab4d6042df67bb45909bfa023c911d98 /cppuhelper
parentResolves: rhbz#868479 / fdo#56281 doubled ~ in German ok/cancel translations (diff)
downloadcore-libreoffice-3-6-3.tar.gz
core-libreoffice-3-6-3.zip
fdo#53474: Fix Windows Java Accessibility Bridge libreoffice-3-6-3
...by folding the contents of java_accessibility.jar back into java_uno_accessbridge.jar. In the old build system there were two jars, java_uno_accessbridge.jar containing the handful of org.openoffice.accessibility classes and all org.openoffice.java.accessibility classes (though how the latter got included was fairly obscure in the makefile.mk) and unused java_accessibility.jar that contained all org.openoffice.java.accessibility classes. When adapting this to gbuild, the unused java_accessibility.jar was carried over, but all its org.openoffice.accessibility classes were inadvertently droped from java_uno_accessbridge.jar. (cherry picked from commit 5ba1694606577f9cda2b773d82ae765118bfc9e1) Conflicts: Repository.mk accessibility/Jar_accessibility.mk accessibility/Jar_uno_accessbridge.mk Change-Id: I9b582ba22667b1dae635828e85c4cc5b530353ac Reviewed-on: https://gerrit.libreoffice.org/907 Reviewed-by: Michael Meeks <michael.meeks@suse.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cppuhelper')
0 files changed, 0 insertions, 0 deletions