summaryrefslogtreecommitdiff
path: root/ure/source
AgeCommit message (Collapse)Author
2023-09-01Add a FunctionBasedURPConnection and a websocket URP connectorSkyler Grey
- FunctionBasedURPConnection is used to enable a client to open a URP connection to a fresh Kit instance in COOL. - This URP connector can be used with that and https://github.com/CollaboraOnline/online/pull/6992 to use a Java Uno Remote Protocol client over websockets - For interoperability with existing Collabora Online websockets a prefix (urp ) is added to each message sent and a similar prefix (urp: ) is expected on each message recieved. This allows sending over the same websocket as other data is being transmitted through. If you are writing a bridge to work with this, you will need to add/strip the prefixes accordingly - This commit uses Java WebSocket (https://github.com/TooTallNate/Java-WebSocket) to send data over websockets. Change-Id: I2bda3d0b988bef7883f9b6829eeb5b7ae8075f27 Signed-off-by: Skyler Grey <skyler.grey@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151171 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
2023-05-30Revert "Use getXWeak in ure"Mike Kaganski
This reverts commit d9225a59e89907e9d289ab93c44fd8e6883f1be2. Reason for revert: this is not a LIBO_INTERNAL_ONLY code. Change-Id: I780afcd88764f8f5bbf99d257a07d19cacb5aa55 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152322 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2023-05-27Use getXWeak in ureMike Kaganski
Change-Id: I5d76890ca1165b74e204b38c5ca9675d40a80823 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150884 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
2022-11-07Revert "tdf#145538 Use range based for loops"Hossein
This reverts commit 64469bb1a7383da6e7ff1150d693b3e08f54bc91. To keep the compatibility with C++98, we need to revert the previous patch. Quoting sberg: "This code happens to not normally be processed (see ure/source/uretest/README) and is meant to be compilable with the 3rd-party UNO compiler baselines (i.e., just C++98, which implies no range base for loops)." Change-Id: I1355a29af24299a99a23dfcd1dd473894d7c9e0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142302 Tested-by: Jenkins Reviewed-by: Hossein <hossein@libreoffice.org>
2022-11-06tdf#145538 Use range based for loopsjsala
Change-Id: Ic27ef946b8b878770446bd975b836d7c6c29dd4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141668 Tested-by: Jenkins Reviewed-by: Hossein <hossein@libreoffice.org>
2022-06-13Drop obsolete preprocessor directives from UNOIDL filesStephan Bergmann
...which were used by ildc, which is gone since a8485d558fab53291e2530fd9a1be581c1628deb "[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-10[API CHANGE] Remove deprecated idlc and regmerge from the SDKStephan Bergmann
* Client code must replace uses of idlc and regmerge with uses of unoidl-write, see the changes to odk/examples/ and ure/source/uretext/ in 40f2aee6584eafcf4cd1d95fcf1f775e5435440d "Provide unoidl-write also for the SDK" for examples. * The new types.rdb format is not compatible with LibreOffice < 4.1. Clients generating extensions containing such files are advised to use appropriate LibreOffice-minimal-version elements. * For compatibility with old extensions, reading the legacy types.rdb format is still supported. * The SDK no longer ships an idl/ sub-directory containing the udkap and offapi .idl files (as, unlike idlc, unoidl-write does not need them). odk/config/cfgWin.js had to be adapted to look (somewhat arbitrarily) for an examples/ sub-directory instead of idl/ when checking for "an sdk folder". gb_UnoApi_package_idlfiles became unused and has been removed. * The idlc and regmerge executables have been removed. Module idlc has been removed except for idlc/test/parser/, which is also used by CustomTarget_unoidl/unoidl-write_test, and which may eventually be moved into module unoidl. Module external/ucpp and the corresponding configure options have also been removed. Change-Id: I42a0231699b863b5ebe2bee63bc32c8f79278cc1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122363 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-02-25Provide unoidl-write also for the SDKStephan Bergmann
...after the new types.rdb format that unoidl-write generates has been used internally since LibreOffice 4.1 in 2013; following up on 6db34b6b33ba8e3b13683efd05df8441b87e9c92 "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 04af4e4f55f3ef319a78edd4d0109e2e7eba90b6 "[API CHANGE] Fix all bad UNOIDL identifiers across offapi" and 620179240670bd00f60555f1f5c5b0268492f97c "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-24Update README lists of URE dynamic librariesStephan Bergmann
...after 3a009c427fc04c0a1a100f5f04516cedd1f6f118 "fdo#60698: Merge all libs of io..." and 475e4b477c6d7ae114c3ae51ba4872882af67a68 "Move i18nlangtag lib to URELIB" Change-Id: Idf46dc1a8fa80417aac091e907ba54e83f9099e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130489 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2022-01-08Don't install the uno script when uno is not buildJan-Marek Glogowski
... move it into cpputools and rename ure/Package_install.mk to ure/Package_ure_install.mk, to match the module name. Follow up from commit 92a90cf5ccb998d2fcc77a62bb971534e410cdec ("Don't build the static uno binary"). I missed that hunk in a larger patch, because the script was in a different module, then the binary. Change-Id: If7f3152be9567cf84be176d3fedefbcd5ad8d387 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128138 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
2021-08-31Adapt to cppu-/javamaker's idiosyncratic relative URL notationStephan Bergmann
...which considers an argument containing SEPARATOR characters only as a relative URL (which it then makes absolute relative to osl_getProcessWorkingDir) if it starts with a dot (see convertToFileUrl in codemaker/source/codemaker/global.cxx). (Which isn't an issue for now, as convertToFileUrl leaves the relative path unchanged, which is passed to the unoidl::detail::LegacyProvider ctor in unoidl/source/legacyprovider.cxx and on to store::FileHandle::initialize in store/source/lockbyte.cxx, which makes a relative pFilename absolute relative to osl_getProcessWorkingDir. But it would become an issue when the given type RDBs are changed to the new UNOIDL binary format, as the unoidl::detail::UnoidlProvider ctor in unoidl/source/unoidlprovider.hxx expects an absolute file URL.) Change-Id: If9f66f3e9c20a8416d25989099e6c921520e6a94 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121312 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2021-08-17Fix typoAndrea Gelmini
Change-Id: Ib67f29eec54557811eb1136673030249b296289e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120599 Tested-by: Julien Nabet <serval2412@yahoo.fr> Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
2021-06-29Revert bogus drop of "rtl::" prefix in external codeStephan Bergmann
partially reverts 6f50961e69406a17d6ec998956a6b33208b1001b "remove more rtl::OUString and OString prefixes" Change-Id: Ic97a6029577533e539e99d64ba73a74e3246f03b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118048 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2020-05-06Move all public Java classes to libreoffice.jarSamuel Mehrbrodt
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 ae855bf48163ff64d94cfc34aff8e37abdb5518d 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-02-04tdf#117331 Merge jurt and unoil into ridlSamuel Mehrbrodt
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>
2018-10-24remove more rtl::OUString and OString prefixesNoel Grandin
which seem to have snuck back in since the great rounds of removals. Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1 Reviewed-on: https://gerrit.libreoffice.org/62229 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-04-09Remove std::bad_alloc -> css::uno::RuntimeException mappingsStephan Bergmann
...that are no longer needed now that the dynamic exception specifications are gone from C++ UNO, so won't cause std::unexpected any more. Change-Id: Ie3418658f5a84e6cec1ac48e3413f523f87497fe Reviewed-on: https://gerrit.libreoffice.org/52641 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-05-30Fix quotingStephan Bergmann
...broken with 6c80b3730ebe5a95aa685e5f02c285edeb21d4a5 "tdf#105204 fix shellcheck warnings in ure/source/uno" Change-Id: I44a6239d47353aea84ff4ab6d597104bd96e0950
2017-05-20tdf#105204 fix shellcheck warnings in ure/source/unoYeliz Taneroğlu
Use $(..) instead of `..`, double quote to prevent word splitting. Change-Id: I80251d98e6fb27af5a18c202521050c8101131fa Reviewed-on: https://gerrit.libreoffice.org/37465 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2017-01-27Remove dynamic exception specifications from !LIBO_INTERNAL_ONLYStephan Bergmann
...only odk/examples/ remains to be clean up Change-Id: I875a1e8d6750b6b007bd75126b8010273e1f32d5
2017-01-26ure/source/uretest is !LIBO_INTERNAL_ONLYStephan Bergmann
...so revert the relevant parts of d1a9c73ea16f5b4838f639ce2bb2226d9b9b334a "tdf#88206 replace cppu::WeakImplHelper* misc" Change-Id: I0ee5bf227fc541672dfb73e57657640cbccbf7f3
2017-01-18update approximate install location in READMECaolán McNamara
Change-Id: I6a139d5be193c968c2bf3373b415baa25dc32595
2016-12-07tdf#88206 replace cppu::WeakImplHelper* miscJochen Nitschke
also edited two examples in canvas comments Change-Id: Iac82b462168f869f995c33bb2c639f3dbe09cbd5 Reviewed-on: https://gerrit.libreoffice.org/31715 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2016-09-20[API CHANGE] Remove HAVE_GCC_VISIBILITY_FEATURE, always trueStephan Bergmann
* GCC documents -fvisibility at least as far back as the GCC 4.0 online documentation at <https://gcc.gnu.org/onlinedocs/gcc-4.0.4/gcc/Code-Gen-Options.html>. * For external code, odk/settings/settings.mk unconditionally set HAVE_GCC_VISIBILITY_FEATURE for all platforms other than Windows. Make this a fatal configure error for now. The check should be removed completely after LO 5.3 branch-off. Change-Id: I1de415b6ed1591e0a7b6640ece861b6f0ef74112 Reviewed-on: https://gerrit.libreoffice.org/29073 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2015-09-15Revert cppuhelper/implbase.hxx usage in non-LIBO_INTERNAL_ONLY code, againStephan Bergmann
Change-Id: I8c40f4ea79941e7ca5438ff9756f62988719cebc
2015-09-15Resolves: tdf#88206 replace cppu::WeakImplHelper* etc.Takeshi Abe
with the variadic variants. Change-Id: I7154f9472f02fdf47d27ba715db55bb1ec669a8a Reviewed-on: https://gerrit.libreoffice.org/18580 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-03-01Typo: embeded->embeddedJulien Nabet
Change-Id: I27d0cdac158a674274647fe0081a8d8c046fe0ea
2014-12-03Fold URE: WindowsStephan Bergmann
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is no longer necessary and loading of cppuhelper from the program dir cannot fail regardless in whatever scenario the cli_cppuhelper library itself is loaded. Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
2014-12-01Fold URE: Linux ure/share/misc/* -> program/Stephan Bergmann
...and remove now unused ure-link symlink Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-11-28Fold URE: Linux ure/share/java/* -> program/classes/Stephan Bergmann
Change-Id: I86864f832c0377d307cfa0b2c137f452e43797eb
2014-11-28Remove unused ure_unorc_urlStephan Bergmann
...unused since 0c1dc375b4bf0c8ff01fe51921767faa703b1295 "Make ure/source/uretest/ use defaultBootstrap_InitialComponentContext" Change-Id: I42385d2d92fb1e24376829ce5c7ae112ea771e51
2014-11-28Fold URE: Linux ure/lib/* -> program/Stephan Bergmann
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge (and juh.jar had lacked adaption for Mac OS X). Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
2014-11-28Fold URE: Linux ure/bin/* -> program/Stephan Bergmann
Change-Id: Id6cab518329829c22600f2a68b6b59abd04a564c
2014-11-28theIntrospection missing from cppumaker callStephan Bergmann
Change-Id: Ia6d031f24f57cf37ab68934a4aef36a0797eee65
2014-11-24...so startup.sh is gone nowStephan Bergmann
Change-Id: I667cd9db8a6f5511218d482fb97025480ddc2488
2014-11-24uno is the only remaining user of startup.shStephan Bergmann
Change-Id: I0aa2f7384462777fc893aa282aea00aebd8dc664
2014-10-09Remove jvmfwk plugin featureStephan Bergmann
...which was effectively unused; there only ever was a single sunjavaplugin that is now folded directly into jvmfwk. Leaves room for further clean up. Change-Id: I14dd2a3a09bd1ce9a8c3f5c156628ec11d954a0b
2014-09-17The URE unorc is now set up in instsetoo_native/CustomTarget_setup.mkTor Lillqvist
So no need to expand it at configure time in ure/source/unorc, and no need to handle the related builddir!=srcdir complications. Change-Id: Ifa34d25fab9ad2da13ed039bf6c5921b0fb58703
2014-09-16Create instdir uno ini-file from instsetoo_nativeStephan Bergmann
...like is done for most other ini-files too, with entries indentical to the ones in scp2/source/ooo/ure.scp. (And sort ini-files lexicographically again in instsetoo_native/*.mk, broken with recent louno rename). Leave ure/source/unorc.in and ure/Pacakge_builddir_install.mk around for the cross-compilation case only. Change-Id: Ic07e036ef126db1aee2c0f6b726c2b86c2536c53
2014-08-10Use @LIBO_URE_LIB_FOLDER@ for URE_INTERNAL_LIB_DIRTor Lillqvist
In the --enable-canonical-installation-tree-structure case (on OS X), the URE unorc is definitely not in the same place as any libs. Noticed in JunitTest_comphelper_complex. Change-Id: Ic6097021f9abc081e2a7c7aac25286ad2c4b75e5
2014-08-10Use @LIBO_URE_SHARE_JAVA_FOLDER@ instead of hardcoding ../share/javaTor Lillqvist
Makes CppunitTest_dbaccess_hsqldb_test work also in the --enable-canonical-installation-tree-structure (on OS X), otherwise the use of $URE_INTERNAL_JAVA_CLASSPATH (looked up from the URE unorc) in stoc/source/javavm/javavm.cxx fails. Change-Id: I5ea045594c32e6a1398b73cff1e4aa8bbe1aa265
2014-06-05various: remove SAL_THROW macroNoel Grandin
Change-Id: I9464179a736b91f5bc32eb5e5e89b3b4e3da3494
2014-05-23remove boilerplate in UNO Exception constructor callsNoel Grandin
Now that we have default values for Exception constructor params, remove lots of boilerplate code. Change-Id: I620bd641eecfed38e6123873b3b94aaf47922e74
2014-03-07Introduce com.sun.star.beans.theIntrospection singletonStephan Bergmann
...deprecating com.sun.star.beans.Introspection (single-instance) service. Change-Id: Ica2e3a3541c7dcb1aab79222c5abf40d6988c882
2013-12-16Clean-up uno/lbnames.hStephan Bergmann
Change-Id: I4bd729499aa8be58f04194656e35c1f79d5d4919
2013-12-11ure: remove documentation of no longer bundled GCC librariesMichael Stahl
Change-Id: I28ca12157fcc918ccb8a87d1d1801908d300eca7
2013-12-11ure: remove references to SunStudio C52 filenamesMichael Stahl
Change-Id: If11655aa56239b9241db43a058244360a8abe1ec
2013-09-22add mode lines to new files (and idls) since last runCaolán McNamara
Change-Id: Id1e74f18c90e69d1a781c8f02e30dc3c005ed4fd
2013-09-16Remove incorrect commentsTor Lillqvist
Change-Id: I3e9b82001f92edc6e697a976db635af31e16d769
2013-09-09tweak previous commit hoping it will work on Mac ...Michael Stahl
... plus some more fixes: - also install ure-link on WNT via Package not scp2. - also disable unorc in scp2 on WNT, otherwise cannot built instset due to duplicate file. - slso USE_INTERNAL_RIGHTS so startup.sh is executable.
generated by cgit (git 2.34.1) at 2025-05-02 13:55:41 +0000