summaryrefslogtreecommitdiff
path: root/jvmfwk
AgeCommit message (Collapse)AuthorFilesLines
2014-01-28bool improvementsStephan Bergmann5-14/+21
Change-Id: I418611622b4b47ed5a4fa2ab99afb25371b186f6
2014-01-27bool improvementsStephan Bergmann3-14/+14
Change-Id: I757e19313576d2c3d13af1cb720f182f0de91613
2014-01-24coverity#705670 Resource leakCaolán McNamara1-0/+1
Change-Id: Ib89a580127d91e9d7a23b998df3cd100246bf289
2014-01-23Let C++ inline functions return bool instead of sal_BoolStephan Bergmann3-9/+9
...to improve diagnosing misuses of boolean expressions in client code (cf. compilerplugins/clang/implicitboolconversion.cxx). This change should be transparent to client code. Missing overloads of insert() for bool have been added to OStringBuffer and OUStringBuffer (which required dropping one !VALID_CONVERSION check that would now pick that overload, but would be flagged by compilerplugins/clang/pointertobool.cxx). Change-Id: I2d64cd923b8f47bfaa31e753def6515c29a3f8c9
2014-01-21bool improvementsStephan Bergmann2-3/+3
Change-Id: Ic4572480d48e341c8fa611a3283efc351f530eb5
2013-12-17Remove unnecessary use of OUString constructor in + expressionsNoel Grandin1-2/+1
Convert code like aFilename = OUString::number(nFilePostfixCount) + OUString(".bmp"); to aFilename = OUString::number(nFilePostfixCount) + ".bmp"; Change-Id: I03f513ad1c8ec8846b2afbdc67ab12525ed07e50
2013-11-22remove unnecessary RTL_CONSTASCII_STRINGPARAMNoel Grandin2-13/+6
A final pass through the code, converting code to use the new OUString and OString methods that can detect string literals. Change-Id: Ifa6382335e5650a1c67e52006b26354e0692c710
2013-11-11remove unnecessary use of OUString constructorNoel Grandin3-8/+8
Change-Id: Ifb220af71857ddacd64e8204fb6d3e4aad8eef71
2013-10-31Convert indexOf->startsWith and lastIndexOf->endsWithNoel Grandin1-3/+3
This is both an optimisation and a cleanup. This converts code like aStr.indexOf("XX") == 0 to aStr.startsWith("XX") and converts code like aStr.lastIndexOf("XXX") == aStr.getLength() - 3 to aStr.endsWith("XXX") Note that in general aStr.lastIndexOf("X") == aStr.getLength() - 1 converts to aStr.isEmpty() || aStr.endsWith("X") so I used the surrounding context to determine if aStr could be empty when modifying the code. Change-Id: I22cb8ca7c2a4d0288b001f72adb27fd63af87669
2013-10-30Avoid using gconftool. Atk provides a11y not Java on Unix.Michael Meeks2-20/+18
cf. comment in framework header. Should have no impact on real run-time Java a11y, which would be enabled later as-needed; only on JRE selection. For extreme corner-cases, where your auto-selected JRE has no a11y support either select another JRE in the UI or: $ export JFW_PLUGIN_FORCE_ACCESSIBILITY=1 to override. Change-Id: I59a6428e5a11664b75c29580cad76eb9500db45a
2013-10-28jvmfwk: remove Package_*solverMichael Stahl3-61/+0
Change-Id: I5784f3c060680c366053334db8a879250bfdbbbe
2013-10-28gbuild: set Package default target to INSTDIRMichael Stahl4-4/+4
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
2013-10-28jvmfwk: rewrite odd conditionalMichael Stahl1-5/+3
Change-Id: I69f8e44b0845ac2d6db5a32298de1b561be61f2c
2013-10-28Improve debug output (and some clean up)Stephan Bergmann1-14/+9
Change-Id: Ibce90b4eeab679d526f0e0b1e9a8ab3b14255622
2013-10-14Revert "Related: #i119525# List only JREs whose jvm library can be loaded"Markus Mohrhard1-22/+0
This reverts commit 37ca14359b8c4027f1d9f9569ddfa2740cd2731e. This breaks the loading of the jvm.dll on Windows if the msvcr*.dll is not in the system path.
2013-10-05URE folder path fixes for the HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE caseTor Lillqvist1-1/+3
Change-Id: I5019cce2172db7b3ac74e25f5ea9dc62e9fd03f8
2013-09-23Try to fix cross-compilationTor Lillqvist2-2/+2
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions. Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT. Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
2013-09-16Still copy jvmfwk support files to solverStephan Bergmann3-0/+57
...instead of only to instdir, as happened after 2e47462d076364725875e770a91a7bb6bbbec2c1 "jvmfwk: install also into instdir," so that CppunitTests (which still run against solver) can use jvmfwk. This will become moot when solver is eventually dropped. Change-Id: Ic2cdbf32e20a79f8cc6ac2088e4bc47dcd6f5cc5
2013-09-11Towards a working instdir for Mac OS XStephan Bergmann2-2/+2
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X, where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK- related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And GeneratedPackage needed to be made more flexible, to allow for packages that go into either of those two places.) For Android and iOS, gb_INSTROOT probably still needs to be set. The most obvious missing thing yet to make instdir work for Mac OS X is the instdir/*/LibreOffice.app/Contents/ure/ vs. instdir/*/LibreOffice.app/Contents/ure-link/ split. Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
2013-09-09jvmfwk: install also into instdirMatúš Kukan5-86/+17
Change-Id: I4004361a85af4e6aed9dd0951d1154a2d99f97e7
2013-08-27fdo#67313: Use "lo" suffix for private URE libsStephan Bergmann6-19/+19
...(like is done for most of LO's non-URE libs already) to reduce likelihood of name clashes, esp. on Windows where URE libs are found via PATH. This introduces PRIVATELIBS_URE, and removes now-unused UNOLIBS_URE. Change-Id: Ib95dd45f18de140a54e62d632dbf2239f83c232e
2013-08-21finish deprecation of O(U)String::valueOf()Luboš Luňák3-10/+10
Compiler plugin to replace with matching number(), boolean() or OUString ctor, ran it, few manual tweaks, mark as really deprecated. Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
2013-08-19Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVATor Lillqvist1-1/+1
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
2013-08-18Use subfolder names from <config_folders.h>Tor Lillqvist2-0/+11
Change all instances of hardcoded "program", "share" etc subfolder names to use those from <config_folders.h> instead. In normal builds, the end result will not change. Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
2013-07-29Mark as constTakeshi Abe1-2/+2
Change-Id: Ib78b25641ae20a3eb23545649f08b963e34c74ff
2013-06-29remove some createFromAscii usageThomas Arnhold1-1/+1
there are a lot more of them: git grep 'createFromAscii[^)]*"' Change-Id: Ibc2e9cae208d8b9c91667bb3b177c6bd6d3a9424
2013-06-13Introduce O[U]String::toUInt32Stephan Bergmann1-0/+4
...which has become necessary since bd60d41176da540b01d7583cfe00637431967f39 "Handle oveflow in O(U)String::toInt() functions" reduces values in the range (SAL_MAX_INT32 .. SAL_MAX_UINT32] to zero, but some calls of toInt32(16) relied on getting a correct (unsigned) value for the whole input range ["0" .. "FFFFFFFF"] (see libreoffice-4-1 commit 9bf6c83367cedb7be81bf67f30d2147d26c7a8c3 "Revert overflow checks in O[U]String::toInt{32,64} again"). Audited all uses of toInt32/64 with non-decimal radix. (There is still a TODO comment in oox/source/helper/attributelist.cxx, and stoc/source/typeconv/convert.cxx will still need some love and test code.) Change-Id: Iadaca1c0e41dab553687d0ce41c20c10cd657a95
2013-06-10gbuild: rework AutoInstallLibs and autoinstall ure executablesMatúš Kukan1-1/+1
Change-Id: I7312d94f90758d450a69410819c5e8c142756a47
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
2013-05-29Related: #i119525# List only JREs whose jvm library can be loadedAriel Constenla-Haile1-0/+22
(cherry picked from commit 0b31fa19e50d8259d3cbe695723ea02e2c5ff711) Change-Id: I1f96c6239d7278c4eb0c17b69f9d35e08eb8260b
2013-05-28Related: #i121715# find official JRE>=7 on OSXHerbert Dürr1-0/+1
(cherry picked from commit a3eded9728647bde4af68b9f3c75a51dc0676fc7) Conflicts: jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Change-Id: I5ec6aa62147f9b3fb3e5142fbc2658c0b54f21b8
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