ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity
446,180 Commits 3 Branches 3 Tags
ae855bf48163ff64d94cfc34aff8e37abdb5518d
Commit Graph
40 Commits
Author SHA1 Message Date
Samuel MehrbrodtandStephan Bergmann 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
Andrea Gelmini 127b2e5999 Fix typos 
Change-Id: I63da858b3f264cd099e60192633b44d362b6fad7
Reviewed-on: https://gerrit.libreoffice.org/35055
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
 2017-03-12 20:02:11 +00:00
Miklos Vajna 44aefdf90d odk: add missing modelines 
Change-Id: I0bd2d761b5a75681c8c3e53664084dd3b8176107
Reviewed-on: https://gerrit.libreoffice.org/25051
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
 2016-05-17 09:03:30 +00:00
Noel Grandin 0063cf2856 java: make fields final where possible 
found by PMD

Change-Id: I87780366119c141cd2dafe6ca1bf2d9798b10aec
 2014-11-18 12:44:28 +02:00
Noel Grandin bb437029c1 java: convert fields to local variables where possible 
found by PMD

Change-Id: I05b45382b8fb1b734657ce9421a20e6ef6fbe542
Reviewed-on: https://gerrit.libreoffice.org/12376
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
 2014-11-12 11:03:29 +00:00
Noel Grandin c0415d5f1e java: remove unnecessary constructor declarations 
in the absence of any other constructors, the compiler will automatically
generate a public no-arg constructor

Change-Id: I70eca507cd8e16e33580b3398d41d70690bc2909
 2014-08-20 12:12:15 +02:00
Noel Grandin 60f152caee java: avoid unnecessary comparisons in boolean expressions 
i.e. stuff like "x == true"

Change-Id: Ib82a4a30e736df392405332fa197b588482cffcf
 2014-08-20 10:35:53 +02:00
Noel Grandin 34bcf9b498 java: remove dead methods 
found by UCDetector

Change-Id: I219caa8e680dba5a395541a778df6144841c4dde
 2014-08-13 10:24:10 +02:00
Noel Grandin da677dfd59 java: reduce scope, make fields private 
found by UCDetector

Change-Id: I7f97e15667159cf8ee776e8f32fdcdec8ec00ed6
 2014-08-13 08:49:22 +02:00
Noel Grandin 0477e6c39b java: add @Override annotation to overriding methods 
Change-Id: I086964c6f6ce52c60c52b6dbc445d3c21d22c80a
 2014-08-12 09:41:28 +02:00
Noel Grandin 8d6cf7a147 java: remove dead methods 
Change-Id: I9f2e705fd603a7c8832c0f0772bee9f395380a0d
 2014-08-08 09:48:16 +02:00
Stephan Bergmann 23a87a8622 Remove some obsolete makefile.mk 
Change-Id: I47f1a72fac3e6678b5dfe880f2f189ffc436333b
 2013-04-29 13:05:51 +02:00
Stephan Bergmann 5051209534 Adapt SDK to usage of msvcrtd for Windows --enable-dbgutil 
* Re-use existing settings/dk.mk to tunnel ENABLE_DEBUG into the SDK.  Turns out
  this was explicitly included in ~all examples Makefiles, but only after
  settings.mk where it is now used, so include it in settings.mk now and dropped
  it from all the exmaples Makefiles.

* The old settings.mk was apparently confused with using /MT ("link with
  LIBCMT.LIB") on cl command line and /MD ("link with MSVCRT.LIB") on link
  command line (where it was ignored), and you apparently can't pass both
  together to cl, so I settled on /MD (resp. /MDd) now and dropped /MT (resp.
  /MTd).  No idea if that is exactly right, however.

* Introduced client-facing LIBO_SDK_LDFLAGS_STDLIBS that covers kernel32.lib and
  msvcrt.lib vs. msvcrtd.lib on Windows.  Adapted examples Makefiles and
  /ure/source/uretest/Makefile accordingly.  Some examples Makefiles
  additionally use msvcprt.lib, no idea whether that still needs to be
  addressed.

Change-Id: Ia8d9d177e415abfbaf6f9fa6239f0ef9998868be
 2013-04-19 14:02:18 +02:00
Noel Grandin 8d87758d65 Java cleanup, remove the rest of the unnecessary casts 
Change-Id: Ia61d250f6b3711abc29569c5ece38a6f87e38daa
Reviewed-on: https://gerrit.libreoffice.org/3432
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
 2013-04-19 07:52:08 +00:00
Michael Meeks 2b4fd2c89a re-base on ALv2 code. Includes: 
Patches contributed by Pedro Giffuni:
    Avoid some uses of non portable #!/bin/bash in shell scripts.
    http://svn.apache.org/viewvc?view=revision&revision=1235297
    Reduce the dependencies on non standard GNU copy.
    http://svn.apache.org/viewvc?view=revision&revision=1238684
    Correct /usr/bin/env path.
    http://svn.apache.org/viewvc?view=revision&revision=1235619

    Complex Toolbar Controls Extension from the SDK
    Patches contributed by Ariel Constenla-Haile
    http://svn.apache.org/viewvc?view=revision&revision=1190390
    i118615 - make epm more verbose
    http://svn.apache.org/viewvc?view=revision&revision=1204288

    Patches contributed by Mathias Bauer (and others)
    gnumake4 work variously
    http://svn.apache.org/viewvc?view=revision&revision=1394707
    http://svn.apache.org/viewvc?view=revision&revision=1394326

    Patches contributed by Juergen Schmidt:
    jsc341: i117327: take care if no dependency node in current
    description exists, create one
    http://svn.apache.org/viewvc?view=revision&revision=1172101
    jsc341: i117327: add extra extension dependency check
    http://svn.apache.org/viewvc?view=revision&revision=1172098
    make initial branding changes
    http://svn.apache.org/viewvc?view=revision&revision=1231878

    Patches contributed by Ingo Schmidt
    native373: #i117733# no linux jre installation on 64 bit systems
    http://svn.apache.org/viewvc?view=revision&revision=1167536
    native373: ##164464# improve debian support
    http://svn.apache.org/viewvc?view=revision&revision=1167537

    Patch contribtued by Armin Le-Grand:
    Changed various aspects concerning usages of old vendor names
    http://svn.apache.org/viewvc?view=revision&revision=1293313

fix for neon webdav, remove coinmp bits, improve odk script,
cleanup & remove OS/2 conditionals, system ucpp fixes,
remove OS/2 conditionals, restore our license filenames.
 2012-11-12 11:46:43 +00:00
Noel Grandin 6bf09ecf1d Java cleanup, remove unnecessary imports 
I guess I missed some last time :-)

Change-Id: I164a8baa07850f783b8cdf2e7f3eeaac53a3d29b
 2012-09-10 23:43:38 +02:00
Michael Stahl 1ab899c4c8 .xml files don't need executable bits 
Change-Id: I399d086181a9f513cd95157e815551f0be9b9e95
 2012-06-22 22:39:31 +02:00
Michael Meeks b6db3e3acc re-base on ALv2 code. 
Change-Id: Ice06e639213aeb6f7f23cbf4634947dd25613db1
 2012-06-21 13:11:06 +01:00
Jens-Heiner Rechtien 1296914c84 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Mathias Bauer 013ebedd5f #i103496#: sandbox removed 2009-11-11 07:25:37 +01:00
Rüdiger Timm 80254b1f0d INTEGRATION: CWS changefileheader (1.3.188); FILE MERGED 
2008/03/31 15:52:49 rt 1.3.188.1: #i87441# Change license header to LPGL v3.
 2008-04-10 15:47:33 +00:00
Jens-Heiner Rechtien 477639ee27 INTEGRATION: CWS jsc18 (1.4.26); FILE MERGED 
2007/07/17 08:45:40 jsc 1.4.26.1: #i73857# adapt build target name to work with gnu make 3.81
 2007-07-31 12:57:07 +00:00
Oliver Bolte 3075a9e7ff INTEGRATION: CWS jsc17 (1.2.134); FILE MERGED 
2007/01/24 09:50:24 jsc 1.2.134.1: #i73750# adapt macros to new package name and change docu
 2007-01-25 10:07:59 +00:00
Oliver Bolte 24bbcbedee INTEGRATION: CWS jsc17 (1.3.124); FILE MERGED 
2007/01/22 15:35:30 jsc 1.3.124.1: #i73750# change UNOPKG_EXT to UNOOXT_EXT
 2007-01-25 10:07:47 +00:00
Rüdiger Timm 5ef0a07011 INTEGRATION: CWS ooo19126 (1.2.30); FILE MERGED 
2005/09/05 13:51:58 rt 1.2.30.1: #i54170# Change license header: remove SISSL
 2005-09-07 19:13:29 +00:00
Rüdiger Timm 93fe92cb59 INTEGRATION: CWS sdkbugfix02 (1.2.10); FILE MERGED 
2005/03/03 15:42:03 jsc 1.2.10.1: #41142# replace make with internal MAKE variable
 2005-03-29 11:14:10 +00:00
Rüdiger Timm 5b9f240cd5 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/21 13:24:59 toconnor 1.1.2.1: #i39331# adding Scripting Framework examples to SDK
 2005-01-31 15:53:43 +00:00
Rüdiger Timm 43eb9fcfac INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/21 13:24:55 toconnor 1.1.2.1: #i39331# adding Scripting Framework examples to SDK
 2005-01-31 15:53:32 +00:00
Rüdiger Timm 642d172e56 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/21 13:24:50 toconnor 1.1.2.1: #i39331# adding Scripting Framework examples to SDK
 2005-01-31 15:53:21 +00:00
Rüdiger Timm e7a881dfb3 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/21 13:24:46 toconnor 1.1.2.1: #i39331# adding Scripting Framework examples to SDK
 2005-01-31 15:53:11 +00:00
Rüdiger Timm 1cece44e93 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/21 13:24:42 toconnor 1.1.2.1: #i39331# adding Scripting Framework examples to SDK
 2005-01-31 15:53:01 +00:00
Rüdiger Timm b70ec2fcf7 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/21 13:24:35 toconnor 1.1.2.2: #i39331# adding Scripting Framework examples to SDK
2005/01/19 17:22:14 toconnor 1.1.2.1: #i39331# add Scripting Framework examples to SDK
Issue number:
Submitted by:
Reviewed by:
 2005-01-31 15:52:50 +00:00
Rüdiger Timm 485f2442c2 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/21 13:24:34 toconnor 1.1.2.2: #i39331# adding Scripting Framework examples to SDK
2005/01/19 17:22:13 toconnor 1.1.2.1: #i39331# add Scripting Framework examples to SDK
Issue number:
Submitted by:
Reviewed by:
 2005-01-31 15:52:40 +00:00
Rüdiger Timm 7cdafdecbe INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/28 14:15:34 jsc 1.1.2.4: #i29308# prepare path for del command (windows only)
2005/01/27 17:01:52 jsc 1.1.2.3: #i39331# insert dk.mk to support different output dir
2005/01/21 14:35:51 jsc 1.1.2.2: #i39331# updated
2005/01/21 13:24:33 toconnor 1.1.2.1: #i39331# adding Scripting Framework examples to SDK
 2005-01-31 15:52:18 +00:00
Rüdiger Timm 3880ff0162 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/19 17:22:13 toconnor 1.1.2.1: #i39331# add Scripting Framework examples to SDK
Issue number:
Submitted by:
Reviewed by:
 2005-01-31 15:52:07 +00:00
Rüdiger Timm 372eda3df2 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/21 13:24:31 toconnor 1.1.2.2: #i39331# adding Scripting Framework examples to SDK
2005/01/19 17:22:12 toconnor 1.1.2.1: #i39331# add Scripting Framework examples to SDK
Issue number:
Submitted by:
Reviewed by:
 2005-01-31 15:51:56 +00:00
Rüdiger Timm 9c5b8d40f1 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/19 17:22:11 toconnor 1.1.2.1: #i39331# add Scripting Framework examples to SDK
Issue number:
Submitted by:
Reviewed by:
 2005-01-31 15:51:45 +00:00
Rüdiger Timm 65e3fac0eb INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/19 17:22:10 toconnor 1.1.2.1: #i39331# add Scripting Framework examples to SDK
Issue number:
Submitted by:
Reviewed by:
 2005-01-31 15:51:35 +00:00
Rüdiger Timm 4ad35e875a INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/28 14:15:34 jsc 1.1.2.4: #i29308# prepare path for del command (windows only)
2005/01/27 17:01:49 jsc 1.1.2.3: #i39331# insert dk.mk to support different output dir
2005/01/21 14:35:44 jsc 1.1.2.2: #i39331# updated
2005/01/21 13:24:30 toconnor 1.1.2.1: #i39331# adding Scripting Framework examples to SDK
 2005-01-31 15:51:13 +00:00
Rüdiger Timm 5dc43b1c31 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED 
2005/01/21 13:24:25 toconnor 1.1.2.2: #i39331# adding Scripting Framework examples to SDK
2005/01/19 17:22:10 toconnor 1.1.2.1: #i39331# add Scripting Framework examples to SDK
Issue number:
Submitted by:
Reviewed by:
 2005-01-31 15:51:02 +00:00