summaryrefslogtreecommitdiff
path: root/jvmfwk
AgeCommit message (Collapse)AuthorFilesLines
2016-11-17Fix regression in bubbleSortVersionStephan Bergmann1-1/+2
...introduced with 789055bc2acb4c71483fd60ea258d158bd5aec10 "clang-tidy performance-unnecessary-copy-initialization" (so partially revert it). Whatever clang-tidy erroneously reported there, cur and next are lvalue references into vec, so this attempted copy now actually overwrote one with the other. The result was that if multiple JREs are detected on the system, "Options - LibreOffice - Advanced" would list a single one multiple times. Change-Id: I7ef454c0f37669722812383848602dc2bacf7cd1 (cherry picked from commit 36a329b6395257d7df2013d23ba4205a5ef72f4d) Reviewed-on: https://gerrit.libreoffice.org/30923 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-11-02quickfix: Automatic selection of Oracle Java runtime on macOSStephan Bergmann1-3/+3
same issue as 36f637f7f21906fa3f37223e69b044db52036fb1 "tdf#103507 quickfix: Automatic selection of Oracle Java runtime on Windows" Change-Id: I3239bbf52263fb53bcd0ed54e8e983bda3b19182 (cherry picked from commit f537e561c7f61487253a07b76e6b8a1a87d30a27) Reviewed-on: https://gerrit.libreoffice.org/30475 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-10-28tdf#103507 quickfix: Automatic selection of Oracle Java runtime on WindowsStephan Bergmann1-3/+3
...which had been broken since 5e9a2e9b0f33ab50aa3a84728db75383aede19d9 "Check each potential JRE location only once", as jfw_findAndSelectJRE calls jfw_plugin_getAllJavaInfos on each vendor in turn, but that now only operates on any items newly added by addAllJREInfos, so the first call to jfw_plugin_getAllJavaInfos (with sVendor being "Sun Microsystems Inc." unsuccesfully operated on all items, and the next call (with sVendor being "Oracle Corporation") didn't see any further items to operate on. So the quickfix (at least for any Java runtimes by Oracle) is to reorder the vendors in javavendors_wnt.xml. The proper fix will be to reorder the code so it obtains the list of all Java runtimes only once, and then matches that list against the known vendors. (Other plaforms appear not to be affected by this issue. Some jvmfwk/distributions/OpenOfficeorg/javavendors_*.xml already sort Oracle first, anyway. And e.g. on Linux, jfw_findAndSelectJRE typically already succeeds with calling jfw_plugin_getJavaInfosFromPath and so doesn't reach the problematic code. Change-Id: Ied571ae1d4745d53ce0c8697d0f1b268e1aac407 Reviewed-on: https://gerrit.libreoffice.org/30349 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org>
2016-07-26Related: tdf#101057 inherit MalformedVersionException from std::exceptionCaolán McNamara1-1/+1
so we don't get std::terminate on MacOSX if its thrown up to JavaVirtualMachine::getJavaVM Change-Id: I1c6b79bf16cbaa66b8f79d495239e301d3ca58de (cherry picked from commit a3b3c5fcd7efd3e33a0f0078bd6fd23689c45c41) Reviewed-on: https://gerrit.libreoffice.org/27508 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-07-22Related: tdf#101057 allow java update version number > 99Caolán McNamara1-3/+3
Change-Id: Icc37cf248fbf35f108eb5bbb25c36fbd54a9fe85 (cherry picked from commit 64d3270a89fd88d4d0cf70329af2c66f722fd95e) Reviewed-on: https://gerrit.libreoffice.org/27425 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-06-17passing a NULL pointer to fileno is not allowed, tdf#38913Markus Mohrhard1-0/+3
See crash reports at http://crashreport.libreoffice.org/stats/signature/do_msvcr_magic+0x7 and documentation at https://msdn.microsoft.com/en-us/library/zs6wbdhx.aspx Change-Id: Ia9166d3b9fa10b87585821504e39cdfecbd22eda Reviewed-on: https://gerrit.libreoffice.org/26317 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit b5876bfcb69a65c87d602bae687b3c0634c0a1e7)
2016-05-22Convert javaPluginError to scoped enumNoel Grandin3-97/+97
Change-Id: Ib3a32227d50fa9e0f9cc4106ce40a4c3e840f8c7 Reviewed-on: https://gerrit.libreoffice.org/25206 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-05-10Add SAL_FALLTHROUGH, where apparently appropriateStephan Bergmann1-0/+2
Change-Id: I0dccdf984f4b171feab20e8400376cf8846ffe2e
2016-05-10Replace fallthrough comments with new SAL_FALLTHROUGH macroStephan Bergmann1-1/+1
...which (in LIBO_INTERNAL_ONLY) for Clang expands to [[clang::fallthrough]] in preparation of enabling -Wimplicit-fallthrough. (This is only relevant for C++11, as neither C nor old C++ has a way to annotate intended fallthroughs.) Could use BOOST_FALLTHROUGH instead of introducing our own SAL_FALLTHROUGH, but that would require adding back in dependencies on boost_headers to many libraries where we carefully removed any remaining Boost dependencies only recently. (At least make SAL_FALLTHROUGH strictly LIBO_INTERNAL_ONLY, so its future evolution will not have any impact on the stable URE interface.) C++17 will have a proper [[fallthroug]], eventually removing the need for a macro altogether. Change-Id: I342a7610a107db7d7a344ea9cbddfd9714d7e9ca
2016-04-30Fix typosAndrea Gelmini1-1/+1
Change-Id: Id81b16ff26283611f0b84929d831c827f847ab73 Reviewed-on: https://gerrit.libreoffice.org/24317 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-04-26update loplugin stylepolice to check local pointers varsNoel Grandin1-7/+7
are actually pointer vars. Also convert from regex to normal code, so we can enable this plugin all the time. Change-Id: Ie36a25ecba61c18f99c77c77646d6459a443cbd1 Reviewed-on: https://gerrit.libreoffice.org/24391 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-04-20loplugin:salbool: Automatic rewrite of sal_False/TrueStephan Bergmann4-11/+11
Change-Id: I65fdd933e2a3973053359024d8d9c733f79a6477
2016-04-18clang-tidy performance-unnecessary-copy-initializationNoel Grandin1-2/+1
probably not much performance benefit, but it sure is good at identifying leftover intermediate variables from previous refactorings. Change-Id: I3ce16fe496ac2733c1cb0a35f74c0fc9193cc657 Reviewed-on: https://gerrit.libreoffice.org/24026 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2016-04-14clang-tidy performance-unnecessary-value-param in variousNoel Grandin2-2/+2
Change-Id: I7168d44dab8e6a8e37bb7920d744ff32f5e52907 Reviewed-on: https://gerrit.libreoffice.org/24019 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-04-12cleanup: remove unused com/sun/star/uno includesJochen Nitschke3-4/+0
Sequence.h(xx), Any.h(xx) and Type.h(xx) and remove unused using-declarations from these files. Add a few missing includes provided by them. Change-Id: I6b91b6d1fdf9d0496dd546c0aab9bdcc6831a5d4 Reviewed-on: https://gerrit.libreoffice.org/23805 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-04-11tdf#94306 replace boost::noncopyable ...Jochen Nitschke1-2/+4
... in modules editeng to oox. Replace with C++11 delete copy-constructur and copy-assignment. Remove boost/noncopyable.hpp includes and one unused boost/checked_delete.hpp include in linguistic. Change-Id: I5a38d8e5ac1b4286bdeb3858d56490a53d13fe80 Reviewed-on: https://gerrit.libreoffice.org/23928 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-04-05Values read from the Windows registry shouldn't be assert'edStephan Bergmann1-2/+3
Change-Id: I1a6cc78025790fa22e91ae91dda5644bdc384ca3
2016-03-15tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionalsRohan Kumar1-6/+2
I replaced OSL_ASSERT() with standard C++ assert Change-Id: I92e07d62f3dfe2ad914c49e2b596aef28c35e225 Reviewed-on: https://gerrit.libreoffice.org/23231 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
2016-03-10Fix memory leaksStephan Bergmann1-8/+7
Change-Id: If9f7dc4a28d5e005959f0d4a0a2ed317b699f292
2016-03-10No more need for jfw_freeJavaInfoStephan Bergmann3-19/+12
Change-Id: I2426a76936b4099a243ce8c102da867e7868aac3
2016-03-10Turn JavaInfo sal_Sequence* member into rtl::ByteSequenceStephan Bergmann3-16/+6
Change-Id: Iecd476970b0b7a46afe223f71e95b0010048d7b1
2016-03-10Turn JavaInfo rtl_uString* members into OUStringStephan Bergmann3-31/+12
Change-Id: Ieb23b0c36ef56a4793a56cdb450df34e4d9bce1d
2016-03-10Manage JavaInfo instances via new/deleteStephan Bergmann3-17/+9
Change-Id: I10a113718e525b646c51aa8a19f9f2b75a36714a
2016-03-10No need to repeat SAL_CALL in definitionsStephan Bergmann1-20/+18
Change-Id: Ief75af9d08d9b7e31d821773db2363fa201f3038
2016-03-10No need for extern "C" hereStephan Bergmann1-6/+6
...and fix resulting loplugin:salbool fallout Change-Id: I5ae1497608d31c20b0d10676450a7673dee1c651
2016-03-09include/jvmfwk/*.h -> .hxx (only ever included from C++ code)Stephan Bergmann5-7/+7
Change-Id: Ia912e937d5a48afb6f8f5345b20bb7bd517fc4f1
2016-02-17use consistent #define checks for the Windows platformNoel Grandin8-17/+17
stage 2 of replacing usage of various checks for the windows platform with the compiler-defined '_WIN32' macro In this stage we focus on replacing usage of the WIN macro Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84 Reviewed-on: https://gerrit.libreoffice.org/22393 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-02-09Remove excess newlinesChris Sherlock9-20/+0
A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2016-02-08loplugin:unusedmethodsNoel Grandin2-3/+0
using an idea from dtardon: <dtardon> noelgrandin, hi. could you try to run the unusedmethods clang plugin with "make build-nocheck"? that would catch functions that are only used in tests. e.g., i just removed the whole o3tl::range class, which has not been used in many years, but htere was a test for it... <noelgrandin> dtardon, interesting idea! Sure, I can do that. Change-Id: I5653953a426a2186a1e43017212d87ffce520387 Reviewed-on: https://gerrit.libreoffice.org/22041 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2016-01-10Fix typosAndrea Gelmini1-1/+1
Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86 Reviewed-on: https://gerrit.libreoffice.org/21209 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
2016-01-06jvmfwk/plugins: clean-up in util.cxxDouglas Mencken1-15/+4
These are some remnants from the-good-old-days of Mac OS X 10.4 support and 2005's commit b8871d23ea14d72ba1a22376e7812ea5840d1084 Change-Id: I9a14aaac94e4a6e4961a2fa9a5020d9cf3a07c9d Reviewed-on: https://gerrit.libreoffice.org/21124 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-11-24cppcheck: noExplicitConstructorCaolán McNamara4-11/+11
Change-Id: I1934441858baeeb41a46f694dbcef2d846b308b7
2015-11-17Don't assume sal_Unicode is unsigned shortStephan Bergmann1-1/+1
Change-Id: I0439e40b0843ba9a0939eb47e339f396d26f3c64
2015-11-10loplugin:nullptr (automatic rewrite; Mac-specific code)Stephan Bergmann2-2/+2
Change-Id: Iee5d66a1c14e1583edb0945d23cec9986ce7a830
2015-11-10loplugin:nullptr (automatic rewrite)Stephan Bergmann10-133/+133
Change-Id: I9dfcec9488b2a25e32d3934766d6d4b208a8c2dc
2015-11-09new loplugin: oncevarNoel Grandin2-15/+7
Change-Id: If57390510dde4d166be3141b9f658a7453755d3f Reviewed-on: https://gerrit.libreoffice.org/19815 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-11-05java: combine nested if statementsNoel Grandin1-4/+2
Change-Id: I0457b81668e9427a3c8d6a4af93438b7fb2bb7ba
2015-11-04Avoid using reserved identifiers, add missing includesStephan Bergmann1-2/+6
Change-Id: I23b548de1f07a4ec5acfeef7c553030a1f098311
2015-11-04Add mode linesStephan Bergmann2-0/+8
Change-Id: I4026040cfa2cd34c3a33a0a3dd4651caeb11c76f
2015-11-04loplugin:passstuffbyrefStephan Bergmann2-2/+2
Change-Id: If6e877b326bb630f1b4631a60241a93a6e6cbaca
2015-11-04yyyyyNoel Grandin1-13/+5
Change-Id: I9a947beefd2dfe21da8239e841ea3fb416bd1548
2015-11-04tdf#94716 allow Oracle's JDK to be used on OS X 10.10 and 10.11Patrick Luby6-11/+195
Change-Id: Ide9b4beebb407e4ceee30f1d99f29d028c848d8c Reviewed-on: https://gerrit.libreoffice.org/19131 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
2015-10-27loplugin:unusedmethodsNoel Grandin3-52/+0
Change-Id: I161cd52606c11b6008f5d8b1d8ee391692f91861 Reviewed-on: https://gerrit.libreoffice.org/19231 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-10-25tdf#39440: fix several warnings reported by cppcheckSerge Krot1-2/+2
Change-Id: I560d28b7cc67740c6479494d0e5aa62d2ac6ffae Reviewed-on: https://gerrit.libreoffice.org/19587 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2015-10-12Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY codeStephan Bergmann4-11/+11
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
2015-10-12Replace "SAL_DELETED_FUNCTION" with "= delete" in LIBO_INTERNAL_ONLY codeStephan Bergmann2-9/+9
Change-Id: I328ac7a95ccc87732efae48b567a0556865928f3
2015-10-01loplugin:unusedmethodsNoel Grandin1-4/+0
- improvements to the plugin to find more method calls - improvements to python script to remove more false+ - fix the FORCE_COMPILE_ALL build flag to include code in the $WORKDIR Change-Id: I4d6015dcb9b9d60c26f0bcee8abad807177a7836 Reviewed-on: https://gerrit.libreoffice.org/19064 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2015-09-30Fix typosAndrea Gelmini1-2/+2
Change-Id: I44bdb63bef76e9686e995661a24a3bef7cd50ab7 Reviewed-on: https://gerrit.libreoffice.org/18959 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2015-08-31loplugin:stringconstant: OUStringBuffer: appendAscii -> appendStephan Bergmann3-6/+6
Change-Id: I09552b4ddd8900952f499c8b9c44933c7240c866
2015-08-27Clean up sEmptyStephan Bergmann1-4/+3
Change-Id: If1b2bfe308caa2bce92e73d2c5c86ee273faed93