Commit Graph

56 Commits

Author SHA1 Message Date
Herbert Dürr
b828a6f494 Related: #i121715# find official JRE>=7 on OSX
(cherry picked from commit a3eded9728647bde4af68b9f3c75a51dc0676fc7)

Conflicts:
	jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
	jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx

Change-Id: I5ec6aa62147f9b3fb3e5142fbc2658c0b54f21b8
2013-05-28 17:20:07 +01:00
Tor Lillqvist
0286471797 Look for Oracle Java 7 in a 64-bit LibreOffice on OS X
Change-Id: Ife3fc97c11ab5216df62aba92dc11ed6cf07c154
2013-04-09 00:54:29 +03:00
Luboš Luňák
1946794ae0 mass removal of rtl:: prefixes for O(U)String*
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-07 14:23:11 +02:00
Thomas Arnhold
39d45390f4 removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings declarations
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-19 10:48:30 +00:00
Thomas Arnhold
8b27d78b4a automated removal of RTL_CONSTASCII_USTRINGPARAM for quoted OUStrings
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-19 09:00:26 +00:00
Jean-Noël Rouvignac
97eb8a6e0e Removed several useless macros: A2OU, A2S, C2U, C2S, OUSTR, OUSTRING
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-30 12:54:40 +00:00
Julien Nabet
88840a796e Remove unused local vars
Change-Id: I80bd0329e15cb365091ea6f5c7e1ef3559d681fc
2012-08-11 10:25:54 +02:00
Michael Meeks
2c47c9989e re-base on ALv2 code. Includes:
cws mba34issues01: #i117709#: make sure that parent of error message box is visible
    Patch contributed by Mathias Bauer
    http://svn.apache.org/viewvc?view=revision&revision=1172346
    i#119036 - improve user experience of certification dialog - only shown once
    Patch contributed by Oliver-Rainer Wittmann
    http://svn.apache.org/viewvc?view=revision&revision=1299727
2012-07-13 21:38:47 +01:00
Takeshi Abe
a138709519 Drop comparison with empty rtl::OUString 2012-02-29 01:23:09 +09:00
Stephan Bergmann
0a5dcfe4a1 Adapted AsynchReader to safer-to-use salhelper::Thread 2012-02-23 10:47:36 +01:00
Gustavo Buzzatti Pacheco
c47f352333 Fix for fdo43460 Part XXII getLength() to isEmpty()
Part XXII
modules
jvmfwk, l10ntools, lingucomponent
2012-01-05 15:07:34 +01:00
Matúš Kukan
f958657cc5 gcc-trunk: fix error: unable to find string literal operator 'operator"" FOO' 2011-12-16 21:20:08 +01:00
Norbert Thiebaud
bf1f1e9cba remove include of pch header from jvmfwk 2011-11-27 13:13:58 -06:00
Stephan Bergmann
70a6b9ffbd New sal/log.h obsoletes osl/diagnose.h and tools/debug.hxx.
* New SAL_INFO..., SAL_WARN... macros.
* New SAL_STREAM supersedes OSL_FORMAT.
* oustringostreaminserter.hxx moved from unotest to rtl (and always UTF-8 now).
* TODO to enable GCC __attribute__((format)) in sal/log.h (requires call-site
  cleanup).
* Further functionality in tools/debug.hxx (DBG_MEMTEST, DBG_CTOR, etc.) not yet
  addressed.
* Some replacements tools String -> rtl::OUString.
2011-11-22 09:41:47 +01:00
Caolán McNamara
ae59ac8646 add salhelper::LinkResolver 2011-05-25 08:57:24 +01:00
Caolán McNamara
693d7797ac use comphelper::resolveLink 2011-05-25 08:57:24 +01:00
Caolán McNamara
71d97cfc1e resolve symbolic links to jvm dirs for especially smoketest inside ooenv 2011-05-24 15:49:45 +01:00
Julien Nabet
474d8ffd63 Some cppcheck cleaning 2011-05-17 12:44:26 +02:00
Christina Rossmanith
c776e24f16 remove FileStatusMask_XXX in favour of osl_FileStatus_Mask_XXX (ure) 2011-04-19 20:40:32 +02:00
Hanno Meyer-Thurow
6cd98b3d9d Merge Gentoo patches from old build and downstream repositories.
1. Do not add compiler default include and library path: potentially build
   against different version of system library than requested by the user.
2. Add a configure option to disable Python2 (PyUNO) bindings. Python3 is
   available for more than two years. Noone cares, therefore rest in peace.
   Python2 is going to be ditched at some point. Simply do not fail then.
   Windows builds need to be updated for BUILD_TYPE: "PYUNO". Or how is it
   handled nowadays?
3. Fix sandbox violation in officecfg module: rm /bin/<language>.zip
4. Add a configure option to search only in one place for JVMs, which is quite
   interesting for Linux Distributions. Enforce the user to place JVMs in one
   base directory.
5. Fix build for libxml-2.7.8 with ICU support.

* config_office-XINC-XLIB-defaults.diff: (1)
* disable-python.diff: (2)
* gentoo-sandbox.diff: (3)
* jvm-search-path.diff: (4)
* libxmlsec_fix_extern_c.diff: (5)
2011-03-14 18:51:13 +01:00
Thomas Arnhold
6488e5f120 Move OSL_ENSURE(false,...) to OSL_FAIL(...) 2011-03-12 14:19:48 +01:00
Takeshi Abe
b406c51330 removed dead code; fix a comment 2011-03-04 01:41:18 +09:00
Julien Nabet
933e22880b Remove "using namespace ::rtl" 2011-03-02 21:53:12 +01:00
Caolán McNamara
3bf43b8d8e cppunit: prefer prefix variant 2011-01-06 14:01:56 +00:00
Jan Holesovsky
752d233ca1 Merge commit 'ooo/OOO330_m13' 2010-11-01 13:54:58 +01:00
Joachim Lingner
f1b79dae76 jl162 #i115180# fix problems with latest java 1.6.0_22 on MacOS 10.6 2010-10-26 12:28:33 +02:00
Sebastian Spaeth
a715e1b3d0 Add vim/emacs modelines to all source files
Fixes #fdo30794
Based on bin/add-modelines script (originally posted in mail
1286706307.1871.1399280959@webmail.messagingengine.com)

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2010-10-14 17:04:31 +02:00
Ivo Hinkelmann
8d3a433eff CWS-TOOLING: integrate CWS jl145 2010-03-02 19:50:45 +01:00
sb
4a57e561bf sb111: merged in DEV300_m72 2010-02-25 13:53:42 +01:00
Jens-Heiner Rechtien
7c80db2eb3 changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Joachim Lingner
3644d82a15 #jl145: #i106849# resolving link to a directory not working by applying the first fix. Redone and added a relative base URL file:/// in the call to osl_getAbsolutFileURL 2010-01-18 12:24:16 +01:00
Joachim Lingner
4889d02f40 jl145: merge with DEV300_m69 2010-01-12 15:55:12 +01:00
sb
736960b56f sb111: merged in DEV300_m69 2010-01-08 13:21:39 +01:00
Joachim Lingner
c6826a3905 jl145: #106849# assertion because osl_getAbsoluteFileUrl is called with file URL instead of a path as argument. 2009-12-02 12:27:30 +01:00
Caolán McNamara
eb40b6f614 cmcfixes68: #i107320# ifdef debug only code 2009-11-30 12:03:04 +00:00
sb
ae68e193fc improve javaldx robustness when java executable prints additional stuff to stdout (as happens in some poor environments where java is a wrapper script that checks system patch levels etc. and prints advice to stdout...) 2009-09-28 11:35:43 +02:00
Kurt Zenker
cf6a1e41bc CWS-TOOLING: integrate CWS os2port06dev300
2009-09-05 22:49:00 +0200 ydario  r275858 : #i99588# applied os2port06 diff to DEV300 tree.
2009-09-10 22:44:47 +00:00
Oliver Bolte
b76cb86eaa CWS-TOOLING: integrate CWS mhu20
2009-09-01 15:18:43 +0200 mhu  r275662 : #i32526# Fixed missing includes, and a wrong cast
2009-08-28 13:30:05 +0200 mhu  r275530 : #i32526# Fixed missing includes and remaining merge conflicts.
2009-08-28 13:28:45 +0200 mhu  r275529 : #i32526# osl_readLine() now implemented in sal/osl/<platform>/file.cxx
2009-08-26 19:47:53 +0200 mhu  r275445 : CWS-TOOLING: rebase CWS mhu20 to trunk@275331 (milestone: DEV300:m56)
2009-08-25 15:47:00 +0200 mhu  r275365 : #i32526# Also maintain phys. file offset.
2009-08-25 15:24:56 +0200 mhu  r275364 : #i32526# Added buffered file I/O; refactored file.cxx into multiple files.
2009-08-24 10:38:15 +0200 mhu  r275294 : #i32526# Correct OpenFlags for osl_openFile().
2009-05-25 11:07:34 +0200 mhu  r272225 : #i32526# Added support for non-seekable file handles (pipe et al.).
2009-05-25 11:01:50 +0200 mhu  r272223 : #i32526# Add osl_readLine() test, cleanup obsolete tests.
2009-05-25 10:56:14 +0200 mhu  r272221 : #i32526# Add missing include
2009-05-25 10:48:51 +0200 mhu  r272220 : #i32526# Accept OpenJDK (IcedTea6) 1.6.0_0 version string
2009-05-15 19:18:20 +0200 mhu  r271965 : #i32526# Initial osl/unx buffered file I/O implementation.
2009-05-15 17:41:57 +0200 mhu  r271959 : CWS-TOOLING: rebase CWS mhu20 to trunk@271830 (milestone: DEV300:m48)
2009-03-26 17:28:53 +0100 mhu  r270091 : CWS-TOOLING: rebase CWS mhu20 to trunk@270033 (milestone: DEV300:m45)
2009-09-09 09:38:41 +00:00
Oliver Bolte
97064f3605 #i10000# build breaks for wntmsci12 2009-06-15 07:10:38 +00:00
Ivo Hinkelmann
95c136d0d1 CWS-TOOLING: integrate CWS ooo31osol_DEV300
2009-05-14 15:49:09 +0200 ihi  r271896 : #i101913# added missing solaris entries
2009-05-14 12:36:19 +0200 ihi  r271885 : #i101913# ARCH -> all
2009-05-13 11:14:52 +0200 jl  r271846 : #i101457# Do not search for Java every time OOo starts
2009-05-13 08:49:28 +0200 jl  r271838 : #tr6585548# Redone last change. On Solaris we do not scan the directories anymore and instead just ckeck /usr/jdk/latest
2009-05-12 17:10:03 +0200 jl  r271828 : #i64357# We scan on Unix only for a java in different folders if we haven't found one by looking into JAVA_HOME or PATH
2009-05-12 13:17:04 +0200 releng  r271819 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
2009-05-12 13:08:28 +0200 is  r271816 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
2009-06-12 20:38:47 +00:00
Vladimir Glazounov
80c2865783 INTEGRATION: CWS cmcfixes44 (1.16.6); FILE MERGED
2008/04/24 08:02:19 cmc 1.16.6.1: #i88676# osl_freeProcessHandle is missing after a successful call to osl_executeProcess
2008-05-13 13:03:28 +00:00
Rüdiger Timm
6b7709ce7a INTEGRATION: CWS changefileheader (1.15.12); FILE MERGED
2008/03/31 07:24:50 rt 1.15.12.1: #i87441# Change license header to LPGL v3.
2008-04-11 09:23:28 +00:00
Ivo Hinkelmann
f3a1836cea INTEGRATION: CWS gcc430two (1.14.14); FILE MERGED
2008/01/28 09:53:07 rene 1.14.14.1: more gcc 4.3.0 things
2008-02-04 12:46:06 +00:00
Vladimir Glazounov
39f825f06d INTEGRATION: CWS jl77 (1.13.30); FILE MERGED
2007/11/19 13:10:45 jl 1.13.30.1: #i80976# applied patch for finding 64 bit jre
2007-12-06 16:44:50 +00:00
Ivo Hinkelmann
5633f6556e INTEGRATION: CWS jl51 (1.12.18); FILE MERGED
2007/03/01 16:13:52 jl 1.12.18.1: #64281# some JREs were not found
2007-04-17 09:30:32 +00:00
Oliver Bolte
fe485ba54c INTEGRATION: CWS pchfix02 (1.11.16); FILE MERGED
2006/09/01 17:31:40 kaib 1.11.16.1: #i68856# Added header markers and pch files
2006-09-16 16:46:48 +00:00
Jens-Heiner Rechtien
896aedac79 INTEGRATION: CWS warnings01 (1.9.14); FILE MERGED
2006/02/27 11:43:04 sb 1.9.14.5: #i53898# Made code waring-free.
2005/10/28 10:13:54 sb 1.9.14.4: #i53898# Made code warning-free.
2005/10/27 15:08:48 pl 1.9.14.3: #i55991# removed warnings for solaris platform
2005/09/22 20:21:34 sb 1.9.14.2: RESYNC: (1.9-1.10); FILE MERGED
2005/09/01 14:56:19 sb 1.9.14.1: #i53898# Made code warning-free.
2006-06-19 23:10:08 +00:00
Rüdiger Timm
c145110585 INTEGRATION: CWS ooo19126 (1.9.12); FILE MERGED
2005/09/05 17:12:24 rt 1.9.12.1: #i54170# Change license header: remove SISSL
2005-09-07 18:32:15 +00:00
Rüdiger Timm
b8871d23ea INTEGRATION: CWS linuxppc02 (1.8.2); FILE MERGED
2005/05/03 20:10:00 ericb 1.8.2.1: i38974 correct path for javaldx on Linux PPC and IBM jre142
2005-05-11 10:31:48 +00:00
Oliver Bolte
4ee8376e27 INTEGRATION: CWS macosx06 (1.7.10); FILE MERGED
2005/04/16 16:19:04 ericb 1.7.10.1: i43540 current j2re is 1.4.2 on Mac OSX
2005-04-27 07:53:32 +00:00