Commit Graph
42 Commits
Author SHA1 Message Date
Stephan Bergmann 5687eba49f Drop obsolete preprocessor directives from UNOIDL files
...which were used by ildc, which is gone since
a8485d558f "[API CHANGE] Remove deprecated idlc
and regmerge from the SDK", and have always been ignored as legacy by its
unoidl-write replacement.

This change has been carried out (making use of GNU sed extensions) with

> for i in $(git ls-files \*.idl); do sed -i -z -E -e 's/\n\n((#[^\n]*\n)+\n)*(#[^\n]*\n)+\n?/\n\n/g' -e 's/\n(#[^\n]*\n)+/\n/g' "$i"; done && git checkout extensions/source/activex/so_activex.idl odk/examples/OLE/activex/so_activex.idl

which apparently happened to do the work.  (The final two files are not UNOIDL
source files.)

Change-Id: Ic9369e05d46e8f7e8a304ab01740b171b92335cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135683
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-06-13 16:27:45 +02:00
Stephan Bergmann 40f2aee658 Provide unoidl-write also for the SDK
...after the new types.rdb format that unoidl-write generates has been used
internally since LibreOffice 4.1 in 2013; following up on
6db34b6b33 "Directly build UNOIDL .rdb files from
.idl files" and its "The legacy tools idlc, regcompare, regmerge, and regview
are still contained in the URE or SDK for now."

The tools idlc and regmerge are deprecated but still shipped in the SDK for now.
The plan is to drop them completely for LO 7.5.

odk/examples/ and ure/source/uretest/ are adapted to use unoidl-write instead of
idlc and regmerge:

* unoidl-write does not use a C preprocessor and the # directives in .idl files,
  it supports reading a single .idl file (containing an arbitrary number of
  declarations) or a directory tree where each directory corresponds to a UNOIDL
  module of the same name and each .idl file contains the declaration of the
  (non-module) UNOIDL entity of the same name.  For some of the odk/examples/,
  that required moving individual .idl files into sub-directories named after
  the respective modules.  In odk/settings/std.mk, definitinos of IDL and
  REGMERGE have been replaced with a new UNOIDLWRITE.

* unoidl-write always enforces reserved UNOIDL identifier restrictions (see
  04af4e4f55 "[API CHANGE] Fix all bad UNOIDL
  identifiers across offapi" and 6201792406
  "Enforce the UNOIDL identifier scheme") (which idlc only enforced optionally
  with -cid -we).  That required renaming "my_module" in
  odk/examples/DevelopersGuide/Components/CppComponent/.

* The new types.rdb format is not compatibly with LibreOffice < 4.1.  Clients
  generating extensions containing such files are advised to use appropriate
  LibreOffice-minimal-version elements.

Change-Id: I1a248fd96e86ecbf407f829bc100d44bfe7f4e7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130533
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-02-25 16:46:26 +01:00
Julien Nabet f60603a2d7 typos
Change-Id: I3a28b5ce7464de724799997234925533d45f6121
Reviewed-on: https://gerrit.libreoffice.org/38420
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Tested-by: Julien Nabet <serval2412@yahoo.fr>
2017-06-05 21:29:27 +02:00
Otto Kekäläinen 428e23f4f7 Fix some spelling errors in comments and strings
Change-Id: Iecd6b5e13d6be14651f77d8e37f01117ba15a11e
Reviewed-on: https://gerrit.libreoffice.org/26883
Reviewed-by: jan iversen <jani@documentfoundation.org>
Tested-by: jan iversen <jani@documentfoundation.org>
2016-07-04 06:11:36 +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 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 d504294a77 java: remove some unused fields in the ODK examples
Change-Id: Ic6b4f18aefba6603af51d17d061e3f821e95261f
2014-08-05 11:31:49 +02:00
Noel Grandin 0781dad870 java: remove commented out code for OpenOffice 3.3
Specifically the comment says:
 This method not longer necessary since OOo 3.4 where the component registration
 was changed to passive component registration. For more details see
 http://wiki.openoffice.org/wiki/Passive_Component_Registration

Change-Id: Icfeec634ebc30a270533787b94e2a9a4318778db
2014-08-04 14:50:59 +02:00
Stephan Bergmann 271cd24927 odk: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I48b3206bf9c2186c991637b58120285c8c0ee00a
2014-03-10 17:39:56 +01:00
Caolán McNamara 3656a57e88 add mode lines to new files (and idls) since last run
Change-Id: Id1e74f18c90e69d1a781c8f02e30dc3c005ed4fd
2013-09-22 12:21:34 +01:00
Andras Timar 6ea6a422fb s/wiki.services.openoffice.org/wiki.openoffice.org/g
Change-Id: I059fbee385a109069c70f3869021c8e2ee48fee1
2013-09-07 14:21:22 +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
Stephan Bergmann 14a2413530 Adapt SDK to -B removed from cppumaker/javamaker
Change-Id: Ida4d11e0f8dfea201e0456cc54aa7f5af093d2ad
2013-04-11 14:24:08 +02: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
Thomas Arnhold cdaddecc5e java: printStackTrace always to stderr
like 3d3b3f656f

Change-Id: I6e80717de009e8a3a89ffc80cb945cc832917f8c
2012-07-13 12:45:57 +02:00
Juergen Schmidt 928af9414d jsc340: i114609: support passive component registration 2011-02-22 16:13:49 +01:00
Juergen Schmidt 134b85e8f8 jsc340: i114609: support passive component registration 2011-02-01 18:08:59 +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
Ivo Hinkelmann 6df63a0fa7 CWS-TOOLING: integrate CWS sdk31fix_DEV300
2009-04-03 15:43:49 +0200 jsc  r270492 : correct classpath
2009-04-02 16:27:49 +0200 jsc  r270416 : fix typo in run target and classpath
2009-04-02 16:27:14 +0200 jsc  r270415 : remove Inspector example, change docu to link into the wiki on the related project page
2009-04-01 14:07:33 +0200 jsc  r270327 : #i100723# add Uno-Type-Path to jar manifest
2009-04-01 11:57:53 +0200 jsc  r270315 : #i100723# add Uno-Type-Path to jar manifest
2009-04-01 11:47:59 +0200 jsc  r270314 : #i100723# add Uno-Type-Path to jar manifest
2009-04-01 09:33:10 +0200 jsc  r270304 : #i100723# add Uno-Type-Path to jar manifest
2009-04-01 09:30:39 +0200 jsc  r270303 : #i100723# add Uno-Type-Path to jar manifest
2009-04-01 09:29:19 +0200 jsc  r270301 : #i100712# change header image version number
2009-04-22 12:39:28 +00:00
Rüdiger Timm 163982c4f9 INTEGRATION: CWS jsc21 (1.4.208); FILE MERGED
2008/02/13 13:47:27 jsc 1.4.208.1: #i72964# cleanup header guards
2008-07-11 13:19:31 +00:00
Rüdiger Timm fcdd65c390 INTEGRATION: CWS jsc21 (1.2.208); FILE MERGED
2008/02/13 13:47:27 jsc 1.2.208.1: #i72964# cleanup header guards
2008-07-11 13:19:03 +00:00
Rüdiger Timm 89cc08ba4a INTEGRATION: CWS jsc21 (1.8.74); FILE MERGED
2008/05/23 11:55:45 jsc 1.8.74.1: #i88797# change OFFICE_TYPE_LIBRARY to URE_TYPES and OFFICE_TYPES
2008-07-11 13:18:30 +00:00
Oliver Bolte 4ae55e9ab7 INTEGRATION: CWS jsc17 (1.7.124); FILE MERGED
2007/01/22 15:35:27 jsc 1.7.124.1: #i73750# change UNOPKG_EXT to UNOOXT_EXT
2007-01-25 10:04:26 +00:00
Rüdiger Timm 3de7358f15 INTEGRATION: CWS sdkbugfix02 (1.6.10); FILE MERGED
2005/03/03 15:41:52 jsc 1.6.10.1: #41142# replace make with internal MAKE variable
2005-03-29 11:08:49 +00:00
Kurt Zenker 1e5cd4baaf INTEGRATION: CWS sdkbugfix01 (1.2.6); FILE MERGED
2005/02/15 17:24:16 jsc 1.2.6.1: #i42061# wait for return (CarridgeReturn and LineFeed)
2005-03-01 11:08:28 +00:00
Rüdiger Timm ea4b5801d7 INTEGRATION: CWS sdksample (1.3.124); FILE MERGED
2004/06/07 16:00:30 jsc 1.3.124.1: #i29308# use of new UNO features
2005-01-31 15:16:17 +00:00
Rüdiger Timm 360f16b46b INTEGRATION: CWS sdksample (1.3.124); FILE MERGED
2004/06/30 09:10:26 jsc 1.3.124.1: #i29308# use of new UNO features
2005-01-31 15:15:49 +00:00
Rüdiger Timm fd489e9990 INTEGRATION: CWS sdksample (1.1.2); FILE ADDED
2004/06/30 09:10:26 jsc 1.1.2.2: #i29308# use of new UNO features
2004/06/07 15:59:53 jsc 1.1.2.1: #i29308# new
2005-01-31 15:15:35 +00:00
Rüdiger Timm 79598aa8fc INTEGRATION: CWS sdksample (1.1.2); FILE ADDED
2004/06/07 15:59:41 jsc 1.1.2.1: #i29308# new
2005-01-31 15:14:58 +00:00
Rüdiger Timm 6240e27f2c INTEGRATION: CWS sdksample (1.1.2); FILE ADDED
2004/06/07 15:59:25 jsc 1.1.2.1: #i29308# new
2005-01-31 15:14:47 +00:00
Rüdiger Timm 218afb1535 INTEGRATION: CWS sdksample (1.5.4); FILE MERGED
2005/01/28 14:15:18 jsc 1.5.4.13: #i29308# prepare path for del command (windows only)
2004/10/29 07:33:41 jsc 1.5.4.12: #i29308# cleanup
2004/10/22 10:00:11 jsc 1.5.4.11: #i35871# adapt for Java 5.0
2004/10/15 11:04:09 jsc 1.5.4.10: #i29308# updated
2004/10/08 13:58:39 jsc 1.5.4.9: #i29308# insert package manifest
2004/08/24 15:04:22 jsc 1.5.4.8: #i29308# use of new UNO package extension
2004/08/06 14:36:53 jsc 1.5.4.7: #i29308# use System.err for error output
2004/07/30 14:30:02 jsc 1.5.4.6: #i29308# use quotes for unopath option
2004/07/30 08:36:24 jsc 1.5.4.5: #i29308# adjust ECHOLINE for windows
2004/07/29 12:22:44 jsc 1.5.4.4: #i29308# insert ECHOLINE macro to dump an empty line in manifest files
2004/06/30 09:10:25 jsc 1.5.4.3: #i29308# use of new UNO features
2004/06/24 09:39:00 jsc 1.5.4.2: #i26335# use zip for packaging
2004/06/07 16:00:29 jsc 1.5.4.1: #i29308# use of new UNO features
2005-01-31 15:14:20 +00:00
Rüdiger Timm 6bf3c7e1ec INTEGRATION: CWS sdk13 (1.4.94); FILE MERGED
2004/05/05 09:31:20 jsc 1.4.94.1: #116658# merge cinnabar changes
2004-05-18 12:21:31 +00:00
Vladimir Glazounov c59344141d INTEGRATION: CWS sdk06 (1.3.2); FILE MERGED
2003/07/03 14:53:58 jsc 1.3.2.1: #110588# insert subst command to correct slashes for Windows < XP
2003-07-09 09:37:41 +00:00
Jens-Heiner Rechtien 55fe7eb6d0 INTEGRATION: CWS sdk04 (1.2.6); FILE MERGED
2003/06/24 13:32:34 jsc 1.2.6.1: #110313# insert source license header
2003-06-30 14:14:58 +00:00
Jens-Heiner Rechtien 83ad876c8a INTEGRATION: CWS sdk04 (1.2.6); FILE MERGED
2003/06/24 13:32:33 jsc 1.2.6.1: #110313# insert source license header
2003-06-30 14:14:25 +00:00
Jens-Heiner Rechtien d586f4c014 INTEGRATION: CWS sdk04 (1.2.6); FILE MERGED
2003/06/24 13:32:32 jsc 1.2.6.1: #110313# insert source license header
2003-06-30 14:13:44 +00:00
Vladimir Glazounov eb68d5141a INTEGRATION: CWS sdk02 (1.1.2); FILE ADDED
2003/05/09 10:42:49 jsc 1.1.2.1: #109045# insert new and remove example zip file
2003-06-10 09:14:29 +00:00
Vladimir Glazounov 23c83ba89f INTEGRATION: CWS sdk02 (1.1.2); FILE ADDED
2003/05/09 10:42:48 jsc 1.1.2.1: #109045# insert new and remove example zip file
2003-06-10 09:14:12 +00:00
Vladimir Glazounov dac51e2e86 INTEGRATION: CWS sdk02 (1.1.2); FILE ADDED
2003/05/09 10:42:47 jsc 1.1.2.1: #109045# insert new and remove example zip file
2003-06-10 09:13:54 +00:00
Vladimir Glazounov 57847995ee INTEGRATION: CWS sdk02 (1.1.2); FILE ADDED
2003/05/14 11:03:24 jsc 1.1.2.2: #109045# insert JAVAC_FLAGS option
2003/05/09 10:42:46 jsc 1.1.2.1: #109045# insert new and remove example zip file
2003-06-10 09:13:38 +00:00