Commit graph

65 commits

Author SHA1 Message Date
Vladimir Glazounov
df6a2f00f8 INTEGRATION: CWS odfpfixes01 (1.1.2); FILE ADDED
2008/06/17 17:47:04 is 1.1.2.1: #158103# hiding three layer office
2008-07-01 21:55:52 +00:00
Rüdiger Timm
6c9a7ca74c INTEGRATION: CWS sb87 (1.11.12); FILE MERGED
2008/06/09 08:20:24 sb 1.11.12.2: resolved conflict against DEV300m17
2008/05/09 14:54:38 sb 1.11.12.1: #i88211# introduced vnd.sun.star.pathname pseudo URL feature for INIFILENAME and URE_BOOTSTRAP, dropped INIFILEPATH feature again in return
2008-06-09 12:29:28 +00:00
Rüdiger Timm
75ca52faaf INTEGRATION: CWS sb87 (1.1.2); FILE ADDED
2008/05/07 11:20:45 sb 1.1.2.2: #i88687# added java mode
2008/04/24 11:39:56 sb 1.1.2.1: #i88687# added unoinfo executable
2008-06-09 11:57:21 +00:00
Rüdiger Timm
2277d4e4dc INTEGRATION: CWS sb87 (1.32.12); FILE MERGED
2008/05/09 14:54:38 sb 1.32.12.1: #i88211# introduced vnd.sun.star.pathname pseudo URL feature for INIFILENAME and URE_BOOTSTRAP, dropped INIFILEPATH feature again in return
2008-06-09 11:57:10 +00:00
Rüdiger Timm
a4c30e5dc3 INTEGRATION: CWS sb87 (1.12.18); FILE MERGED
2008/04/24 13:21:17 sb 1.12.18.2: RESYNC: (1.12-1.13); FILE MERGED
2008/04/24 11:39:27 sb 1.12.18.1: #i88687# added unoinfo executable
2008-06-09 11:56:57 +00:00
Kurt Zenker
e2722b2326 INTEGRATION: CWS native152 (1.2.38); FILE MERGED
2008/05/15 09:08:23 is 1.2.38.1: #i89391# ooodev with its own basis root dir
2008-05-21 11:10:21 +00:00
Kurt Zenker
1c329c09b9 INTEGRATION: CWS native152 (1.2.38); FILE MERGED
2008/05/15 09:08:22 is 1.2.38.1: #i89391# ooodev with its own basis root dir
2008-05-21 11:10:01 +00:00
Vladimir Glazounov
3b77857f35 INTEGRATION: CWS oxtsysint01 (1.11.2); FILE MERGED
2008/04/25 05:08:04 obr 1.11.2.1: #i85856# desktop integration no longer uses unopkg gui
2008-05-15 08:19:36 +00:00
Rüdiger Timm
95082489c5 INTEGRATION: CWS changefileheader (1.10.14); FILE MERGED
2008/03/28 15:26:28 rt 1.10.14.1: #i87441# Change license header to LPGL v3.
2008-04-11 02:34:39 +00:00
Rüdiger Timm
84769c862a INTEGRATION: CWS changefileheader (1.31.14); FILE MERGED
2008/03/28 15:26:28 rt 1.31.14.1: #i87441# Change license header to LPGL v3.
2008-04-11 02:34:25 +00:00
Rüdiger Timm
2adec53bd1 INTEGRATION: CWS changefileheader (1.12.14); FILE MERGED
2008/03/28 15:26:27 rt 1.12.14.1: #i87441# Change license header to LPGL v3.
2008-04-11 02:34:12 +00:00
Vladimir Glazounov
675580f35f INTEGRATION: CWS sb83 (1.6.34); FILE MERGED
2008/03/04 16:23:41 sb 1.6.34.10: missing export
2008/02/14 13:05:19 sb 1.6.34.9: #i84200# for now, move crash reporter to brand layer
2008/02/12 08:44:09 sb 1.6.34.8: #i84200# lots of cleanup
2008/02/08 11:12:48 sb 1.6.34.7: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on all plattforms, are in the brand layer, where they can include brand-specific icons on Windows (read by vcl; potentially visible in Windows Explorer according to hro)
2008/02/01 13:29:23 sb 1.6.34.6: RESYNC: (1.7-1.9); FILE MERGED
2008/01/23 15:16:33 sb 1.6.34.5: #i84200# moved executables from brand layer to basis layer
2008/01/21 15:13:48 sb 1.6.34.4: #i84200# have a fake ure-link in all Unix good-old monolithic OOos, so that start-script javaldx execution can be simplified
2008/01/07 15:27:10 sb 1.6.34.3: #i84985# added URE_OVERRIDE_JAVA_JFW_SHARED|USER_DATA
2008/01/02 12:26:02 sb 1.6.34.2: #i84200# First step of basis/brand split.#
2007/11/22 09:45:46 sb 1.6.34.1: Merged in CWS sb80.
2008-03-18 12:45:09 +00:00
Vladimir Glazounov
56e2cda2b1 INTEGRATION: CWS sb83 (1.28.34); FILE MERGED
2008/03/17 09:02:10 sb 1.28.34.13: RESYNC: (1.29-1.30); FILE MERGED
2008/03/04 16:23:41 sb 1.28.34.12: missing export
2008/02/14 13:05:19 sb 1.28.34.11: #i84200# for now, move crash reporter to brand layer
2008/02/12 12:44:26 sb 1.28.34.10: #i86041# do not add Mozilla library directory to LD_LIBRARY_PATH in soffice start script
2008/02/12 08:44:08 sb 1.28.34.9: #i84200# lots of cleanup
2008/02/08 11:12:48 sb 1.28.34.8: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on all plattforms, are in the brand layer, where they can include brand-specific icons on Windows (read by vcl; potentially visible in Windows Explorer according to hro)
2008/01/23 15:16:33 sb 1.28.34.7: #i84200# moved executables from brand layer to basis layer
2008/01/21 15:13:48 sb 1.28.34.6: #i84200# have a fake ure-link in all Unix good-old monolithic OOos, so that start-script javaldx execution can be simplified
2008/01/07 15:27:10 sb 1.28.34.5: #i84985# added URE_OVERRIDE_JAVA_JFW_SHARED|USER_DATA
2008/01/02 16:19:04 sb 1.28.34.4: #i84200# simplified search for pagein again, as basis-link is now also available in good old monolithic OOo
2008/01/02 12:27:01 sb 1.28.34.3: #i84200# typo (missing .../bin/...)
2007/12/03 13:46:29 sb 1.28.34.2: #i84200# First step of basis/brand split.
2007/11/22 09:45:46 sb 1.28.34.1: Merged in CWS sb80.
2008-03-18 12:44:45 +00:00
Vladimir Glazounov
a52c8c68da INTEGRATION: CWS sb83 (1.1.2); FILE ADDED
2008/02/19 16:25:38 is 1.1.2.2: #i85112#_changing_windows_directory_structure
2008/01/31 16:59:44 is 1.1.2.1: #i85112# new basis  link
2008-03-18 12:44:27 +00:00
Vladimir Glazounov
9697be1528 INTEGRATION: CWS sb83 (1.11.184); FILE MERGED
2008/02/12 12:44:26 sb 1.11.184.4: #i86041# do not add Mozilla library directory to LD_LIBRARY_PATH in soffice start script
2008/01/31 17:00:15 is 1.11.184.3: #i85112# new basis  link
2008/01/11 14:22:02 sb 1.11.184.2: #i84200# build basis-link only on Windows (some Solaris sed complains about missing line end, and this basis-link is not needed there, anyway)
2007/12/27 12:26:15 sb 1.11.184.1: #i84200# The version number in basis-link needs to be abstracted over.  TODO: The for-now explicit 2.4 needs to come from somewhere else!
2008-03-18 12:44:17 +00:00
Vladimir Glazounov
724c24e668 INTEGRATION: CWS sb83 (1.1.2); FILE ADDED
2008/02/19 16:25:38 is 1.1.2.4: #i85112#_changing_windows_directory_structure
2008/01/31 17:00:15 is 1.1.2.3: #i85112# new basis  link
2007/12/27 12:25:30 sb 1.1.2.2: #i84200# The version number in basis-link needs to be abstracted over.
2007/12/21 14:58:11 sb 1.1.2.1: #i84200# Added preliminary Windows basis-link (which still needs to be fixed).
2008-03-18 12:44:01 +00:00
Oliver Bolte
67b7a42819 INTEGRATION: CWS eoladabas_DEV300 (1.29.30); FILE MERGED
2008/02/13 10:26:57 oj 1.29.30.1: #149980# source adabasrc
2008-02-26 15:03:10 +00:00
Rüdiger Timm
97d9fcb858 #i85180# Syntax (correct quotation marks). 2008-01-15 09:40:00 +00:00
Rüdiger Timm
4eb28b2868 INTEGRATION: CWS so8s10u5_SRC680 (1.5.384); FILE MERGED
2008/01/09 12:21:09 obr 1.5.384.1: #b6639520# assume gui mode if passed a single oxt file as argument
2008-01-15 09:35:27 +00:00
Oliver Bolte
696670bc39 INTEGRATION: CWS sb80 (1.6.28); FILE MERGED
2007/11/16 14:47:33 sb 1.6.28.1: #i81275# Moved setting URE_BOOTSTRAP from Unix start scripts to tool's extendapplictionenvironment.cxx.
2008-01-07 08:56:38 +00:00
Oliver Bolte
50eb9151b7 INTEGRATION: CWS sb80 (1.28.28); FILE MERGED
2007/11/16 14:47:33 sb 1.28.28.1: #i81275# Moved setting URE_BOOTSTRAP from Unix start scripts to tool's extendapplictionenvironment.cxx.
2008-01-07 08:56:14 +00:00
Vladimir Glazounov
99e745d606 INTEGRATION: CWS sb71 (1.1.2); FILE ADDED
2007/08/15 10:06:12 sb 1.1.2.1: #i75466# ure-link file for Windows.
2007-10-15 11:59:20 +00:00
Vladimir Glazounov
66ca484175 INTEGRATION: CWS sb71 (1.5.286); FILE MERGED
2007/08/20 08:58:31 sb 1.5.286.4: #i75466# Set URE_BIN_DIR in rc file on all platforms (instead of in startup scripts on Linux/Solaris etc. and in rc files on others).
2007/04/27 14:20:52 sb 1.5.286.3: #i75466# Replaced URE_UNORC and URE_JVMFWK3RC with URE_BOOTSTRAP.
2007/04/18 14:09:40 sb 1.5.286.2: #i75466# Take into account that URE_BIN_DIR is a URL that starts with a file:// prefix.
2007/04/16 13:32:36 sb 1.5.286.1: #i75466# Introduced URE_BIN_DIR, URE_UNORC, URE_JVMFWK3RC.
2007-10-15 11:59:10 +00:00
Vladimir Glazounov
84fab02b32 INTEGRATION: CWS sb71 (1.26.10); FILE MERGED
2007/08/23 18:10:19 sb 1.26.10.5: RESYNC: (1.26-1.27); FILE MERGED
2007/08/20 08:58:31 sb 1.26.10.4: #i75466# Set URE_BIN_DIR in rc file on all platforms (instead of in startup scripts on Linux/Solaris etc. and in rc files on others).
2007/04/27 14:20:52 sb 1.26.10.3: #i75466# Replaced URE_UNORC and URE_JVMFWK3RC with URE_BOOTSTRAP.
2007/04/18 14:09:39 sb 1.26.10.2: #i75466# Take into account that URE_BIN_DIR is a URL that starts with a file:// prefix.
2007/04/16 13:32:36 sb 1.26.10.1: #i75466# Introduced URE_BIN_DIR, URE_UNORC, URE_JVMFWK3RC.
2007-10-15 11:58:46 +00:00
Oliver Bolte
913b5ec88e INTEGRATION: CWS mh23 (1.26.92); FILE MERGED
2007/07/17 15:11:54 mh 1.26.92.1: don't add system path to LD_LIBRARY_PATH, #i76122#
2007-07-18 14:04:16 +00:00
Oliver Bolte
4efb8be1b5 INTEGRATION: CWS pj73 (1.25.164); FILE MERGED
2007/02/14 20:51:01 pjanik 1.25.164.1: #i72685#: quote the path to libraries, because it can contain space.
2007-03-07 12:14:15 +00:00
Vladimir Glazounov
7e0d084341 INTEGRATION: CWS ause074 (1.10.4); FILE MERGED
2007/02/02 11:10:41 hjs 1.10.4.1: #i74085# avoid useless shell calls
2007-02-06 13:07:54 +00:00
Oliver Bolte
13dabbe3ed INTEGRATION: CWS ause069 (1.9.214); FILE MERGED
2006/11/24 14:56:08 hjs 1.9.214.1: #i70359# remove forced shell calls
2007-01-25 14:28:21 +00:00
Kurt Zenker
7ad25b7ce8 INTEGRATION: CWS ause058 (1.24.30); FILE MERGED
2006/06/20 14:53:07 hjs 1.24.30.1: #i66597# add quotes
2006-07-05 21:33:58 +00:00
Jens-Heiner Rechtien
fdf094516a INTEGRATION: CWS soc (1.21.14.1.4); FILE MERGED
2006/04/25 12:28:19 rt 1.21.14.1.4.3: RESYNC: (1.21.14.1-1.23); FILE MERGED
2006/03/21 11:27:49 abi 1.21.14.1.4.2: checking in under linux
2006/03/21 08:48:35 abi 1.21.14.1.4.1: killing soffice.bin after terminating sofficeshellscript
2006-05-08 14:35:41 +00:00
Rüdiger Timm
58d0457573 INTEGRATION: CWS pj50 (1.21.30); FILE MERGED
2006/02/20 17:39:15 pjanik 1.21.30.2: RESYNC: (1.21-1.22); FILE MERGED
2006/02/17 07:10:01 pjanik 1.21.30.1: #i61961#: save one uname execution for all unx systems
2006-03-08 13:17:45 +00:00
Rüdiger Timm
d5ac1b02ad INTEGRATION: CWS hro02 (1.20.20); FILE MERGED
2006/02/07 14:22:25 hro 1.20.20.1: #i59521# Make it easy to disable OpenGL support in start script
2006-02-09 16:07:48 +00:00
Jens-Heiner Rechtien
84e28c15b3 INTEGRATION: CWS sb42 (1.4.34); FILE MERGED
2005/12/19 09:23:00 sb 1.4.34.1: #i55733# Avoid final : in LD_LIBRARY_PATH etc.
2006-01-24 15:46:34 +00:00
Jens-Heiner Rechtien
6d8c754ad6 INTEGRATION: CWS sb42 (1.19.34); FILE MERGED
2006/01/11 09:40:18 sb 1.19.34.2: RESYNC: (1.19-1.20); FILE MERGED
2005/12/19 09:23:48 sb 1.19.34.1: #i55733# Avoid consecutive :s in LD_LIBRARY_PATH etc; patch supplied by pmladek.
2006-01-24 15:46:21 +00:00
Oliver Bolte
5b8d88237e INTEGRATION: CWS pj45 (1.19.18); FILE MERGED
2005/12/04 19:38:45 pjanik 1.19.18.1: #i57935#: do not read /etc/adabasrc for OpenOffice.org
2005-12-21 17:08:29 +00:00
Rüdiger Timm
2a835ac857 INTEGRATION: CWS c06 (1.2.300); FILE MERGED
2005/08/26 15:31:12 kso 1.2.300.1: #i53834# - pass bootstrap vars to javaldx.
2005-11-11 11:29:10 +00:00
Rüdiger Timm
c78a5da7c4 INTEGRATION: CWS c06 (1.17.50); FILE MERGED
2005/09/22 07:56:01 kso 1.17.50.2: #i53834# - bootsrap params must too be passed to office on restart after crash.
2005/08/26 15:31:11 kso 1.17.50.1: #i53834# - pass bootstrap vars to javaldx.
2005-11-11 11:28:45 +00:00
Rüdiger Timm
ef49c27b33 INTEGRATION: CWS c06 (1.7.24); FILE MERGED
2005/08/26 16:23:13 kso 1.7.24.1: #i53834# - corrected dependencies for $(MISC)/so/soffice.sh
2005-11-11 11:28:31 +00:00
Rüdiger Timm
34cfa50eaa INTEGRATION: CWS ooo19126 (1.2.306); FILE MERGED
2005/09/05 17:50:14 rt 1.2.306.1: #i54170# Change license header: remove SISSL
2005-09-08 16:03:21 +00:00
Rüdiger Timm
ed34adc067 INTEGRATION: CWS ooo19126 (1.17.56); FILE MERGED
2005/09/05 17:50:14 rt 1.17.56.1: #i54170# Change license header: remove SISSL
2005-09-08 16:02:48 +00:00
Rüdiger Timm
0116ec2ca9 INTEGRATION: CWS ooo19126 (1.7.32); FILE MERGED
2005/09/05 17:50:14 rt 1.7.32.1: #i54170# Change license header: remove SISSL
2005-09-08 16:02:32 +00:00
Oliver Bolte
40fe03ddb6 INTEGRATION: CWS leansofficesh (1.6.188); FILE MERGED
2005/07/18 07:17:40 fs 1.6.188.2: change requested by reviewer (OBR): use 'tr' to strip windows lineends, in case somebody checks in the file on the wrong platform
2005/07/14 13:14:21 fs 1.6.188.1: #i51935# for SO, use a lean version of soffice.sh
2005-07-20 09:04:01 +00:00
Oliver Bolte
74d0de06ff INTEGRATION: CWS macosx08 (1.16.18); FILE MERGED
2005/05/22 22:06:14 ericb 1.16.18.1: fix bad test in soffice.sh
2005-06-15 07:16:47 +00:00
Oliver Bolte
c2af566bdf #i10000# syntax error 2005-05-12 06:55:53 +00:00
Rüdiger Timm
a8673a4aec INTEGRATION: CWS linuxppc02 (1.14.34); FILE MERGED
2005/05/03 20:02:11 ericb 1.14.34.1: i48654 JIC_PROCESSOR_TYPE numberis needed with IBMjre142
2005-05-11 10:32:48 +00:00
Rüdiger Timm
1740375bd3 INTEGRATION: CWS systemmozilla (1.13.64); FILE MERGED
2005/02/07 20:42:35 rene 1.13.64.1: #i17187# use system mozilla ... (patch)

try to find libnss3 from the system and set the library path accordingly.
based on patch from pmladek@suse.cz
2005-03-30 10:43:16 +00:00
Jens-Heiner Rechtien
56b8328c79 INTEGRATION: CWS sysint1 (1.4.30); FILE MERGED
2004/11/18 10:05:26 obr 1.4.30.1: removed all scripts containing slot id's
2004-11-26 21:33:04 +00:00
Rüdiger Timm
ea46fe64c6 INTEGRATION: CWS recovery04 (1.11.32); FILE MERGED
2004/10/07 15:40:06 hro 1.11.32.1: #i33798# Shell script modified to check for office exit code
2004-11-26 13:48:50 +00:00
Oliver Bolte
fc5a77f10c INTEGRATION: CWS nativefixer1 (1.11.76); FILE MERGED
2004/11/03 09:24:37 obr 1.11.76.1: #i36463# patch applied
2004-11-18 08:04:38 +00:00
Oliver Bolte
498f5e1b1d INTEGRATION: CWS nativefixer1 (1.1.2); FILE ADDED
2004/10/28 15:17:09 hro 1.1.2.1: #i30597# Added script to start base app
2004-11-18 08:04:24 +00:00