From d71f3f23d9125e3d42461b3d66c9735386ccca4f Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 4 Jun 2003 09:42:53 +0000 Subject: [PATCH] INTEGRATION: CWS tune02 (1.3.36); FILE MERGED 2003/05/31 17:50:19 mhu 1.3.36.1: #109657# Added 'pagein' of shared libraries needed at startup. --- desktop/scripts/soffice.sh | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index fb7e88eedd04..f89f653947bd 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -162,13 +162,12 @@ THREADS_TYPE=native_threads # misc. environment variables OPENOFFICE_MOZILLA_FIVE_HOME="$sd_inst/program" +export OPENOFFICE_MOZILLA_FIVE_HOME unset XENVIRONMENT -export OPENOFFICE_MOZILLA_FIVE_HOME - # uncomment line below to disable anti aliasing of fonts -#SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE +# SAL_ANTIALIAS_DISABLE=true; export SAL_ANTIALIAS_DISABLE # error message function err () { @@ -179,7 +178,6 @@ err () { # # parse command line arguments # - plugin_mode=false for DUMMY in ${1+"$@"} do @@ -223,6 +221,33 @@ if [ "X${SO_REMOTE_START}" = "Xrsh" ]; then fi fi +# pagein +for sd_arg in ${1+"$@"} ; do + case ${sd_arg} in + -calc) + sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-calc" + break; + ;; + -draw) + sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-draw" + break; + ;; + -impress) + sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-impress" + break; + ;; + -writer) + sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-writer" + break; + ;; + *) + ;; + esac +done + +sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-common" +${sd_prog}/pagein -L${sd_prog} ${sd_pagein_args} + # set path so that other apps can be started from soffice just by name PATH="$sd_prog":$PATH export PATH