CWS-TOOLING: integrate CWS sb107

2009-04-14 13:09:13 +0200 sb  r270758 : CWS-TOOLING: rebase CWS sb107 to trunk@270723 (milestone: DEV300:m46)
2009-04-06 14:11:54 +0200 sb  r270545 : #i100884# improve pagein effectiveness: wrap system libs in --as-needed on unxlngi6/unxlngx6 to avoid needing them where unneeded; link pagein as C program to avoid unneeded C++ runtime dependency; reorder pagein and javaldx in soffice startup script so that javaldx benefits from pagein
2009-03-31 16:40:23 +0200 sb  r270287 : decrease collisions in hashCode computation
2009-03-30 11:48:39 +0200 sb  r270207 : #i100668# corrected explicit template instantiation
2009-03-26 14:16:26 +0100 sb  r270078 : #i100408# inadvertently dropped libexslt dynamic library in previous rev 269789
2009-03-26 10:52:51 +0100 sb  r270058 : #i100576# fixed erroneous modification of RPM in previous rev 270057
2009-03-26 10:46:36 +0100 sb  r270057 : #i100576# Enable HAVE_LD_HASH_STYLE in sdev300.ini for unxlgni6 and unxlngx6; corrected unxlngx6.mk so that HAVE_LD_HASH_STYLE actually has an effect on ultimate LINKFLAGS value.
2009-03-25 16:53:39 +0100 sb  r270038 : #i85679# applied speed-symbolic-functions.diff provided by pmladek; re-ran autoconf; enabled HAVE_LD_BSYMBOLIC_FUNCTIONS for unxlngi6 and unxlngx6 in sdev300.ini
2009-03-25 15:29:12 +0100 sb  r270031 : #i100408# missing fixes in addition to -c 269789 (to actually only put single instances of certain libraries into installation sets)
2009-03-25 15:17:10 +0100 sb  r270029 : #i10084# revert masterfix additions of libraries to APPnSTDLIBs (during -r269000:269199) and instead use -rpath-link to avoid linker warnings on unxlngi6 and unxlngx6
2009-03-25 14:15:23 +0100 sb  r270023 : added svn:ignore
2009-03-25 10:25:08 +0100 sb  r270002 : #i10000# copied over trunk -c 269820
2009-03-23 10:16:00 +0100 sb  r269858 : CWS-TOOLING: rebase CWS sb107 to trunk@269781 (milestone: DEV300:m44)
2009-03-20 11:22:27 +0100 sb  r269789 : #i100408# reduce (multiple copies of) libraries delivered to solver; for that to work fine, deliver symlink feature got improved to only create a symlink if the original file exists
2009-03-20 09:21:32 +0100 sb  r269782 : #i100396# replace s(HTML|RTF)_xxx declarations with OOO_STRING_SVTOOLS_(HTML|RTF)_xxx macros to reduce symbolic relocations at load time (at least on ELF systems).
2009-03-19 11:34:56 +0100 sb  r269734 : #i100348# added VISIBILITY_HIDDEN=TRUE so that symbols from the resulting archive are not erroneously exported from dynamic libraries including the archive
2009-03-19 11:32:20 +0100 sb  r269733 : #i100348# as a prerequisite for following changes, brought jpeg-6b.patch into "dmake create_patch" format and removed application/octet-stream svn:mime-type
2009-03-12 10:39:08 +0100 sb  r269370 : duplicated cws/odfmetadata2/solenv/inc/target.mk -c 268831
2009-03-04 17:25:16 +0100 sb  r268849 : #i99880# missing AUGMENT_LIBRARY_PATH
2009-02-25 17:54:34 +0100 sb  r268459 : CWS-TOOLING: rebase CWS sb107 to trunk@268395 (milestone: DEV300:m42)
2009-02-25 09:23:15 +0100 sb  r268413 : #i99584# avoid undefined operations on nOffset (patch by cmc)
2009-02-23 10:02:25 +0100 sb  r268344 : #i99519 removed unnecessary library dependencies
2009-02-18 17:54:24 +0100 sb  r268250 : avoid warnings about format specifier and argument mismatch (on 64bit debug builds)
2009-02-18 17:50:34 +0100 sb  r268249 : avoid erroneous warning that control reaches end of non-void function
2009-02-18 17:33:53 +0100 sb  r268248 : sdext/source/pdfimport/misc/pdfihelper.cxx: #include <vcl/canvastools.hxx>

1 files changed, 25 insertions, 28 deletions

diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 447c65866ea9..7895d3ed1cd9 100644
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -73,6 +73,31 @@ do
   esac
 done
 
+# pagein
+sd_pagein_args=@pagein-common
+for sd_arg in "$@"; do
+    case ${sd_arg} in
+    -calc)
+        sd_pagein_args="${sd_pagein_args} @pagein-calc"
+        break;
+        ;;
+    -draw)
+        sd_pagein_args="${sd_pagein_args} @pagein-draw"
+        break;
+        ;;
+    -impress)
+        sd_pagein_args="${sd_pagein_args} @pagein-impress"
+        break;
+        ;;
+    -writer)
+        sd_pagein_args="${sd_pagein_args} @pagein-writer"
+        break;
+        ;;
+    esac
+done
+"$sd_prog/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
+    ${sd_pagein_args}
+
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
 if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
     my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
@@ -91,39 +116,11 @@ unset XENVIRONMENT
 # uncomment line below if you encounter problems starting soffice on your system
 # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
 
-# 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
-
 # 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/../basis-link/program/pagein" -L"$sd_prog/../basis-link/program" \
-    ${sd_pagein_args}
-
 # Set PATH so that crash_report is found:
 PATH=$sd_prog${PATH+:$PATH}
 export PATH