summaryrefslogtreecommitdiff
path: root/jvmfwk
AgeCommit message (Collapse)AuthorFilesLines
2014-12-18Some cppcheck cleanings: Prefer prefix ++/-- operators for non-primitive typesJulien Nabet1-3/+3
Change-Id: I899164412ad90653b4228423283f9fbd4cb5fccc
2014-12-18jvmfwk: Use appropriate OUString functions on string constantsStephan Bergmann1-2/+2
Change-Id: I5a16fdd9217f0523212842650d74f504f17848fd
2014-12-16jvmfwk: Use appropriate OUString functions on string constantsStephan Bergmann3-12/+6
Change-Id: I3e0b70c61c4e92f2cbd27ce7c45e67ae04dfe14c
2014-12-16Related fdo#83753: Fix JVM_ONE_PATH_CHECK feature againStephan Bergmann1-2/+4
Change-Id: I1dc3b0db6295c43a9d29576b81870b4a293a61aa
2014-12-15Remove obsolete commentStephan Bergmann1-5/+0
Change-Id: I66dcf6284bd1b7afb1c60c838bbbb2052e06072b
2014-12-15Check each potential JRE location only onceStephan Bergmann6-88/+124
i.e., after recent "fdo#83753: consider JAVA_HOME and PATH when selecting JRE" fix, if jfw_findAndSelectJRE found no suitable JRE in jfw_plugin_getJavaInfoFromJavaHome or jfw_plugin_getJavaInfosFromPath, do not re-check those locations in jfw_plugin_getAllJavaInfos. Change-Id: If4e085b4fceff5b2494c7b7b84ac51691dbc78cc
2014-12-15Rename getJREInfoByPath overload to getAndAddJREInfoByPathStephan Bergmann2-41/+27
Change-Id: Ib6eac731a4b8193a8d9b9132da78e7961aec22ab
2014-12-15getJREInfoFromBinPath return value is unusedStephan Bergmann2-9/+4
Change-Id: I360d7cb7c03e78739883db4b989ba5f31bc8e24b
2014-12-15fdo#83753: consider JAVA_HOME and PATH when selecting JREMichael Weghorn5-104/+384
adapted algorithm that selects the Java runtime to be used so that Java installations associated with the JAVA_HOME and PATH environment variables are preferred over others Java installations are now analysed in the following order: * installation that the JAVA_HOME environment variable refers to (if it is set) * Java installations in PATH * other Java installation (algorithm that was used before) Signed-off-by: Stephan Bergmann <sbergman@redhat.com> Conflicts: jvmfwk/source/framework.cxx Change-Id: I3a3ade25322def0c0432b369848f13a6b82034a1
2014-12-15Remove unused cModule leftoversStephan Bergmann1-8/+4
Change-Id: Id08194460e9a42896591047e36b3a95e5fbc47be
2014-12-10java: unused importsNoel Grandin1-1/+0
Change-Id: I05824a6f19a5f3048a52101b96f6bf3d3099df08 Reviewed-on: https://gerrit.libreoffice.org/13403 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-12-08callcatcher: update unused codeCaolán McNamara2-16/+0
Change-Id: I3cd65d112339fa9c67ed462fe39acbbef91d4d8d
2014-12-05java: remove some unused local variablesNoel Grandin1-1/+1
Change-Id: Ia01528460e2f4b610d123e29cad66520abc6a965
2014-12-04callcatcher: update unused codeCaolán McNamara8-150/+0
Change-Id: Ia25b857738bb7b6c3baf18c68ef0d1bc0b3e142e
2014-12-03Fold URE: WindowsStephan Bergmann1-1/+1
...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 Bergmann2-7/+7
...and remove now unused ure-link symlink Change-Id: Ic958432c1dad4fae213982d0af072187f151620b
2014-11-28Fold URE: Linux ure/lib/* -> program/Stephan Bergmann4-1/+55
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-26fix higher debug level buildCaolán McNamara1-0/+1
Change-Id: Ie61be2bd009b71bbbb7261865d026faf3af706ce
2014-11-19changed type of parameters from rtl_uString to OUStringMichael Weghorn3-75/+58
changed type of several parameters of the functions jfw_plugin_getAllJavaInfos and jfw_plugin_getJavaInfoByPath from rtl_uString to OUString Change-Id: I80feb311542e6ccded9f9924f800c75a7e14a1e7 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-11-18Pass by refStephan Bergmann1-1/+1
Change-Id: I88def7e41a31948d1d7205cd5522b63de6be5f80
2014-11-18sunjavaplugin.cxx: extracted function for Java version checkMichael Weghorn1-133/+110
extracted the (duplicate) code which is responsible to check the Java version requirements in the two functions "jfw_plugin_getAllJavaInfos" and "jfw_plugin_getJavaInfoByPath" Change-Id: I8acb198c4b4aaee77dc84bc42ff1fc2e0da2aba7 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-11-18remove duplicate code lineMichael Weghorn1-1/+0
Change-Id: Ia1e9d2b31698db23029e4dd5f0f7659acff5d30f Reviewed-on: https://gerrit.libreoffice.org/12951 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-11-17sal: clean up public headers with include-what-you-useMichael Stahl1-0/+2
Sadly cannot forward declare "struct {...} TimeValue;". rtl/(u)?string.hxx still include sal/log.hxx but removing osl/diagnose.h was painful enough for now... Change-Id: Id41e17f3870c4f24c53ce7b11f2c40a3d14d1f05
2014-11-14coverity#1247641 Uncaught exceptionCaolán McNamara1-51/+49
Change-Id: I35e1eed91a23d2b993398fb39e47e21ca9c0a055
2014-11-14fdo#86023 - O[U]String needs a 'clear' methodBrij Mohan Lal Srivastava1-2/+2
Added clear() method to OString and OUString class, Updated appropriate call-sites. Change-Id: I0ba97fa6dc7af3e31b605953089a4e8e9c3e61ac Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-11-12Fix common typos. No automatic tools. Handmade…Andrea Gelmini5-8/+8
Change-Id: I1ab4e23b0539f8d39974787f226e57a21f96e959 Reviewed-on: https://gerrit.libreoffice.org/12164 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-11-06Revert "use the new OUString::fromUtf8 method"Stephan Bergmann2-4/+10
This reverts commit 05050cdb23de586870bf479a9df5ced06828d498, not all places that use e.g. OStringToOUString to convert potential UTF-8 are guaranteed to fulfil the prerequisites necessary to use fromUtf8 (and some places like e.g. in codemaker are happy with the best-effort effect of OStringToOUString's OSTRING_TO_OUSTRING_CVTFLAGS).
2014-11-06use the new OUString::fromUtf8 methodNoel Grandin2-10/+4
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
2014-11-05markup with event type not checker typeCaolán McNamara1-1/+1
Change-Id: I14c0c5d90b67000cb4fe9e6be647854abfe784da
2014-11-05fdo#38835 strip out OUString globalsNoel Grandin1-2/+2
they are largely unnecessary these days, since our OUString infrastructure gained optimised handling for static char constants. Change-Id: I07f73484f82d0582252cb4324d4107c998432c37
2014-10-30Fixed typos. No automatic tools (sed, and so on).Andrea Gelmini1-1/+1
Change-Id: Ia43976d84eede6f699381bc4f3daf89b95e4cb4f Reviewed-on: https://gerrit.libreoffice.org/12150 Reviewed-by: Bryan Quigley <gquigs@gmail.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-10-30coverity#1247641 Uncaught exceptionCaolán McNamara1-1/+10
Change-Id: I61e55095b4f74fd619a26cba88dd177d0e318154
2014-10-29coverity#1247624 oslModule -> osl::ModuleCaolán McNamara1-15/+14
should silence warning, still actually avoid dlclose on the non-error path Change-Id: Ibc522bf1067feb04def7d7284eee59878ddc6f47
2014-10-27Work around OpenJDK's os::workaround_expand_exec_shield_cs_limitStephan Bergmann1-0/+40
Change-Id: Iea1b6354764db0a22976b3de49bf3e22ccb7243e
2014-10-27Clean up JNI_CreateJavaVM option codeStephan Bergmann1-36/+34
Change-Id: I1902c73a72f29e948e479a2ae4776f2dff77b2b5
2014-10-21Remove unnecessary jfw_plugin::getVendorNamesStephan Bergmann2-20/+2
Change-Id: I3c134c27db4c1496fcacc519da68af10ab3ce574
2014-10-20Clean up VendorBase (virtual) member functions furtherStephan Bergmann4-27/+23
Change-Id: If6b9355c6992eb6651f71c0944a93af0856ef1c7
2014-10-20Clean up VendorBase (virtual) member functionsStephan Bergmann5-39/+23
Change-Id: I1377dfded1246c8e96db3addc28489886c7f2d99
2014-10-20Missing "Stephan Bergmann1-1/+1
Change-Id: I5d596f85fe11bc9336e1669d571795f3dfc70c6c
2014-10-20Clean jvmfwk tracing outputTor Lillqvist3-46/+29
Change-Id: I070fb24e9466d697a6014bd65635f6cda8736819
2014-10-20Skip vendors that are irrelevantTor Lillqvist1-2/+7
There surely are no Apple JVMs for other OSes than OS X. Correspondingly, there surely are no IBM, Blackdown, BEA, FSF or FreeBSD JVMs for OS X. At least not ones that would be relevant today. Change-Id: I0ee6f904665a2145771802beffe54268718bef50
2014-10-13coverity#1066164 Resource leakCaolán McNamara1-0/+2
Change-Id: I152f22728a8eeea65114fe102511940bccf40478 Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2014-10-09vendorplugin.h is jvmfwk-internal (and no need for extern "C")Stephan Bergmann5-8/+256
Change-Id: I954f789d5850e8016f5900812f9aa99be2416ce4
2014-10-09Remove jvmfwk plugin featureStephan Bergmann16-512/+74
...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-10-07java: simplify some for loops to while loopsNoel Grandin1-1/+1
Change-Id: I323ab12c634d3baa4f624b63d7d483112c23192c
2014-09-29loplugin: cstylecastNoel Grandin2-3/+3
Change-Id: I53b69a488c70769cbb841db519bc28fd211dc087
2014-09-11jvmfwk: print a warning if running java faMichael Stahl1-0/+16
Change-Id: Ibfcd6678ed1503cfab0881f3ec67c4c158d798cb
2014-09-09Make the "Mac-like" or "canonical" app bundle structure always used on OS XTor Lillqvist3-4/+12
In other words, only executable files go in the MacOS folder. Dynamic libraries and bundled frameworks (i.e., LibreOfficePython), and nothing else, go in the Frameworks folder, and all other files go in the Resources folder. Especially, note that Java class files and rc (.ini) files also go in Resources. Such an app bundle structure is what Apple strongly suggests one should use, and it has been hinted that future versions of code signing and/or Gatekeeper will require such a structure. There is still some ugliness thanks to traces of the historical separation of URE from "the office". Like there are two separate "unorc" files, one for URE, one for the LibreOffice application. IMHO, this should be cleaned up, but is probably controversial. (Eek! I now see there are actually *three* unorc files in the app bundle. Not intentional. Need to fix that later.) Change-Id: Idcf235038deb5b8e1d061734993e9f31869b7606
2014-09-03Nothrow dtorStephan Bergmann1-0/+1
Change-Id: I1793d2eab568f4a65813fca7257c74e1a85a0090
2014-09-02coverity#707200 Uncaught exceptionCaolán McNamara1-1/+1
Change-Id: Iaf115f1f11aef69ef5dba7023f4126c22d1f49ff
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 07:43:48 +0000