summaryrefslogtreecommitdiff
path: root/jvmfwk
AgeCommit message (Collapse)AuthorFilesLines
2016-02-06Fix typosAndrea Gelmini1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/16582 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 1a8915ef8302b13b781977209ae1fa41f5f659dc) Change-Id: I1c5e4970d4e90bdea68a901294594104de5e189e
2016-02-06loplugin:loopvartoosmallNoel Grandin1-1/+1
(cherry picked from commit 55bc128636596032c23ee855904822ad813986fc) Change-Id: I86ff38a90018a2ddfb2db3babf67168b0e6257a5
2016-02-06Replace boost::scoped_array<T> with std::unique_ptr<T[]>Takeshi Abe4-13/+13
This may reduce some degree of dependency on boost. Done by running a script like: git grep -l '#include *.boost/scoped_array.hpp.' \ | xargs sed -i -e 's@#include *.boost/scoped_array.hpp.@#include <memory>@' git grep -l '\(boost::\)\?scoped_array<\([^<>]*\)>' \ | xargs sed -i -e 's/\(boost::\)\?scoped_array<\([^<>]*\)>/std::unique_ptr<[]>/' ... and then killing duplicate or unnecessary includes, while changing manually m_xOutlineStylesCandidates in xmloff/source/text/txtimp.cxx, extensions/source/ole/unoconversionutilities.hxx, and extensions/source/ole/oleobjw.cxx. Reviewed-on: https://gerrit.libreoffice.org/16289 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 09800956191c90035872cbc18cd304fee043c710) Change-Id: I3955ed3ad99b94499a7bd0e6e3a09078771f9bfd
2016-02-06cppcheck:redundantAssignmentNoel Grandin2-10/+7
(cherry picked from commit 4ea281a3ccb5bd21e1808d8cb127a91a1bb72691) Change-Id: I1167d0ce6b6f6e48309d0551c1d2a283d79546a7
2015-08-06tdf#92483 fix initializing JRE on Win 64bit (load java's msvcr100.dll)Christian Lohmaier1-1/+1
problem is that the offsets/sizes are of different type than ptrdiff_t, and when using without casting, the resulting address is way off... Change-Id: I7b1cdd611c8c4b317cd33ca8fbbda2e7e8f5f4fc Reviewed-on: https://gerrit.libreoffice.org/16938 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 1b4d27a3badddd2648c3f02cd234ca74c5a40e6b) Reviewed-on: https://gerrit.libreoffice.org/16950
2015-08-06jvmfwk: pass along -Xss to JVM on AMD64 tooMichael Stahl1-2/+2
The PythonTest_dbacces_python in a clang ASAN build on F21 started to fail with StackOverflowError in JNI_CreateJavaVM on the main thread, and this fixes the problem. Seen with java-1.8.0-openjdk-1.8.0.45-39.b14.fc21.x86_64 Change-Id: I87dfb4b62d547b334c19261aad88b4856489776f (cherry picked from commit bb6399937270fb149639248dd1a28775948f7285)
2015-05-29Support Azul Zulu JRE on Linux and Mac OS X, tooStephan Bergmann3-2/+9
Change-Id: I317506319b91daf006a0ba79874ff265ba6ed4da (cherry picked from commit 8541b178f4155c8d72a876245433a1aaf3d2634f)
2015-05-29Support Azul Zulu JRE (at least on Windows)Stephan Bergmann3-1/+6
(<http://www.azulsystems.com/products/zulu/downloads> also offers it for Linux and Mac OS X, so it could be added to more javavendors_*.xml if need be; I only checked it actually works with a Windows 64-bit LO build) Change-Id: If549a0d5bf1459eba2f6ba2bd545cfd55a20cea6 (cherry picked from commit 0f95f8ffd7a3685ca53876005a9c96f2e2e7bc99)
2015-05-12java dir for powepc64 and powepc64le can differDavid Tardon1-1/+5
E.g., RHEL >= 7.1 uses ppc64le for reasons listed in https://bugs.openjdk.java.net/browse/JDK-8073139 . This is a follow-up to commit 7a66dbe982623be620ad6ac426fe689a434e5f51. Change-Id: I685f76d51e9775788a7fb225c6a5e2309a45ceb7
2015-05-11loplugin:cstylecast: nop between pointer types of exactly same spellingStephan Bergmann1-1/+1
Change-Id: I21cac03d5100822ef99d4b7fb7c192c0d2adf1b2
2015-05-08std::ptr_fun became deprecated since C++11Takeshi Abe1-2/+2
Change-Id: If93609d032c9864e0251230bf9ed76e6b6741a62 Reviewed-on: https://gerrit.libreoffice.org/15672 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-04-27More loplugin:simplifyboolStephan Bergmann8-18/+17
Change-Id: I51e7a11149676a8b5396d9eb993a509859cdf725
2015-04-23Improved loplugin:literaltoboolconversion looking into cond. exprs.Stephan Bergmann1-1/+1
...automatic rewriter fixes Change-Id: I6b04ca80f08f8a71ff94e309fd52f44d736751ee
2015-04-22Various #include <sal/log.hxx> fixupsStephan Bergmann1-0/+1
rtl/string.hxx and rtl/ustring.hxx both unnecessarily #include <sal/log.hxx> (and don't make use of it themselves), but many other files happen to depend on it. Cleaned up some, but something like grep -FwL sal/log.hxx $(git grep -Elw \ 'SAL_INFO|SAL_INFO_IF|SAL_WARN|SAL_WARN_IF') -- \*.cxx) shows lots more files that potentially need fixing before the include can be removed from rtl/string.hxx and rtl/ustring.hxx. Change-Id: Ibf033363e83d37851776f392dc0b077381cd8b90
2015-03-28Clean up C-style casts from pointers to voidStephan Bergmann3-10/+10
Change-Id: I302d313f2d14d908672d4534aad1818e820eaae4
2015-03-27loplugin:staticfunctionNoel Grandin3-3/+3
Change-Id: I10c30ef28e7321882a720d1e7869a75a89febfc5
2015-03-26const_cast: convert some C-style casts and remove some redundant onesStephan Bergmann1-2/+2
Change-Id: I81dc70639a866368b9a6c69afffdfd42464e9138
2015-03-02V805: Decreased performanceCaolán McNamara1-1/+1
Change-Id: I822c5ebc321ebda87c238a1781a31793c1623e34
2015-02-07loplugin:deletedspecialStephan Bergmann2-9/+9
Change-Id: I6827530316561e600b760a2620f859b28c6c91e6
2015-01-20Some more loplugin:cstylecast: jvmfwkStephan Bergmann7-123/+123
Change-Id: Iaa1be4b338b75c340555eb4bf0760cadca16713f
2015-01-08avoid copying of vectorMichael Weghorn1-17/+7
Change-Id: I06ce27f4fa52637bbeaa6d84fdecdf81364e15a7 Reviewed-on: https://gerrit.libreoffice.org/13489 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2015-01-07jvmfwk: fix Android buildMiklos Vajna1-1/+1
Change-Id: Ib183158e51f7bebbb6add92e460a33fa132c1c9d
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