Commit graph

359 commits

Author SHA1 Message Date
Samuel Mehrbrodt
35518c9236 Move all public Java classes to libreoffice.jar
This moves the classes from juh.jar and ridl.jar to libreoffice.jar

The goal is to have one single jar (and Java module, will be added later)
which developers can include to work with LO.

juh.jar and ridl.jar are kept as basically empty jars with libreoffice.jar
on its classpath to keep backwards compatibility.

This is a continuation of ae855bf481
and a preparation to have Java 9 module support.

Change-Id: Ifbbfb97f60373d14256e62ae3122913bd17d5bbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91930
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-06 14:48:21 +02:00
Noel Grandin
14471a6942 loplugin:buriedassign in b*
Change-Id: Ic20f46105a30b54bc5a991b4070e6c8edb15376e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92189
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-14 16:17:55 +02:00
Samuel Mehrbrodt
ae855bf481 tdf#117331 Merge jurt and unoil into ridl
jurt.jar and unoil.jar are kept as effectively empty jars, each with a

  Class-Path: ridl.jar

in their meta-inf/manifest.mf, so that 3rd-party code loading them (with or
without also loading ridl.jar) will still have access to their content.

Conceptually, the UNOIDL entities in unoil.jar (corresponding to module offapi)
are not part of the URE, but are now made available by URE's ridl.jar.  This
should probably not cause problems in practice.

At least for now, we seal exactly those packages in ridl.jar that were
originally sealed in jurt.jar.  Ideally, all of ridl.jar could be sealed now,
but that would be mildly incompatible, as it would prevent 3rd-party code from
introducing additional UNOIDL entities in the relevant namespaces (even if that
is something we do not want 3rd-party code to do anyway).

However, some JunitTest_jurt_* define classes in those sealed packages.  In the
past they got away with that by using gb_JunitTest_use_jar_classset,*,jurt.
Instead they now need to gb_JunitTest_use_jar_classset,*,ridl and drop the
gb_JunitTest_use_jar,*,ridl.  But the former only makes available the classes
that are specified in ridljar/Jar_ridl.mk with gb_Jar_add_sourcefiles, not the
UNOIDL entities specified via gb_Jar_add_packagedirs.  But the tests need the
udkapi UNOIDL entities, so introduce gb_JunitTest_add_classpath to let the tests
get them explicitly.  (Curiously, JunitTest_jurt_uno and JnitTest_jurt_util use
gb_JunitTest_use_jar_classset,*,jurt but don't seem to acutally need it; lets
leave that for a follow-up clean up.)

As a follow-up clean up, relevant files could be moved from jurt/ to ridljar/.

Change-Id: I836f4e7bb47fb41f1306e3f223da90dba988eb9a
Co-authored-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/84946
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-02-04 22:03:54 +01:00
Caolán McNamara
26960bad06 cid#1448230 Dereference null return value
Change-Id: I846959c2f92dc8078ad2ed8accb8f7be0f2833ce
Reviewed-on: https://gerrit.libreoffice.org/83023
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-17 20:08:23 +01:00
Caolán McNamara
46920005f7 cid#1448516 silence Dereference null return value
Change-Id: Ifb7e14183e97c225ed7e68f93e6142d10c4a87b0
Reviewed-on: https://gerrit.libreoffice.org/82991
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-16 20:25:07 +01:00
Caolán McNamara
cd173ae7d6 cid#1448226 silence RV: Bad use of return value
Change-Id: Ie85ea159ebed117c11a1d5d67c4292be8ca5b8e8
Reviewed-on: https://gerrit.libreoffice.org/82994
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-11-16 20:23:44 +01:00
Andrea Gelmini
77902a3cb2 Fixing '....'
Change-Id: Icf2a34500acc18b28f113c85366bf24edc6d20b9
Reviewed-on: https://gerrit.libreoffice.org/78695
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-09-06 14:12:27 +02:00
Tomoyuki Kubota
51f1e62e2d @deprecated should be with @Deprecated
Without this patch, warnings will be given 
when LibreOffice is built with JDK9 or later.

Change-Id: I7aa6e99ace2377fbdb7dd732949ce10d9bd9df58
Reviewed-on: https://gerrit.libreoffice.org/72947
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-05-27 11:40:35 +02:00
Caolán McNamara
fbc038cc4f an uno -> a uno
Change-Id: I538db88f8477dd2d2ad25c372928fec6c11d979d
Reviewed-on: https://gerrit.libreoffice.org/72105
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-05-10 14:50:59 +02:00
Caolán McNamara
1156f981ac an is used before a vowel sound
not before vowels with a consonant sound so its a url not an url

Change-Id: Ic27ff3bee67469284d460c31ced6f63cb3633db2
Reviewed-on: https://gerrit.libreoffice.org/72062
Reviewed-by: Jens Carl <j.carl43@gmx.de>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2019-05-10 10:01:13 +02:00
Andrea Gelmini
e473067c67 Fix typo
Change-Id: Ib61a8a14923864757ed83e3914bcb4ac1aae6a22
Reviewed-on: https://gerrit.libreoffice.org/70991
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-04-20 07:54:23 +02:00
Andrea Gelmini
30a9bfec76 Fix typo
Change-Id: Ifb1b63c27816c244d98fabfd97114c21c9e4ffa4
Reviewed-on: https://gerrit.libreoffice.org/70443
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-04-09 07:56:02 +02:00
Andrea Gelmini
3e7646280d Fix typo
Change-Id: Ibc0b22ac1e3b58d91674822a2378703c681c6a7c
Reviewed-on: https://gerrit.libreoffice.org/70445
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-04-09 07:31:22 +02:00
Andrea Gelmini
350d159754 Fix typo
Change-Id: Ia52e717551d50e57d59feba5709d6bf25e1dc1a2
Reviewed-on: https://gerrit.libreoffice.org/70441
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-04-09 07:27:35 +02:00
Andrea Gelmini
a78ffa922e Fix typo
Change-Id: Icabc8b356d18ee5381f7d43233341a9d8e42ef9c
Reviewed-on: https://gerrit.libreoffice.org/70444
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
2019-04-09 07:10:46 +02:00
Andrea Gelmini
eeeae885b7 Fix typo
Change-Id: If648e007a6db44e26021c12ac919d81ccceaa081
Reviewed-on: https://gerrit.libreoffice.org/66981
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2019-01-28 09:16:24 +01:00
Andrea Gelmini
c814036604 Fix typos
Change-Id: I2715bcbaf642fd24d61f61dbf4e978e06afbf102
Reviewed-on: https://gerrit.libreoffice.org/57824
Tested-by: Jenkins
Reviewed-by: Jens Carl <j.carl43@gmx.de>
2018-07-22 20:26:06 +02:00
Andrea Gelmini
563fe60878 Fix typos
Change-Id: I5195d13b351c0eebad1eae901f7ce8408a9e5c92
Reviewed-on: https://gerrit.libreoffice.org/57028
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2018-07-18 12:49:03 +02:00
Gulsah Kose
9001f5fca0 Use https instead of http
Use "https://cgit.freedesktop.org/libreoffice/core"
instead of "http://cgit.freedesktop.org/libreoffice/core"

Change-Id: Ic7248eeb2a9452da7236eeee08414a77714dd234
Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/52926
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
2018-04-16 15:57:08 +02:00
Mike Kaganski
0b3ecd909c bean: MSVC: pragma warning: make more specific, remove obsolete
Change-Id: Id575db58199f438e95d9c73778cc520c452e1a42
Reviewed-on: https://gerrit.libreoffice.org/48948
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2018-01-31 21:02:06 +01:00
Andrea Gelmini
cfffb09b3d Fix typos
Change-Id: I2a578961837076ebce3c1fb2681b0785d1d490ac
Reviewed-on: https://gerrit.libreoffice.org/47857
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2018-01-14 16:24:04 +01:00
Andrea Gelmini
5877a3733c Fix typos
Change-Id: I0a8579406a70d2f63d96969c766e2a43d830ed6f
Reviewed-on: https://gerrit.libreoffice.org/47114
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
2017-12-28 14:43:13 +01:00
Stephan Bergmann
794120f5c6 loplugin:includeform: bean (Windows)
Change-Id: Id35caf31499a437cba9ed3329920c560705be0cf
2017-10-27 19:28:53 +02:00
Stephan Bergmann
8568732c0f loplugin:includeform: bean
Change-Id: I3487839569e34552d8b6409b04ef842346c43f5c
2017-10-23 22:46:13 +02:00
Mike Kaganski
362a21d3a1 Use explicit function names for fooA/fooW WinAPI; prefer fooW
We should only use generic foo function name when it takes params
that are also dependent on UNICODE define, like
LoadCursor( nullptr, IDC_ARROW )
where IDC_ARROW is defined in MSVC headers synchronised with
LoadCursor definition.

We should always use Unicode API for any file paths operations,
because otherwise we will get "?" for any character in path that
is not in current non-unicode codepage, which will result in failed
file operations.

Change-Id: I3a7f453ca0f893002d8a9764318919709fd8b633
Reviewed-on: https://gerrit.libreoffice.org/42935
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-09-30 11:23:41 +02:00
Mike Kaganski
afeff9102c Use even more WIN32_LEAN_AND_MEAN
Change-Id: I538fe5b41156366e0e87b3a93e58a3947afd18f5
Reviewed-on: https://gerrit.libreoffice.org/42398
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2017-09-18 01:13:30 +02:00
Julien Nabet
4d21d4ceee Typo about "document"
Change-Id: Id12718b5b80b08f18fa9a0370c1991d94b2892ec
Reviewed-on: https://gerrit.libreoffice.org/41353
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2017-08-20 12:51:00 +02:00
David Ostrovsky
de030cd7a2 gbuild: Remove MSVC 2013 legacy code
Uwinapi is discontinued.

Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01
Reviewed-on: https://gerrit.libreoffice.org/23198
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
2017-04-21 18:18:44 +02:00
Andrea Gelmini
5ad636acc6 Fix typos
Change-Id: Idbf0aa261b829e83d4c08a2e989a4ced871dc6de
Reviewed-on: https://gerrit.libreoffice.org/35616
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
2017-03-26 20:37:59 +00:00
Stephan Bergmann
2200177856 clang-cl loplugin: bean
Change-Id: Iedaf2fc0c1e2cab446687c6c73cceb3c6b77e6e1
Reviewed-on: https://gerrit.libreoffice.org/29880
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-16 14:19:32 +00:00
Stephan Bergmann
667c9c1897 Revert "Don't use the (win32) jawt_md.h as we don't have that when cross-compiling"
This reverts commit db57823374, as it causes
loplugin:externandnotdefined under clang-cl, and cross-compiling Windows on
Linux seems a rather dead project for now.

Change-Id: Ia7fd742385fa0d609007f70e5116a99729224f77
Reviewed-on: https://gerrit.libreoffice.org/29835
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-10-14 19:27:59 +00:00
Stephan Bergmann
583cfc97e9 Remove debug code
...that got introduced with c30b5d2a38 "cid#1358838
cid#1358839 cid#1358840 assert to avoid null pointer dereference"

Change-Id: I50faaf291ac9059ee557d059393a97a0fcc397bf
2016-05-02 11:04:04 +02:00
Miklos Vajna
c30b5d2a38 cid#1358838 cid#1358839 cid#1358840 assert to avoid null pointer dereference
Change-Id: I95f069cb3efa7137c9382c9d9eb6d1353471d28e
Reviewed-on: https://gerrit.libreoffice.org/24498
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2016-04-29 16:18:15 +00:00
Miklos Vajna
db4cba7603 beans: if loading a library fails, show the reason
Don't do it for the MSVC libraries though, e.g. on my system loading
msvcr70 fails, but the SDK example works without problems.

Change-Id: I81bc0b64967e7abb74ca1fff7a2e4b4dbd75d5a5
Reviewed-on: https://gerrit.libreoffice.org/24432
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2016-04-27 16:42:31 +00:00
Miklos Vajna
e58aa27adf bean: fix the OfficeBean SDK example
Regression from 26b4f5be81 (java:use
System.arrayCopy to copy arrays, 2015-06-09), as the old code used to handle
the case when aArguments was null.

How to reproduce:

1) Source the SDK environment.
2) cd instdir/sdk/examples/DevelopersGuide/OfficeBean/
3) make OOoBeanViewer.run
4) Click new document... -> Text Document -> NullPointerException

Change-Id: I5521c7fd200f6c74c5f2665f2e4a99f0d6abfeeb
Reviewed-on: https://gerrit.libreoffice.org/24366
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
2016-04-25 14:56:08 +00:00
Christian Lohmaier
0531039157 neither doxygen nor javadoc make use of <type scope="…"> annotations
even more so when they are invalid xml.
Thus obsolete since the switch from autodoc to doxygen, see also
https://lists.freedesktop.org/archives/libreoffice/2013-June/053077.html

Change-Id: Ifc2ef7754eca70bf923a2f7e4a652a8d394c370b
2016-03-11 13:47:43 +01:00
Christian Lohmaier
82bf21f4d0 NoConnectionException is com.sun.star.comp.beans.NoConnectionException
and not com.sun.star.lang.NoConnectionException

Change-Id: Ie7b5a2aaa365fefeca1de470c18edc68c29e4a74
2016-03-11 13:47:41 +01:00
Christian Lohmaier
ee69514c84 javadoc is HTML 4, not xhtml or html5, so <br/> is not allowed
Change-Id: I0da91e0f6cb7fca09cb5ae08f6d3ef13829653d9
2016-03-11 13:47:40 +01:00
Caolán McNamara
1ffa92cfe3 coverity#1326333 Unguarded write
Change-Id: I94026a7b66a0cac01a1e42d8eee0ec7b4d5fc513
2016-03-04 11:24:27 +00:00
Andrea Gelmini
534b2a4b58 Fix typos
Change-Id: Ice72f8d9971e15dd6ef365e64cd567b8581a92d3
Reviewed-on: https://gerrit.libreoffice.org/21797
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2016-02-05 06:48:38 +00:00
Chris Sherlock
001272c9d4 officebeans: RVP no longer used, only local used now
Change-Id: I5f09d25a6e267c793c469c08e8f7f46521fdcd49
2016-02-05 14:02:01 +11:00
Andrea Gelmini
92e60e1b80 Fix typos
Change-Id: I1b79005d9c4e32325b8dadcc4f805975d6bf2727
Reviewed-on: https://gerrit.libreoffice.org/21103
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
2016-01-05 07:32:28 +00:00
David Ostrovsky
1fd41f43eb Add build toolchain to upload LibreOffice API to Maven Central
Set up the toolchain to create sources and javadocs artifacts in
addition to JARs created during the build. Use Buck build tool for
that: [1]. This is a fork of Google's build tool Blaze, created by
Xooglers at Facebook. This build tool (like Blaze itself) uses
Python to write build files.

Add needed tools and build files to install LibreOffice API artifacts
to local Maven repository or deploy them to Maven Central.

To build all needed artifacts LibreOffice must be built regularly
with GNU make first. To build the rest of the API (sources and
javadocs):

  $> buck build api

To replace version number with upcoming release version:

  $> solenv/bin/version.py 5.1.0

To install the API to local Maven repository:

  $> buck build api_install

To deploy the API to Maven Central:

  $> buck build api_deploy

Detailed documentation is added to document the prerequisites and
the workflow to upload LibreOffice API to Maven Central.

* [1] https://buckbuild.com

Change-Id: Ibdd552a01110836703bc069abe829b9921491cac
Reviewed-on: https://gerrit.libreoffice.org/20343
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-12-03 23:32:11 +00:00
David Ostrovsky
9ca2de8c59 Expose metadata to deploy LibreOffice artifacts on Maven Central
As outlined in the requirements to deploy the artifacts on Maven
Central, the metdata must be provided:

* Project Name, Description and URL
* License Information
* Developer Information
* SCM Information

[1] http://central.sonatype.org/pages/requirements.html

Change-Id: I0bcd19a22d0e1a48f0faec0b414f816f7da5b318
Reviewed-on: https://gerrit.libreoffice.org/20315
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-12-01 08:45:25 +00:00
Noel Grandin
3f50c6e050 java: remove ((unnecessary)) parentheses
Change-Id: I39fbe3a260c8dbfc203662c54eec4db064b88195
2015-11-05 14:55:16 +02:00
Noel Grandin
eda52500c7 java:avoid empty if statements
Change-Id: I9c66dd5331f422d8d6271157fece2b346d8b3756
2015-11-05 13:43:02 +02:00
Caolán McNamara
69eaba2e9b coverity#1328488 DLS: Dead local store
Change-Id: Ief4b5909d40ee3c3c86f60eeb980591a3e8b230e
2015-10-22 16:45:04 +01:00
Caolán McNamara
8536c27960 coverity#1326431 Dereference null return value
Change-Id: Ib85b3e03d2a9ce6339cd2496e33cc09cff2b9952
2015-10-20 21:18:36 +01:00
Noel Grandin
9ca4c4f086 cid#1326334 Unguarded read
Change-Id: I8cfe2805f2b8c1ae23fa955a28ff9ec43f353e38
2015-10-16 12:51:40 +02:00
Caolán McNamara
ab22d11279 coverity#1326731 Dm: Dubious method used
and

coverity#1326732 Dm: Dubious method used
coverity#1326734 Dm: Dubious method used
coverity#1326735 Dm: Dubious method used
coverity#1326739 Dm: Dubious method used

Change-Id: Id9d39decf7442b503079ebcfe8c881f0f2fe3eb3
2015-10-15 14:26:05 +01:00