jl154 merging with OOO300_m1

cli_ure/version/version.txt

@@ -25,23 +25,23 @@
 #
 #*************************************************************************
 
-CLI_URETYPES_NEW_VERSION=1.0.6.0
-CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.5.0
-CLI_URETYPES_POLICY_VERSION=6.0.0.0	
+CLI_URETYPES_NEW_VERSION=1.0.7.0
+CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.6.0
+CLI_URETYPES_POLICY_VERSION=7.0.0.0	
 CLI_URETYPES_POLICY_ASSEMBLY=policy.1.0.cli_uretypes
 
-CLI_BASETYPES_NEW_VERSION=1.0.17.0
-CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.16.0
-CLI_BASETYPES_POLICY_VERSION=17.0.0.0
+CLI_BASETYPES_NEW_VERSION=1.0.18.0
+CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.17.0
+CLI_BASETYPES_POLICY_VERSION=18.0.0.0
 CLI_BASETYPES_POLICY_ASSEMBLY=policy.1.0.cli_basetypes
 
-CLI_URE_NEW_VERSION=1.0.20.0
-CLI_URE_OLD_VERSION=1.0.0.0-1.0.19.0    
-CLI_URE_POLICY_VERSION=20.0.0.0
+CLI_URE_NEW_VERSION=1.0.21.0
+CLI_URE_OLD_VERSION=1.0.0.0-1.0.20.0    
+CLI_URE_POLICY_VERSION=21.0.0.0
 CLI_URE_POLICY_ASSEMBLY=policy.1.0.cli_ure
 
-CLI_CPPUHELPER_NEW_VERSION=1.0.20.0
-CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.19.0
-CLI_CPPUHELPER_POLICY_VERSION=20.0.0.0
+CLI_CPPUHELPER_NEW_VERSION=1.0.21.0
+CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.20.0
+CLI_CPPUHELPER_POLICY_VERSION=21.0.0.0
 CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper
-
+ 

offapi/type_reference/typelibrary_history.txt

@@ -154,3 +154,7 @@
   Update reference type library with the version of OOo 3.2. The new
   reference type library is taken from the release source tree OOO320 m12.
 
+02/06/10 (JSC): TaskID=i112019
+  Update reference type library with the version of OOo 3.2.1. The new
+  reference type library is taken from the release source tree OOO320 m19.
+

sal/rtl/source/makefile.mk

@@ -46,7 +46,7 @@ TARGETTYPE=CUI
 
 .INCLUDE :  settings.mk
 
-.IF "$(ALLOC)" == "SYS_ALLOC" || "$(ALLOC)" == "TCMALLOC"
+.IF "$(ALLOC)" == "SYS_ALLOC" || "$(ALLOC)" == "TCMALLOC" || "$(ALLOC)" == "JEMALLOC"
 CDEFS+= -DFORCE_SYSALLOC
 .ENDIF
 

unoil/climaker/version.txt

@@ -25,8 +25,8 @@
 #
 #*************************************************************************
 
-CLI_OOOTYPES_NEW_VERSION=1.0.6.0
-CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.5.0
-CLI_OOOTYPES_POLICY_VERSION=6.0.0.0	
+CLI_OOOTYPES_NEW_VERSION=1.0.7.0
+CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.6.0
+CLI_OOOTYPES_POLICY_VERSION=7.0.0.0	
 CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes