diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-06-11 16:46:12 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-06-11 16:46:12 +0000 |
| commit | 0bcba65133b9671eba1bd5d74736f02fbffe9eaf (patch) | |
| tree | e4cdd9ba645887e8fe38bfd18444ec26621ebb90 /desktop | |
| parent | 5cc7134dd696285cb0963985c5b52ee955c790fd (diff) | |
INTEGRATION: CWS networker3 (1.9.60); FILE MERGED
2004/06/08 13:28:10 obr 1.9.60.3: #i29425# solaris /bin/sh does not know source
2004/05/24 14:11:04 obr 1.9.60.2: #i29425# source adabasrc file
2004/05/24 14:02:51 obr 1.9.60.1: #i29425# file locking now enabled by default
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/scripts/soffice.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index b88d152c90..388e80a1c1 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -60,10 +60,9 @@ # export STAR_PROFILE_LOCKING_DISABLED # -# -# SAL_ENABLE_FILE_LOCKING=1 -# export SAL_ENABLE_FILE_LOCKING -# +# file locking now enabled by default +SAL_ENABLE_FILE_LOCKING=1 +export SAL_ENABLE_FILE_LOCKING # set -x @@ -206,6 +205,11 @@ for sd_arg in ${1+"$@"} ; do esac done +# read database entries for Adabas D +if [ -f /etc/adabasrc ]; then + . /etc/adabasrc +fi + sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common" "${sd_prog}"/pagein -L"${sd_prog}" ${sd_pagein_args} |