summaryrefslogtreecommitdiff
path: root/jvmfwk
AgeCommit message (Collapse)AuthorFilesLines
2013-06-02jvmfwk: de-Pascalize do_msvcr71_magicMichael Stahl1-11/+7
The uninitialized Module variable causes the smoketest to fail when built with MSVC 2012 (assinging to it raises some weird exception). Change-Id: I77b3b591a94f4dfbb373938e3787f75e6a8e09c5 (cherry picked from commit 1ff01d207d90685cb897f518c2a688b5ef33358e)
2013-05-18Clearer javaldx messageAriel Constenla-Haile1-3/+3
(cherry picked from commit fdebe4193ae0f3f8a8281dfc0a2f053e578cf1b9) Conflicts: jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx Change-Id: I4c26c704ce85a273d7022260bb721e295041c260
2013-05-18Add Oracle as a Java vendor for Solaris.Pedro Giffuni1-1/+5
Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml Change-Id: Ifaa60fafb0db62ed60ba4080b6bb3713d8d9e3be
2013-05-15Spelling "separate" (etc) correctly is hardTor Lillqvist1-1/+1
2013-05-06cleanup whitespaces due to RTL_CONSTASCII_USTRINGPARAM removalPhilipp Riemer1-13/+6
In e2e2cc61144cb22227eebfadff0ea24b51ccfbd0 the method was removed automatically leaving several line breaks etc. as visual noise.
2013-05-06remove usage of RTL_CONSTASCII_USTRINGPARAMLuboš Luňák1-12/+12
Mechanical removal of usage together with OUString ctor, done by compiler plugin. Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
2013-05-05copy more rc files to instdirDavid Tardon3-0/+55
Change-Id: Ia4cc2b8e504f46734ea7bfaade60bf27509cce32
2013-05-02Resolves: #i66923# Add support for JRockit JVMAriel Constenla-Haile3-5/+7
(cherry picked from commit cb38ee0da6fa928118fbc1da118a707d7799cb40) Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Change-Id: Iffd413ba1d74ae3b7da58df7b092c43c4f64a7c9
2013-04-24gbuild: drop empty use_packages callsDavid Tardon2-6/+0
Change-Id: I8e9f70eb5d929c98b4379416c2259a74e31d587f Reviewed-on: https://gerrit.libreoffice.org/3503 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-24gbuild: drop uses of removed packagesDavid Tardon2-2/+0
Change-Id: I400fad08c0ae7b6b34bad63693f54856867e4dac Reviewed-on: https://gerrit.libreoffice.org/3502 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
2013-04-23execute move of global headersBjoern Michaelsen6-1159/+0
see https://gerrit.libreoffice.org/#/c/3367/ and Change-Id: I00c96fa77d04b33a6f8c8cd3490dfcd9bdc9e84a for details Change-Id: I199a75bc4042af20817265d5ef85b1134a96ff5a
2013-04-22Move to MPLv2 license headers, with ESC decision and author's permission.Michael Meeks10-224/+40
2013-04-17-Werror=unused-macros (MinGW, jvmfwk)Stephan Bergmann1-3/+1
Change-Id: I860939930c43cac89c4ab745bf129922be1f1511
2013-04-17-Werror=unused-macros (MinGW, USE_ACCESSIBILITY_FILE)Stephan Bergmann1-7/+0
...dead at least since c58b07c958e7bc70a9d337852df477f33a453433 "#i20020#," if not even since the beginning, 49614181e5712933a3dce40c6afb344f02f8d287 "#i20052# plugin lib for java framework." Change-Id: Ic0b35341cb8038ccfe0a2f4f5b758341b9ab13b9
2013-04-15fdo#60724 correct spellingThomas Arnhold1-1/+1
Change-Id: Ieb653adbd0cb4371ec5db57e70bcc551872f647f
2013-04-15fdo#60724 correct spellingThomas Arnhold2-2/+2
Change-Id: I7318a9f4f3410edf4dbe67bf08f31682fcb4edc7
2013-04-12do not set soversion for private ure librariesMatúš Kukan2-60/+0
Change-Id: I2b2099d8fc00062f67c42e73c4b8a17a689db89d Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
2013-04-09Look for Oracle Java 7 in a 64-bit LibreOffice on OS XTor Lillqvist3-2/+25
Change-Id: Ife3fc97c11ab5216df62aba92dc11ed6cf07c154
2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák27-397/+369
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk have kept them, in order not to break external API (the automatic using declaration is LO-internal). Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
2013-04-05Drop jvmaccess and jvmfwk when no SOLAR_JAVATor Lillqvist4-55/+2
Just sprinkle #ifdef SOLAR_JAVA into the code instead. In the source for jvmaccess and jvmfwk such ifdefs can be removed as it isn't compiled unless SOLAR_JAVA. Change-Id: Ia8614f8bd6d833582d3b79b5fb75f9153fa79606
2013-03-27WaE: "UNX" is not definedDavid Tardon2-4/+4
Change-Id: I3b72efae6c3ae929eb4f26400a7c73406371c1a2
2013-03-27WaE: "UNX" is not definedDavid Tardon1-1/+1
Change-Id: Ie1a98500fa4f3965872b3fc92a303df84556fd7a
2013-03-27WaE: macro "RUNNING_ON_VALGRIND" is not usedTor Lillqvist1-2/+2
Change-Id: Ie60882c86008506a331087a241f15e931c5eacee
2013-03-27-Wunused-macrosStephan Bergmann2-5/+0
Change-Id: Ifaa1637122d6f9cae1e29b77ac36ca5d1f220aed
2013-03-22warning: unknown log area 'jvmfwk' [loplugin]Tor Lillqvist1-1/+1
This is not a warning that would stop an --enable-werror build, but still worth fixing. Change-Id: I6c47fd636f57f55cbe406f51e2f24e015924ce14
2013-03-19removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarationsThomas Arnhold5-35/+22
s/(OUString\s+[a-zA-Z_][A-Za-z0-9_]*\s*)\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/$1\($2\)/gms Change-Id: Iad20f242c80c4bdc69df17e2d7a69d58ea53654b Reviewed-on: https://gerrit.libreoffice.org/2835 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-03-19automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStringsThomas Arnhold4-11/+11
Done with a perl regex: s/OUString\s*\(\s*RTL_CONSTASCII_USTRINGPARAM\s*\((\s*"[^")]*?"\s*)\)\s*\)/OUString\($1\)/gms Change-Id: Idf28320817cdcbea6d0f7ec06a9bf51bd2c3b3ec Reviewed-on: https://gerrit.libreoffice.org/2832 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2013-03-14remove legacy build.pl prj/build.lst files.Michael Meeks1-2/+0
2013-03-09-Werror=unused-local-typedefs (GCC 4.8)Stephan Bergmann1-1/+0
Change-Id: Ib1dedbe8e273463fa47573486d67dc9d509953db
2013-03-06fdo#60148 Clean up warnings from the Clang compiler pluginnccuong1-2/+2
Change-Id: I08d755677c46c476710ecbd067ed9f7e2f54a671 loplugin: clean warnings: unused variables, incorrect indentation and log area. Reviewed-on: https://gerrit.libreoffice.org/2544 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
2013-03-03coverity#705669: fix memory leakMarkus Mohrhard1-0/+3
Change-Id: Ib99c5e5c4a8c3c6efd0ff0665c73b241790b314b
2013-02-28remove all d.lstMichael Stahl1-0/+0
Change-Id: Icba4218c5f9fe89d183d25ea82a8eae52881f885
2013-02-22s/the the/the/Tor Lillqvist3-3/+3
Change-Id: Iadacffaad832c6ff06757e8567e24f929f24a4c3
2013-02-12Some cppcheck cleaningJulien Nabet1-2/+4
Change-Id: I8609949377181f8edb30ac07b2791cfcd079fc7d
2013-01-30Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRINGJean-Noël Rouvignac4-75/+73
Change-Id: Ie859cb2dfdc7103c379fce56be88eef8fe390afd Reviewed-on: https://gerrit.libreoffice.org/1924 Tested-by: Luboš Luňák <l.lunak@suse.cz> Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
2013-01-26gbuild: fix silly "expandtabs" in makefile VIM modelinesMichael Stahl7-7/+7
Change-Id: I54d8923ad315e8041fd3904da3a29f1a7a8c8b16
2013-01-26gbuild: do not copy boost headers aroundMichael Stahl2-0/+2
- do not use gb_UnpackedTarball_copy_header_files for boost - adapt the optimization in concat-deps.c for new path - use boost_headers in all LinkTargets that require it - add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9
2012-12-25Get rid of (most uses of) GUITor Lillqvist2-4/+4
GUI only takes values UNX or WNT, so it is fairly pointless. One can check whether OS is WNT or not instead. Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34 Reviewed-on: https://gerrit.libreoffice.org/1304 Reviewed-by: Peter Foley <pefoley2@verizon.net> Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-18Let JavaVirtualMachine::getJavaVm start the VM it already foundStephan Bergmann2-71/+81
Since b69951996967a1c79e3a55dd13dd5609b19db6a1 "Drop support for /etc/opt/ure and ~/.ure from LibreOffice 4" there is no place any more where a plain URE will store information about a selected JVM, so JavaVirtualMachine::getJavaVM will go into an endless loop of jfw_startVM -> JFW_E_NO_SELECT -> jfw_findAndSelectJRE -> jfw_startVM -> ... The solution is to pass the JavaInfo determined by jfw_findAndSelectJRE into the second invocation of jfw_startVM (for which the parameter list of the latter needed to be changed), instead of relying on jfw_findAndSelectJRE and jfw_startVM implicitly communicating that information via user configuration files. Change-Id: I5799f04c457e8a849c67ed827dc5e134c6563362
2012-11-27Make python3 work with custom VALGRIND_CFLAGSStephan Bergmann1-2/+2
Change-Id: Ia4b08a1b20bf46af4d06c0478ed8e795ee543703
2012-11-15Drop support for /etc/opt/ure and ~/.ure from LibreOffice 4Stephan Bergmann2-13/+31
For one, /etc/opt/ure was probably never used by anyone anyway, so meant just needless file-stats during startup. For another, accidentally created ~/.ure/javasettings_*.xml that later became stale were noted to cause trouble, so that source is now closed. For this to work, jvmfwk needs to be silent now if it cannot read/write any shared/user javasettings_*.xml. Change-Id: I332b5ebb9549dc6ccf7c99c439d9a3b61aeb5829
2012-10-15fix typosJulien Nabet1-3/+3
Change-Id: I3bca3709ba759894ce77bab412f5082718ea25c5
2012-10-09loplugin: unused OStringsCaolán McNamara2-4/+0
Change-Id: I22916424fb97ba27ea6f4e540841a6c851fb8c88
2012-10-08TypoTor Lillqvist1-1/+1
Change-Id: I6ec48d3156f11c4ecb5f24a70a5c83603a86f834
2012-10-08Fix for !SOLAR_JAVATor Lillqvist1-6/+44
Change-Id: I43d8680304ef11f2b5f5e3edafcc6af6eca8d601
2012-10-07Move the #ifndef DISABLE_DYNLOADING a bit earlierTor Lillqvist1-1/+1
Change-Id: I1777d6304b2ebb218c0f85c778f1a66d05c4f454
2012-10-07Handle lack of module loading/unloading API when DISABLE_DYNLOADINGTor Lillqvist1-11/+77
There are basicically two classes of cases: 1) Where the code is for obscure historical reasons or what I see as misguided "optimization" split into a more libraries than necessary, and these then are loaded at run-time. Instead, just use direct linking. 2) Where dynamic loading is part of the functionality offered to some upper (scripting etc) layer, or where some system-specific non-LO library is loaded dynamically, as it is not necessarily present on end-user machines. Can't have such in the DISABLE_DYNLOADING case. Change-Id: I9eceac5fb635245def2f4f3320821447bb7cd8c0
2012-10-04sal_Bool->bool in jvmfwkNoel Grandin2-4/+4
Change-Id: I8821bc7e4615421a710e6fdf913e646059dd5665
2012-10-04Mention the plugin mechanismTor Lillqvist1-0/+3
Change-Id: I51e22cceb332048552e86acb2362b907617a84cc
2012-10-01Replace usage of rtl_*Memory with equivalent from string.hArnaud Versini1-1/+1
Change-Id: I50ffc10f007f03c3252ef0196b59b881429cc159 Reviewed-on: https://gerrit.libreoffice.org/734 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>