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>

13 files changed, 18 insertions, 23 deletions

diff --git a/codemaker/source/cppumaker/makefile.mk b/codemaker/source/cppumaker/makefile.mk
index d1b1fe1ec..d349e7f28 100644
--- a/codemaker/source/cppumaker/makefile.mk
+++ b/codemaker/source/cppumaker/makefile.mk
@@ -64,6 +64,6 @@ APP1RPATH=SDK
 APP1OBJS=   $(OBJFILES)
 
 APP1DEPN= $(OUT)$/lib$/$(CODEMAKERLIBDEPN) $(OUT)$/lib$/$(COMMONCPPLIBDEPN)
-APP1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(STORELIB) $(CODEMAKERLIBST) $(COMMONCPPLIBST)
+APP1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CODEMAKERLIBST) $(COMMONCPPLIBST)
 
 .INCLUDE :  target.mk
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst
index f019d78ad..3355b6dc2 100644
--- a/cppu/prj/d.lst
+++ b/cppu/prj/d.lst
@@ -59,7 +59,7 @@ mkdir: %_DEST%\inc%_EXT%\uno
 
 ..\%__SRC%\lib\ipurpenvhelper*        %_DEST%\lib%_EXT%\*
 ..\%__SRC%\bin\purpe*.dll     %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\libuno_purpenvhelper*  %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib%_EXT%\*
 
 ..\%__SRC%\bin\unsafe_u*.dll    %_DEST%\bin%_EXT%\*
 ..\%__SRC%\lib\libunsafe_uno_uno.*    %_DEST%\lib%_EXT%\*
@@ -68,3 +68,4 @@ mkdir: %_DEST%\inc%_EXT%\uno
 ..\%__SRC%\lib\libaffine_uno_uno.*   %_DEST%\lib%_EXT%\*
 
 linklib: libuno_cppu.*.*
+linklib: libuno_purpenvhelper*.*.*
diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk
index cc18523b9..dc06e9284 100644
--- a/cppu/util/extra.mk
+++ b/cppu/util/extra.mk
@@ -46,7 +46,7 @@ USE_DEFFILE      :=TRUE
 
 SHL3TARGET  := unsafe_uno_uno
 SHL3IMPLIB  := i$(SHL3TARGET)
-SHL3STDLIBS := $(purpenv_helper_LIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) 
+SHL3STDLIBS := $(purpenv_helper_LIB) $(SALLIB) 
 SHL3OBJS    := $(SLO)$/UnsafeBridge.obj
 .IF "$(GUI)"=="OS2"
 SHL3VERSIONMAP=unsafe_os2.map
@@ -60,7 +60,7 @@ SHL3RPATH   := URELIB
 
 SHL4TARGET  := affine_uno_uno
 SHL4IMPLIB  := i$(SHL4TARGET)
-SHL4STDLIBS := $(purpenv_helper_LIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB) 
+SHL4STDLIBS := $(purpenv_helper_LIB) $(SALLIB) 
 SHL4OBJS    := $(SLO)$/AffineBridge.obj
 .IF "$(GUI)"=="OS2"
 SHL4VERSIONMAP=unsafe_os2.map
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk
index 826463931..d9c80645d 100644
--- a/cppu/util/makefile.mk
+++ b/cppu/util/makefile.mk
@@ -60,7 +60,7 @@ SHL1TARGET=$(TARGET)$(UDK_MAJOR)
 SHL1TARGET= uno_$(TARGET)
 .ENDIF
 
-SHL1STDLIBS = $(SALLIB) $(SALHELPERLIB)
+SHL1STDLIBS = $(SALLIB)
 
 SHL1DEPN=
 SHL1IMPLIB=i$(TARGET)
@@ -85,7 +85,7 @@ SHL2VERSIONMAP:=$(SHL2TARGET).map
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 SHL2DEF     := $(MISC)$/$(SHL2TARGET).def
 SHL2IMPLIB  := i$(SHL2TARGET)
-SHL2STDLIBS := $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
+SHL2STDLIBS := $(CPPULIB) $(SALLIB)
 SHL2RPATH   := URELIB
 SHL2OBJS    := \
     $(SLO)$/helper_purpenv_Environment.obj 	\
diff --git a/idlc/source/makefile.mk b/idlc/source/makefile.mk
index 51e1d479b..5f7b1d12a 100644
--- a/idlc/source/makefile.mk
+++ b/idlc/source/makefile.mk
@@ -109,7 +109,6 @@ APP1OBJS=   $(OBJFILES)
 APP1RPATH=SDK
 
 APP1STDLIBS = \
-    $(STORELIB)\
     $(REGLIB) \
     $(SALLIB) \
     $(SALHELPERLIB)
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
index ef38000bb..29aa95854 100755
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk
@@ -52,7 +52,7 @@ OBJFILES=$(OBJ)$/javaldx.obj
 
 APP1TARGET=javaldx
 APP1OBJS=$(OBJFILES)
-APP1STDLIBS=$(SALLIB) $(CPPULIB) $(CPPUHELPERLIB) $(JVMFWKLIB) $(LIBSTLPORT) $(SALHELPERLIB)
+APP1STDLIBS=$(SALLIB) $(JVMFWKLIB)
 APP1RPATH=UREBIN
 
 .ENDIF
diff --git a/jvmfwk/source/makefile.mk b/jvmfwk/source/makefile.mk
index 876d13db9..5b62608a0 100644
--- a/jvmfwk/source/makefile.mk
+++ b/jvmfwk/source/makefile.mk
@@ -67,7 +67,7 @@ SHL1TARGET = $(FRAMEWORKLIB)
 SHL1DEPN=
 SHL1IMPLIB = i$(FRAMEWORKLIB)
 SHL1LIBS = $(SLB)$/$(TARGET).lib
-SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(SALHELPERLIB) $(LIBXML2LIB) $(LIBSTLPORT)
+SHL1STDLIBS = $(CPPUHELPERLIB) $(SALLIB) $(LIBXML2LIB)
 SHL1RPATH = URELIB
 
 .IF "$(OS)" == "WNT"
diff --git a/rdbmaker/source/rdbmaker/makefile.mk b/rdbmaker/source/rdbmaker/makefile.mk
index 03225a6ee..8d29743a5 100644
--- a/rdbmaker/source/rdbmaker/makefile.mk
+++ b/rdbmaker/source/rdbmaker/makefile.mk
@@ -53,7 +53,6 @@ APP1TARGET= $(TARGET)
 APP1OBJS=   $(OBJFILES)
 
 APP1STDLIBS=\
-            $(STORELIB)\
             $(SALLIB) \
             $(SALHELPERLIB) \
             $(REGLIB) \
diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk
index a97a47a99..e4cd82e86 100644
--- a/registry/tools/makefile.mk
+++ b/registry/tools/makefile.mk
@@ -51,9 +51,7 @@ APP1OBJS=   $(OBJ)$/regmerge.obj
 APP1RPATH=  UREBIN
 
 APP1STDLIBS=\
-            $(STORELIB)\
             $(SALLIB) \
-            $(SALHELPERLIB) \
             $(REGLIB)
 
 APP2TARGET= regview
@@ -61,9 +59,7 @@ APP2OBJS=   $(OBJ)$/regview.obj
 APP2RPATH=  UREBIN
 
 APP2STDLIBS=\
-            $(STORELIB)\
             $(SALLIB) \
-            $(SALHELPERLIB) \
             $(REGLIB)
 
 APP3TARGET= regcompare
@@ -71,7 +67,6 @@ APP3OBJS=   $(OBJ)$/regcompare.obj
 APP3RPATH=  SDK
 
 APP3STDLIBS=\
-            $(STORELIB)\
             $(SALLIB) \
             $(SALHELPERLIB) \
             $(REGLIB)
@@ -80,7 +75,6 @@ APP4TARGET= checksingleton
 APP4OBJS=   $(OBJ)$/checksingleton.obj
 
 APP4STDLIBS=\
-            $(STORELIB)\
             $(SALLIB) \
             $(SALHELPERLIB) \
             $(REGLIB)
diff --git a/registry/util/makefile.mk b/registry/util/makefile.mk
index 09590a3a1..449617871 100644
--- a/registry/util/makefile.mk
+++ b/registry/util/makefile.mk
@@ -60,7 +60,6 @@ SHL1TARGET= $(TARGET)
 SHL1IMPLIB= ireg
 SHL1STDLIBS= \
     $(SALLIB) \
-    $(SALHELPERLIB) \
     $(STORELIB)
 
 SHL1VERSIONMAP=	$(TARGET).map
diff --git a/sal/prj/d.lst b/sal/prj/d.lst
index 7ba02fb47..bcd9c0e2c 100644
--- a/sal/prj/d.lst
+++ b/sal/prj/d.lst
@@ -14,10 +14,13 @@ mkdir: %_DEST%\inc%_EXT%\systools\win32
 ..\inc\systools\win32\*.h %_DEST%\inc%_EXT%\systools\win32\*.h
 ..\inc\systools\win32\*.hxx %_DEST%\inc%_EXT%\systools\win32\*.hxx
 
-..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\libsalalloc_malloc.so.3 %_DEST%\lib%_EXT%\libsalalloc_malloc.so.3
+symlink: %_DEST%\lib%_EXT%\libsalalloc_malloc.so.3 %_DEST%\lib%_EXT%\libsalalloc_malloc.so
+..\%__SRC%\lib\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so.3
+symlink: %_DEST%\lib%_EXT%\libuno_sal.so.3 %_DEST%\lib%_EXT%\libuno_sal.so
+..\%__SRC%\lib\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib.3
+symlink: %_DEST%\lib%_EXT%\libuno_sal.dylib.3 %_DEST%\lib%_EXT%\libuno_sal.dylib
 ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.dylib.* %_DEST%\lib%_EXT%\*.dylib.*
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 
 ..\%__SRC%\slb\sal.lib %_DEST%\lib%_EXT%\xsal.lib
diff --git a/sal/rtl/source/strtmpl.c b/sal/rtl/source/strtmpl.c
index 1fb64e507..e01f935bd 100644
--- a/sal/rtl/source/strtmpl.c
+++ b/sal/rtl/source/strtmpl.c
@@ -276,7 +276,7 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( hashCode_WithLength )( const IMPL_RTL_STRCO
 {
     sal_Int32 h = nLen;
 
-    if ( nLen < 16 )
+    if ( nLen < 256 )
     {
         while ( nLen > 0 )
         {
diff --git a/sal/textenc/convertiso2022cn.c b/sal/textenc/convertiso2022cn.c
index 3316a1538..6ce7c63bf 100644
--- a/sal/textenc/convertiso2022cn.c
+++ b/sal/textenc/convertiso2022cn.c
@@ -484,8 +484,8 @@ ImplIso2022CnTranslateTo116431(sal_uInt8 const * pCns116431992Data,
     nPlane = pCns116431992Data[nOffset++];
     if (nPlane != 1)
         return 0;
-    return (0x20 + pCns116431992Data[nOffset++]) << 8
-               | (0x20 + pCns116431992Data[nOffset]);
+    return (0x20 + pCns116431992Data[nOffset]) << 8
+               | (0x20 + pCns116431992Data[nOffset + 1]);
 }
 
 sal_Size ImplConvertUnicodeToIso2022Cn(ImplTextConverterData const * pData,