DEV300: merge masterfix ea9085d6db4c@DEV300

83 files changed, 490 insertions, 471 deletions

diff --git a/UnoControls/util/exports.map b/UnoControls/util/exports.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/UnoControls/util/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/UnoControls/util/makefile.mk b/UnoControls/util/makefile.mk
index 5cd23262a481..aacddb23c0ad 100644
--- a/UnoControls/util/makefile.mk
+++ b/UnoControls/util/makefile.mk
@@ -44,7 +44,7 @@ LIB1FILES=	$(SLB)$/base.lib	\
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB= i$(TARGET)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
index f99b19cd6590..0d98760a31df 100755
--- a/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
+++ b/accessibility/bridge/org/openoffice/java/accessibility/makefile.mk
@@ -102,7 +102,6 @@ PRODUCTSWITCH = false
 DEBUGSWITCH = true
 .ENDIF
 
-.IF "$(GUI)"=="UNX" || "$(USE_SHELL)" != "4nt"
 $(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
     @@-$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE)
     @-echo package org.openoffice.java.accessibility\; > $@
@@ -110,16 +109,6 @@ $(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
     @-echo public static final boolean DEBUG = $(DEBUGSWITCH)\; >> $@
     @-echo public static final boolean PRODUCT = $(PRODUCTSWITCH)\; >> $@
     @-echo } >> $@
-.ELSE
-$(JAVADIR)$/$(PACKAGE)$/%.java: makefile.mk
-    @@-$(MKDIRHIER) $(JAVADIR)$/$(PACKAGE)
-    @-echo package org.openoffice.java.accessibility; > $@
-    @-echo public class Build { >> $@
-    @-echo public static final boolean DEBUG = $(DEBUGSWITCH); >> $@
-    @-echo public static final boolean PRODUCT = $(PRODUCTSWITCH); >> $@
-    @-echo } >> $@
-.ENDIF
-
 
 $(CLASSDIR)$/$(PACKAGE)$/Build.class : $(JAVADIR)$/$(PACKAGE)$/Build.java
     -$(JAVAC) -d $(CLASSDIR) $(JAVADIR)$/$(PACKAGE)$/Build.java
diff --git a/accessibility/util/acc.map b/accessibility/util/acc.map
index 5678c95e71fd..b9e53f414df5 100644
--- a/accessibility/util/acc.map
+++ b/accessibility/util/acc.map
@@ -1,4 +1,4 @@
-FORMS_1_0 {
+UDK_3_0_0 {
     global:
         getStandardAccessibleFactory;
         getSvtAccessibilityComponentFactory;
diff --git a/automation/source/testtool/filter.pl b/automation/source/testtool/filter.pl
index 79b7add5c5b3..8f45073b0934 100644
--- a/automation/source/testtool/filter.pl
+++ b/automation/source/testtool/filter.pl
@@ -71,28 +71,13 @@ sub read_block {
   print "Leaving read_block at the end\n" if $debug;
 }
 
-sub convert_path {
-
-  $_ = $_[0];
-  $GUI = $ENV {"GUI"};
-  $use_shell = $ENV {"USE_SHELL"};
-  if ( $GUI eq "WNT" )
-  {
-    if ( defined( $use_shell ) && "$use_shell" eq "4nt" )
-    {
-      s/\//\\/g;
-    }
-  }
-  $_;
-}
-
 # Read a file.
 # first parameter ist the filename
 sub read_file {
 
   local ($filename,$file) = @_;
   $file++;                           # String increment
-  local $TempFileName = &convert_path( $basename."/".$filename );
+  local $TempFileName = $basename."/".$filename;
   print "reading file $TempFileName as $file\n" if $debug;
   open($file, $TempFileName) || die "error: Could not open file $TempFileName. ";
 
@@ -103,9 +88,6 @@ sub read_file {
 
 # main starts here
 
-print &convert_path ("/\n\n\n") if ( $debug );
-
-
 $basename = ".";
 $basename = $ARGV[0] if defined($ARGV[0]);
 
diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk
index 962f9d6e2694..db8464130c1b 100644
--- a/automation/source/testtool/makefile.mk
+++ b/automation/source/testtool/makefile.mk
@@ -87,13 +87,8 @@ $(INCCOM)$/res_type.hxx : $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/tools$/
 
 
 $(MISC)$/xfilter.pl : filter.pl
-.IF "$(GUI)" == "UNX" || "$(USE_SHELL)"!="4nt"
        tr  -d "\015" < filter.pl > $(MISC)$/xfilter.pl
        chmod 664 $(MISC)$/xfilter.pl
-.ELSE
-       $(COPY) filter.pl $(MISC)$/xfilter.pl
-       attrib  -r $(MISC)$/xfilter.pl
-.ENDIF
 
 
 
diff --git a/basctl/source/basicide/baside4.cxx b/basctl/source/basicide/baside4.cxx
deleted file mode 100644
index c080427ee013..000000000000
--- a/basctl/source/basicide/baside4.cxx
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_basctl.hxx"
-
-
diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk
index 6a08349b0979..62c4755112d1 100644
--- a/basctl/source/basicide/makefile.mk
+++ b/basctl/source/basicide/makefile.mk
@@ -90,11 +90,7 @@ $(INCCOM)$/dllname.hxx: makefile.mk
     $(RM) $@
         echo \#define DLL_NAME \"libbasctl$(DLLPOSTFIX)$(DLLPOST)\" >$@
 .ELSE
-.IF "$(USE_SHELL)"!="4nt"
         echo \#define DLL_NAME \"basctl$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE          # "$(USE_SHELL)"!="4nt"
-        echo #define DLL_NAME "basctl$(DLLPOSTFIX)$(DLLPOST)" >$@
-.ENDIF          # "$(USE_SHELL)"!="4nt"
 .ENDIF
 
 $(SLO)$/basiclib.obj : $(INCCOM)$/dllname.hxx
diff --git a/basctl/util/basctl.map b/basctl/util/basctl.map
index 6b132e93cc3d..80359606ccc8 100755
--- a/basctl/util/basctl.map
+++ b/basctl/util/basctl.map
@@ -1,4 +1,4 @@
-BASCTL_1.0 {
+UDK_3_0_0 {
     global:
         basicide_choose_macro;
         basicide_macro_organizer;
diff --git a/crashrep/source/all/crashrep.ulf b/crashrep/source/all/crashrep.ulf
index 4bc69015cb1d..2de1753918d2 100644
--- a/crashrep/source/all/crashrep.ulf
+++ b/crashrep/source/all/crashrep.ulf
@@ -7,7 +7,7 @@ en-US = "Welcome to the %PRODUCTNAME% %PRODUCTVERSION% Error Report"
 
 
 [%WELCOME_BODY1%]
-en-US = "This error report tool gathers information about how %PRODUCTNAME% is working and sends it to Sun Microsystems to help improve future versions.\n\n"
+en-US = "This error report tool gathers information about how %PRODUCTNAME% is working and sends it to Oracle to help improve future versions.\n\n"
 
 
 [%WELCOME_BODY2%]
@@ -15,11 +15,11 @@ en-US = "It's easy - just send the report without any further effort on your par
 
 
 [%WELCOME_BODY3%]
-en-US = "Customer Privacy\nThe information gathered is limited to data concerning the state of %PRODUCTNAME% %PRODUCTVERSION% when the error occurred. Other information about passwords or document contents is not collected.\n\nThe information will only be used to improve the quality of %PRODUCTNAME% and will not be shared with third parties.\nFor more information on Sun Microsystems' privacy policy, visit\n"
+en-US = "Customer Privacy\nThe information gathered is limited to data concerning the state of %PRODUCTNAME% %PRODUCTVERSION% when the error occurred. Other information about passwords or document contents is not collected.\n\nThe information will only be used to improve the quality of %PRODUCTNAME% and will not be shared with third parties.\nFor more information on Oracle's privacy policy, visit\n"
 
 
 [%PRIVACY_URL%]
-en-US = "http://www.sun.com/privacy/"
+en-US = "http://www.oracle.com/html/services-privacy-policy.html"
 
 
 [%NEXT_BUTTON%]
@@ -43,7 +43,7 @@ en-US = "An error occurred while running %PRODUCTNAME% %PRODUCTVERSION%"
 
 
 [%REPORT_BODY%]
-en-US = "The %PRODUCTNAME% %PRODUCTVERSION% Error Report has gathered information that could help Sun Microsystems improve %PRODUCTNAME%.\nIn the spaces below, you can enter a title for your crash report and describe the action you were trying to carry out when the error occurred. Then click 'Send'.\n"
+en-US = "The %PRODUCTNAME% %PRODUCTVERSION% Error Report has gathered information that could help Oracle improve %PRODUCTNAME%.\nIn the spaces below, you can enter a title for your crash report and describe the action you were trying to carry out when the error occurred. Then click 'Send'.\n"
 
 
 [%ENTER_TITLE%]
@@ -51,7 +51,7 @@ en-US = "Which type of document (e.g. presentation) were you using when the erro
 
 
 [%ALLOW_CONTACT%]
-en-US = "~I allow Sun Microsystems to contact me regarding this report."
+en-US = "~I allow Oracle to contact me regarding this report."
 
 
 [%ENTER_EMAIL%]
@@ -156,7 +156,7 @@ en-US = "Status: The error report has been sent successfully."
 
 
 [%ERROR_MSG_NOEMAILADDRESS%]
-en-US = "You have marked the option 'I allow Sun Microsystems to contact me regarding this report.'\nPlease enter your e-mail address."
+en-US = "You have marked the option 'I allow Oracle to contact me regarding this report.'\nPlease enter your e-mail address."
 
 
 [%MSG_CMDLINE_USAGE%]
diff --git a/cui/util/cui.map b/cui/util/cui.map
index b43a11bd5096..06074d301dc3 100644
--- a/cui/util/cui.map
+++ b/cui/util/cui.map
@@ -1,4 +1,4 @@
-CUI_1_0 {
+UDK_3_0_0 {
     global:
     CreateDialogFactory;
         GetSpecialCharsForEdit;
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index 1489e2a4e0e4..0885b3021c61 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -34,3 +34,4 @@ ex  extensions\source\update\feed               nmake   -   all ex_updchkfeed ex
 ex  extensions\source\update\check              nmake   -   all ex_updchk ex_inc NULL
 ex  extensions\source\update\ui                 nmake   -   all ex_updchkui ex_inc NULL
 ex  extensions\util                             nmake   -   all ex_util ex_preload ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil ex_oooimprovecore NULL
+ex extensions\qa\unoapi nmake - all ex_qa_unoapi NULL
diff --git a/extensions/qa/unoapi/Test.java b/extensions/qa/unoapi/Test.java
new file mode 100644
index 000000000000..c997cb9ded32
--- /dev/null
+++ b/extensions/qa/unoapi/Test.java
@@ -0,0 +1,50 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+package org.openoffice.extensions.qa.unoapi;
+
+import org.openoffice.Runner;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+public final class Test {
+    @org.junit.Before public void setUp() throws Exception {
+        connection.setUp();
+    }
+
+    @org.junit.After public void tearDown()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        connection.tearDown();
+    }
+
+    @org.junit.Test public void test() {
+        assertTrue(
+            Runner.run(
+                "-sce", "extensions.sce", "-cs", connection.getDescription()));
+    }
+
+    private final OfficeConnection connection = new OfficeConnection();
+}
diff --git a/extensions/qa/unoapi/makefile.mk b/extensions/qa/unoapi/makefile.mk
index fef18c6d2ded..a869a3c1013e 100644
--- a/extensions/qa/unoapi/makefile.mk
+++ b/extensions/qa/unoapi/makefile.mk
@@ -1,7 +1,6 @@
 #*************************************************************************
-#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -22,19 +21,28 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+#***********************************************************************/
 
-PRJ=..$/..
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-PRJNAME=extensions
-TARGET=qa_unoapi
+PRJ = ../..
+PRJNAME = extensions
+TARGET = qa_unoapi
 
-.INCLUDE: settings.mk
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = org/openoffice/extensions/qa/unoapi
+JAVATESTFILES = Test.java
+JAVAFILES = $(JAVATESTFILES)
+JARFILES = OOoRunner.jar ridl.jar test.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
 
+.INCLUDE: settings.mk
 .INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-ALLTAR : UNOAPI_TEST
+ALLTAR : javatest
 
-UNOAPI_TEST:
-    +$(SOLARENV)$/bin$/checkapi -sce $(PRJNAME).sce -THRCNT 1
+.END
diff --git a/extensions/source/abpilot/abp.map b/extensions/source/abpilot/abp.map
deleted file mode 100644
index 2b4747c38ff9..000000000000
--- a/extensions/source/abpilot/abp.map
+++ /dev/null
@@ -1,8 +0,0 @@
-EXTABP_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/extensions/source/abpilot/makefile.mk b/extensions/source/abpilot/makefile.mk
index c5b25fc733f7..19477e1b6b2b 100644
--- a/extensions/source/abpilot/makefile.mk
+++ b/extensions/source/abpilot/makefile.mk
@@ -76,7 +76,7 @@ RESLIB1IMAGES=$(PRJ)$/res
 RESLIB1SRSFILES= $(SRS)$/abp.srs
 
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1STDLIBS= \
         $(VCLLIB)			\
diff --git a/extensions/source/activex/main/makefile.mk b/extensions/source/activex/main/makefile.mk
index 53a54473ff49..e4770180886c 100644
--- a/extensions/source/activex/main/makefile.mk
+++ b/extensions/source/activex/main/makefile.mk
@@ -152,8 +152,4 @@ VERSIONOBJ_X64=
 $(MISC)$/envsettings.h : makefile.mk
     -$(RM) $@
 # it looks wrong; but rc likes it that way...
-.IF "$(USE_SHELL)"!="4nt"
     echo "#define MISC .\..\$(INPATH)\misc" > $@
-.ELSE			# "$(USE_SHELL)"!="4nt"
-    echo #define MISC .\..\$(INPATH)\misc > $@
-.ENDIF			# "$(USE_SHELL)"!="4nt"
diff --git a/extensions/source/bibliography/exports.map b/extensions/source/bibliography/exports.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/extensions/source/bibliography/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/extensions/source/bibliography/makefile.mk b/extensions/source/bibliography/makefile.mk
index efc1fbe222f3..f25dce11045b 100644
--- a/extensions/source/bibliography/makefile.mk
+++ b/extensions/source/bibliography/makefile.mk
@@ -82,7 +82,7 @@ SHL1LIBS=       $(SLB)$/$(TARGET).lib
 SHL1IMPLIB=		i$(TARGET)
 SHL1DEPN=		$(SHL1LIBS)
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 DEF1NAME=		$(SHL1TARGET)
 
 # --- Targets ------------------------------------------------------
diff --git a/extensions/source/dbpilots/dbp.map b/extensions/source/dbpilots/dbp.map
deleted file mode 100644
index 1fe77064bd27..000000000000
--- a/extensions/source/dbpilots/dbp.map
+++ /dev/null
@@ -1,8 +0,0 @@
-EXTDBP_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/extensions/source/dbpilots/makefile.mk b/extensions/source/dbpilots/makefile.mk
index 8ef5ebae82e8..b5831e5fda0f 100644
--- a/extensions/source/dbpilots/makefile.mk
+++ b/extensions/source/dbpilots/makefile.mk
@@ -76,7 +76,7 @@ RESLIB1NAME=dbp
 RESLIB1SRSFILES= $(SRS)$/dbp.srs
 
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1STDLIBS= \
         $(SVTOOLLIB) \
diff --git a/extensions/source/logging/log.map b/extensions/source/logging/log.map
deleted file mode 100644
index 0bb561b5b067..000000000000
--- a/extensions/source/logging/log.map
+++ /dev/null
@@ -1,8 +0,0 @@
-LOG_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/extensions/source/logging/makefile.mk b/extensions/source/logging/makefile.mk
index f3bfb2a4ea06..4a1fa9813cb0 100644
--- a/extensions/source/logging/makefile.mk
+++ b/extensions/source/logging/makefile.mk
@@ -68,7 +68,7 @@ SHL1STDLIBS= \
 SHL1LIBS=$(LIB1TARGET)
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- Targets ----------------------------------
 
diff --git a/extensions/source/oooimprovecore/makefile.mk b/extensions/source/oooimprovecore/makefile.mk
index 977098af8049..97e130c3a644 100644
--- a/extensions/source/oooimprovecore/makefile.mk
+++ b/extensions/source/oooimprovecore/makefile.mk
@@ -69,7 +69,7 @@ SHL1STDLIBS= \
 SHL1LIBS=$(LIB1TARGET)
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- Targets ----------------------------------
 
diff --git a/extensions/source/oooimprovecore/oooimprovecore.map b/extensions/source/oooimprovecore/oooimprovecore.map
deleted file mode 100644
index fe782c0d7737..000000000000
--- a/extensions/source/oooimprovecore/oooimprovecore.map
+++ /dev/null
@@ -1,8 +0,0 @@
-OOOIMPROVECORE_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/extensions/source/oooimprovement/makefile.mk b/extensions/source/oooimprovement/makefile.mk
index ba8ff01a8c0e..6e5d7ab0d6a2 100644
--- a/extensions/source/oooimprovement/makefile.mk
+++ b/extensions/source/oooimprovement/makefile.mk
@@ -73,7 +73,7 @@ SHL1TARGET= oooimp$(DLLPOSTFIX)
 SHL1LIBS= $(SLB)$/$(TARGET).lib
 SHL1DEF= $(MISC)$/$(SHL1TARGET).def
 DEF1NAME= $(SHL1TARGET)
-SHL1VERSIONMAP= oooimprovement.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 PACKAGEDIR=$(subst,.,$/ $(PACKAGE))
 SPOOLDIR=$(MISC)$/registry$/spool
diff --git a/extensions/source/oooimprovement/oooimprovement.map b/extensions/source/oooimprovement/oooimprovement.map
deleted file mode 100644
index de08e5708ea5..000000000000
--- a/extensions/source/oooimprovement/oooimprovement.map
+++ /dev/null
@@ -1,11 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
-
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 1be5f9f42a03..387de8cde24d 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -482,7 +482,9 @@ int main( int argc, char **argv)
 
     medDebug( 1, "left plugin app main loop\n" );
 
+    #ifdef ENABLE_GTK
     g_source_remove(xt_polling_timer_id);
+    #endif
 
     pNP_Shutdown();
     medDebug( 1, "NP_Shutdown done\n" );
diff --git a/extensions/source/plugin/util/exports.map b/extensions/source/plugin/util/exports.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/extensions/source/plugin/util/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/extensions/source/plugin/util/makefile.mk b/extensions/source/plugin/util/makefile.mk
index 659e8f3acaed..7a8c46c01769 100644
--- a/extensions/source/plugin/util/makefile.mk
+++ b/extensions/source/plugin/util/makefile.mk
@@ -67,7 +67,7 @@ SHL1OWNLIBS = \
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB= i$(TARGET)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/extensions/source/preload/makefile.mk b/extensions/source/preload/makefile.mk
index 4e4bab1bc71a..fb11a2bfd32c 100644
--- a/extensions/source/preload/makefile.mk
+++ b/extensions/source/preload/makefile.mk
@@ -57,7 +57,7 @@ RESLIB1IMAGES=$(PRJ)$/res
 RESLIB1SRSFILES= $(SRS)$/preload.srs
 
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1STDLIBS= \
         $(SFXLIB)   \
diff --git a/extensions/source/preload/preload.map b/extensions/source/preload/preload.map
deleted file mode 100644
index ff4971857d69..000000000000
--- a/extensions/source/preload/preload.map
+++ /dev/null
@@ -1,8 +0,0 @@
-EXTDBI_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/extensions/source/preload/preload.src b/extensions/source/preload/preload.src
index feea7249ce70..59805b768adf 100644
--- a/extensions/source/preload/preload.src
+++ b/extensions/source/preload/preload.src
@@ -86,10 +86,8 @@ TabPage RID_TP_WELCOME
         Text [ en-US ] = "Welcome to %PRODUCTNAME %PRODUCTVERSION OEM\n\nTo start the %PRODUCTNAME %PRODUCTVERSION OEM, "
         "please enter your personal data in the dialog following the license text. Important information is contained "
         "in the readme files which are located in the %PRODUCTNAME product directory. Please read these files carefully. "
-        "You can also find detailed information at the Sun website \n\n"
-        "http://www.sun.com/staroffice.\n\nSupport and Training:\n\nGet FREE software support valid for 60 days from date "
-        "of purchase. To take advantage of this offer, visit the website below.\n\n"
-        "http://www.sun.com/star/service\n\nWe hope you enjoy working with %PRODUCTNAME.";
+        "You can also find detailed information at the Oracle website \n\n"
+        "http://www.oracle.com/us/products/applications/open-office.";
     };
 };
 
diff --git a/extensions/source/propctrlr/makefile.mk b/extensions/source/propctrlr/makefile.mk
index 27255c9e5f46..c69f47bcef1a 100644
--- a/extensions/source/propctrlr/makefile.mk
+++ b/extensions/source/propctrlr/makefile.mk
@@ -113,7 +113,7 @@ RESLIB1IMAGES=$(PRJ)$/res
 RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs
 
 SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1STDLIBS= \
         $(EDITENGLIB)	\
diff --git a/extensions/source/propctrlr/pcr.map b/extensions/source/propctrlr/pcr.map
deleted file mode 100644
index 6794fcdf213e..000000000000
--- a/extensions/source/propctrlr/pcr.map
+++ /dev/null
@@ -1,8 +0,0 @@
-EXTPCR_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/extensions/source/resource/exports.map b/extensions/source/resource/exports.map
deleted file mode 100644
index 7c56baa9bd73..000000000000
--- a/extensions/source/resource/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GetVersionInfo;
-                component_getImplementationEnvironment;
-                component_getFactory;
-                component_writeInfo;
-
-        local:
-                *;
-};
diff --git a/extensions/source/resource/makefile.mk b/extensions/source/resource/makefile.mk
index 2502d8467f22..a89d690b7393 100644
--- a/extensions/source/resource/makefile.mk
+++ b/extensions/source/resource/makefile.mk
@@ -63,7 +63,7 @@ SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 DEF1NAME=		$(SHL1TARGET)
 DEF1EXPORTFILE=	exports.dxp
diff --git a/extensions/source/scanner/exports.map b/extensions/source/scanner/exports.map
deleted file mode 100644
index 7c56baa9bd73..000000000000
--- a/extensions/source/scanner/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-        global:
-                GetVersionInfo;
-                component_getImplementationEnvironment;
-                component_getFactory;
-                component_writeInfo;
-
-        local:
-                *;
-};
diff --git a/extensions/source/scanner/makefile.mk b/extensions/source/scanner/makefile.mk
index 347b1e1cfc26..ff42864e0496 100644
--- a/extensions/source/scanner/makefile.mk
+++ b/extensions/source/scanner/makefile.mk
@@ -88,7 +88,7 @@ SHL1STDLIBS+=$(SVTOOLLIB) -ldl
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
diff --git a/extensions/source/svg/exports.map b/extensions/source/svg/exports.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/extensions/source/svg/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/extensions/source/svg/makefile.mk b/extensions/source/svg/makefile.mk
index 543fbca73982..c46aede54920 100644
--- a/extensions/source/svg/makefile.mk
+++ b/extensions/source/svg/makefile.mk
@@ -47,7 +47,7 @@ SLOFILES=	$(SLO)$/svgprinter.obj								\
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB=i$(SHL1TARGET)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/extensions/source/update/check/makefile.mk b/extensions/source/update/check/makefile.mk
index b87eb0377803..9f5f544102dd 100644
--- a/extensions/source/update/check/makefile.mk
+++ b/extensions/source/update/check/makefile.mk
@@ -82,7 +82,7 @@ SHL1STDLIBS=    \
         $(SHELL32LIB) \
         $(OLE32LIB)
         
-SHL1VERSIONMAP=..$/exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 3be38dd9888a..2444637515d4 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -28,6 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_extensions.hxx"
 
+#include <memory>
+
 #include "updatecheck.hxx"
 #include "updatecheckconfig.hxx"
 #include "updatehdl.hxx"
@@ -55,16 +57,12 @@ class InitUpdateCheckJobThread : public osl::Thread
 {
 public:
     InitUpdateCheckJobThread( const uno::Reference< uno::XComponentContext > &xContext,
-                              const uno::Sequence< beans::NamedValue > &xParameters );
+                              const uno::Sequence< beans::NamedValue > &xParameters,
+                              bool bShowDialog );
 
     virtual void SAL_CALL run();
-    virtual void SAL_CALL onTerminated();
-
-    void    showDialog();
-    void    setTerminating() { m_bTerminating = true; }
 
-protected:
-    ~InitUpdateCheckJobThread();
+    void    setTerminating();
 
 private:
     osl::Condition m_aCondition;
@@ -115,7 +113,7 @@ public:
 private:
     uno::Reference<uno::XComponentContext>  m_xContext;
     uno::Reference< frame::XDesktop >       m_xDesktop;
-    InitUpdateCheckJobThread               *m_pInitThread;
+    std::auto_ptr< InitUpdateCheckJobThread > m_pInitThread;
 
     void handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp );
 };
@@ -125,29 +123,25 @@ private:
 //------------------------------------------------------------------------------
 InitUpdateCheckJobThread::InitUpdateCheckJobThread(
             const uno::Reference< uno::XComponentContext > &xContext,
-            const uno::Sequence< beans::NamedValue > &xParameters ) :
+            const uno::Sequence< beans::NamedValue > &xParameters,
+            bool bShowDialog ) :
     m_xContext( xContext ),
     m_xParameters( xParameters ),
-    m_bShowDialog( false ),
+    m_bShowDialog( bShowDialog ),
     m_bTerminating( false )
 {
     create();
 }
 
 //------------------------------------------------------------------------------
-InitUpdateCheckJobThread::~InitUpdateCheckJobThread()
-{
-}
-
-//------------------------------------------------------------------------------
 void SAL_CALL InitUpdateCheckJobThread::run()
 {
-    TimeValue tv = { 25, 0 };
-
-    m_aCondition.wait( &tv );
-
-    if ( m_bTerminating )
-        return;
+    if (!m_bShowDialog) {
+        TimeValue tv = { 25, 0 };
+        m_aCondition.wait( &tv );
+        if ( m_bTerminating )
+            return;
+    }
 
     rtl::Reference< UpdateCheck > aController( UpdateCheck::get() );
     aController->initialize( m_xParameters, m_xContext );
@@ -156,16 +150,8 @@ void SAL_CALL InitUpdateCheckJobThread::run()
         aController->showDialog( true );
 }
 
-//------------------------------------------------------------------------------
-void SAL_CALL InitUpdateCheckJobThread::onTerminated()
-{
-    delete this;
-}
-
-//------------------------------------------------------------------------------
-void InitUpdateCheckJobThread::showDialog()
-{
-    m_bShowDialog = true;
+void InitUpdateCheckJobThread::setTerminating() {
+    m_bTerminating = true;
     m_aCondition.set();
 }
 
@@ -174,8 +160,7 @@ void InitUpdateCheckJobThread::showDialog()
 //------------------------------------------------------------------------------
 
 UpdateCheckJob::UpdateCheckJob( const uno::Reference<uno::XComponentContext>& xContext ) :
-    m_xContext(xContext),
-    m_pInitThread( NULL )
+    m_xContext(xContext)
 {
     m_xDesktop.set( xContext->getServiceManager()->createInstanceWithContext( UNISTRING("com.sun.star.frame.Desktop"), xContext ), uno::UNO_QUERY );
     if ( m_xDesktop.is() )
@@ -234,7 +219,6 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues)
 
     uno::Sequence<beans::NamedValue> aConfig =
         getValue< uno::Sequence<beans::NamedValue> > (namedValues, "JobConfig");
-    m_pInitThread = new InitUpdateCheckJobThread( m_xContext, aConfig );
 
     /* Determine the way we got invoked here -
      * see Developers Guide Chapter "4.7.2 Jobs" to understand the magic
@@ -245,10 +229,10 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues)
 
     rtl::OUString aEventName = getValue< rtl::OUString > (aEnvironment, "EventName");
 
-    if( ! aEventName.equalsAscii("onFirstVisibleTask") )
-    {
-        m_pInitThread->showDialog();
-    }
+    m_pInitThread.reset(
+        new InitUpdateCheckJobThread(
+            m_xContext, aConfig,
+            !aEventName.equalsAscii("onFirstVisibleTask")));
 
     return uno::Any();
 }
@@ -346,7 +330,7 @@ void SAL_CALL UpdateCheckJob::queryTermination( lang::EventObject const & )
 void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & rEvt )
     throw ( uno::RuntimeException )
 {
-    if ( m_pInitThread )
+    if ( m_pInitThread.get() != 0 )
         m_pInitThread->setTerminating();
 
     disposing( rEvt );
diff --git a/extensions/source/update/exports.map b/extensions/source/update/exports.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/extensions/source/update/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/extensions/source/update/feed/makefile.mk b/extensions/source/update/feed/makefile.mk
index c7d15a2beb74..7e12970ddef1 100644
--- a/extensions/source/update/feed/makefile.mk
+++ b/extensions/source/update/feed/makefile.mk
@@ -54,7 +54,7 @@ SHL1STDLIBS=    \
     $(CPPULIB) \
     $(SALLIB)
 
-SHL1VERSIONMAP=..$/exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/extensions/source/update/ui/makefile.mk b/extensions/source/update/ui/makefile.mk
index 1cf95a52108d..c4826efba9ca 100644
--- a/extensions/source/update/ui/makefile.mk
+++ b/extensions/source/update/ui/makefile.mk
@@ -64,7 +64,7 @@ SHL1STDLIBS=    \
         $(VCLLIB) \
         $(TOOLSLIB)
         
-SHL1VERSIONMAP=..$/exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/extensions/source/xmlextract/exports.map b/extensions/source/xmlextract/exports.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/extensions/source/xmlextract/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/extensions/source/xmlextract/makefile.mk b/extensions/source/xmlextract/makefile.mk
index 8a24ac5313c1..0a021027f4b4 100644
--- a/extensions/source/xmlextract/makefile.mk
+++ b/extensions/source/xmlextract/makefile.mk
@@ -46,7 +46,7 @@ SLOFILES=	$(SLO)$/xmxuno.obj									\
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB=	i$(SHL1TARGET)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/forms/prj/build.lst b/forms/prj/build.lst
index ec07ab8e243c..99f6b29d208b 100644
--- a/forms/prj/build.lst
+++ b/forms/prj/build.lst
@@ -15,3 +15,4 @@ fm  forms\source\richtext                   nmake   -   all fm_richtext fm_inc N
 fm  forms\source\runtime                    nmake   -   all frm_runtime NULL
 fm  forms\util                              nmake   -   all fm_util fm_component fm_solar_component fm_solar_control fm_helper fm_misc fm_resource fm_richtext frm_runtime fm_xforms NULL
 fm  forms\qa                                nmake   -   all fm_qa NULL
+fm forms\qa\unoapi nmake - all fm_qa_unoapi NULL
diff --git a/forms/qa/unoapi/Test.java b/forms/qa/unoapi/Test.java
new file mode 100644
index 000000000000..52130214cc78
--- /dev/null
+++ b/forms/qa/unoapi/Test.java
@@ -0,0 +1,51 @@
+/*************************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+************************************************************************/
+
+package org.openoffice.forms.qa.unoapi;
+
+import org.openoffice.Runner;
+import org.openoffice.test.OfficeConnection;
+import static org.junit.Assert.*;
+
+public final class Test {
+    @org.junit.Before public void setUp() throws Exception {
+        connection.setUp();
+    }
+
+    @org.junit.After public void tearDown()
+        throws InterruptedException, com.sun.star.uno.Exception
+    {
+        connection.tearDown();
+    }
+
+    @org.junit.Test public void test() {
+        assertTrue(
+            Runner.run(
+                "-sce", "forms.sce", "-xcl", "knownissues.xcl", "-tdoc",
+                "testdocuments", "-cs", connection.getDescription()));
+    }
+
+    private final OfficeConnection connection = new OfficeConnection();
+}
diff --git a/forms/qa/unoapi/makefile.mk b/forms/qa/unoapi/makefile.mk
index 9f033d058ce7..50c83e587db8 100644
--- a/forms/qa/unoapi/makefile.mk
+++ b/forms/qa/unoapi/makefile.mk
@@ -1,7 +1,6 @@
 #*************************************************************************
-#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -22,27 +21,28 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
-#
-#*************************************************************************
+#***********************************************************************/
 
-PRJ=..$/..
+.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
+nothing .PHONY:
+.ELSE
 
-PRJNAME=forms
-TARGET=qa_unoapi
+PRJ = ../..
+PRJNAME = forms
+TARGET = qa_unoapi
 
-.INCLUDE: settings.mk
+.IF "$(OOO_JUNIT_JAR)" != ""
+PACKAGE = org/openoffice/forms/qa/unoapi
+JAVATESTFILES = Test.java
+JAVAFILES = $(JAVATESTFILES)
+JARFILES = OOoRunner.jar ridl.jar test.jar
+EXTRAJARFILES = $(OOO_JUNIT_JAR)
+.END
 
+.INCLUDE: settings.mk
 .INCLUDE: target.mk
+.INCLUDE: installationtest.mk
 
-ALLTAR : UNOAPI_TEST
-
-UNOAPI_TEST:
-    +$(SOLARENV)$/bin$/checkapi -sce forms.sce -xcl knownissues.xcl -DOCPTH $(PWD)$/testdocuments -THRCNT 1 -tdoc $(PWD)$/testdocuments
-    @echo =======================================================================
-    @echo Problems with controls might me focus problems during the run of XView
-    @echo these seems to appear by chance ... just re-run those testcases with
-    @echo $(SOLARENV)$/bin$/checkapi -o componentName -xcl knownissues.xcl -DOCPTH $(PWD)$/testdocuments -THRCNT 1 -tdoc $(PWD)$/testdocuments
-    @echo =======================================================================			
+ALLTAR : javatest
 
-run_%:
-    +$(SOLARENV)$/bin$/checkapi -o $(PRJNAME).$(@:s/run_//) -xcl knownissues.xcl -DOCPTH $(PWD)$/testdocuments -THRCNT 1 -tdoc $(PWD)$/testdocuments
+.END
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index ae1cbc2b7a5b..a93d121d4b99 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -32,6 +32,7 @@
 #include "property.hrc"
 #endif
 #include "property.hxx"
+#include "componenttools.hxx"
 #include "ids.hxx"
 #include "findpos.hxx"
 #include <com/sun/star/io/XPersistObject.hpp>
@@ -169,11 +170,20 @@ Sequence<sal_Int8> SAL_CALL OGridColumn::getImplementationId() throw(RuntimeExce
 //------------------------------------------------------------------
 Sequence<Type> SAL_CALL OGridColumn::getTypes() throw(RuntimeException)
 {
-    Reference<XTypeProvider> xProv;
-
-    if (query_aggregation(m_xAggregate, xProv))
-        return concatSequences(OGridColumn_BASE::getTypes(), xProv->getTypes());
-    return OGridColumn_BASE::getTypes();
+    TypeBag aTypes( OGridColumn_BASE::getTypes() );
+    // erase the types which we do not support
+    aTypes.removeType( XFormComponent::static_type() );
+    aTypes.removeType( XServiceInfo::static_type() );
+    aTypes.removeType( XBindableValue::static_type() );
+    aTypes.removeType( XPropertyContainer::static_type() );
+    // but re-add their base class(es)
+    aTypes.addType( XChild::static_type() );
+
+    Reference< XTypeProvider > xProv;
+    if ( query_aggregation( m_xAggregate, xProv ))
+        aTypes.addTypes( xProv->getTypes() );
+
+    return aTypes.getTypes();
 }
 
 //------------------------------------------------------------------
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 0aa90d9919cf..88135c040d71 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -41,7 +41,6 @@
 /** === begin UNO includes === **/
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
-#include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
@@ -167,7 +166,7 @@ namespace frm
         ,OErrorBroadcaster( OComponentHelper::rBHelper )
         ,m_aListRowSet( getContext() )
         ,m_nNULLPos(-1)
-        ,m_bBoundComponent(sal_False)
+        ,m_nBoundColumnType( DataType::SQLNULL )
     {
         DBG_CTOR(OListBoxModel,NULL);
 
@@ -189,7 +188,7 @@ namespace frm
         ,m_aBoundValues( _pOriginal->m_aBoundValues )
         ,m_aDefaultSelectSeq( _pOriginal->m_aDefaultSelectSeq )
         ,m_nNULLPos(-1)
-        ,m_bBoundComponent(sal_False)
+        ,m_nBoundColumnType( DataType::SQLNULL )
     {
         DBG_CTOR(OListBoxModel,NULL);
     }
@@ -629,7 +628,7 @@ namespace frm
         DBG_ASSERT( !hasExternalListSource(), "OListBoxModel::loadData: cannot load from DB when I have an external list source!" );
 
         m_nNULLPos = -1;
-        m_bBoundComponent = sal_False;
+        m_nBoundColumnType = DataType::SQLNULL;
 
         // pre-requisites:
         // PRE1: connection
@@ -832,20 +831,19 @@ namespace frm
                     ::dbtools::FormattedColumnValue aValueFormatter( getContext(), m_xCursor, xDataField );
 
                     // Feld der BoundColumn des ResultSets holen
-                    sal_Int32 nBoundColumnType = DataType::SQLNULL;
+                    m_nBoundColumnType = DataType::SQLNULL;
                     if ( ( nBoundColumn > 0 ) && m_xColumn.is() )
                     {   // don't look for a bound column if we're not connected to a field
                         try
                         {
                             Reference< XPropertySet > xBoundField( xColumns->getByIndex( nBoundColumn ), UNO_QUERY_THROW );
-                            OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) >>= nBoundColumnType );
+                            OSL_VERIFY( xBoundField->getPropertyValue( ::rtl::OUString::createFromAscii( "Type" ) ) >>= m_nBoundColumnType );
                         }
                         catch( const Exception& )
                         {
                             DBG_UNHANDLED_EXCEPTION();
                         }
                     }
-                    m_bBoundComponent = ( nBoundColumnType != DataType::SQLNULL );
 
                     //  Ist die LB an ein Feld gebunden und sind Leereintraege zulaessig
                     //  dann wird die Position fuer einen Leereintrag gemerkt
@@ -860,9 +858,9 @@ namespace frm
                         aStr = aValueFormatter.getFormattedValue();
                         aDisplayList.push_back( aStr );
 
-                        if ( m_bBoundComponent )
+                        if ( impl_hasBoundComponent() )
                         {
-                            aBoundValue.fill( nBoundColumn + 1, nBoundColumnType, xCursorRow );
+                            aBoundValue.fill( nBoundColumn + 1, m_nBoundColumnType, xCursorRow );
                             aValueList.push_back( aBoundValue );
                         }
 
@@ -907,7 +905,7 @@ namespace frm
         // NULL eintrag hinzufuegen
         if (bUseNULL && m_nNULLPos == -1)
         {
-            if ( m_bBoundComponent )
+            if ( impl_hasBoundComponent() )
                 aValueList.insert( aValueList.begin(), ORowSetValue() );
 
             aDisplayList.insert( aDisplayList.begin(), ORowSetValue( ::rtl::OUString() ) );
@@ -940,7 +938,7 @@ namespace frm
         {
             ValueList().swap(m_aBoundValues);
             m_nNULLPos = -1;
-            m_bBoundComponent = sal_False;
+            m_nBoundColumnType = DataType::SQLNULL;
 
             if ( !hasExternalListSource() )
                 setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( StringSequence() ) );
@@ -1035,7 +1033,7 @@ namespace frm
         Sequence< sal_Int16 > aSelectionIndicies;
 
         ORowSetValue aCurrentValue;
-        aCurrentValue.fill( getFieldType(), m_xColumn );
+        aCurrentValue.fill( impl_hasBoundComponent() ? m_nBoundColumnType : getFieldType(), m_xColumn );
 
         // reset selection for NULL values
         if ( aCurrentValue.isNull() )
diff --git a/forms/source/component/ListBox.hxx b/forms/source/component/ListBox.hxx
index d2af81c1c52c..04db6069d89e 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/awt/XListBox.hpp>
 #include <com/sun/star/form/XChangeBroadcaster.hpp>
+#include <com/sun/star/sdbc/DataType.hpp>
 /** === end UNO includes === **/
 
 #include <comphelper/asyncnotification.hxx>
@@ -82,7 +83,7 @@ class OListBoxModel :public OBoundControlModel
     // </properties>
 
     sal_Int16                                   m_nNULLPos;             // position of the NULL value in our list
-    sal_Bool                                    m_bBoundComponent : 1;
+    sal_Int32                                   m_nBoundColumnType;
 
 private:
     ::connectivity::ORowSetValue getFirstSelectedValue() const;
@@ -177,6 +178,8 @@ private:
     void        impl_refreshDbEntryList( bool _bForce );
 
     ValueList   impl_getValues() const;
+
+    bool        impl_hasBoundComponent() const { return m_nBoundColumnType != ::com::sun::star::sdbc::DataType::SQLNULL; }
 };
 
 //==================================================================
diff --git a/forms/source/inc/componenttools.hxx b/forms/source/inc/componenttools.hxx
index 73771f19783a..e91573c43d2f 100644
--- a/forms/source/inc/componenttools.hxx
+++ b/forms/source/inc/componenttools.hxx
@@ -48,7 +48,7 @@ namespace frm
         typedef ::com::sun::star::uno::Type             Type;
 
     public:
-        bool operator()( const Type& _rLHS, const Type& _rRHS )
+        bool operator()( const Type& _rLHS, const Type& _rRHS ) const
         {
             return _rLHS.getTypeName() < _rRHS.getTypeName();
         }
@@ -85,7 +85,9 @@ namespace frm
             const TypeSequence& _rTypes3
         );
 
-        void addTypes( const TypeSequence& _rTypes );
+        void    addType( const Type& i_rType );
+        void    addTypes( const TypeSequence& _rTypes );
+        void    removeType( const Type& i_rType );
 
         /** returns the types represented by this bag
         */
diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx
index 80e772dbd0da..bdba7456fa7f 100644
--- a/forms/source/misc/componenttools.cxx
+++ b/forms/source/misc/componenttools.cxx
@@ -84,6 +84,18 @@ namespace frm
     }
 
     //--------------------------------------------------------------------
+    void TypeBag::addType( const Type& i_rType )
+    {
+        m_aTypes.insert( i_rType );
+    }
+
+    //--------------------------------------------------------------------
+    void TypeBag::removeType( const TypeBag::Type& i_rType )
+    {
+        m_aTypes.erase( i_rType );
+    }
+
+    //--------------------------------------------------------------------
     TypeBag::TypeSequence TypeBag::getTypes() const
     {
         TypeSequence aTypes( m_aTypes.size() );
diff --git a/forms/util/frm.map b/forms/util/frm.map
deleted file mode 100644
index 7975644b139a..000000000000
--- a/forms/util/frm.map
+++ /dev/null
@@ -1,8 +0,0 @@
-FORMS_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk
index 66de3cb83fb2..00d7a81d5a97 100644
--- a/forms/util/makefile.mk
+++ b/forms/util/makefile.mk
@@ -81,7 +81,7 @@ SHL1DEPN=$(LIB1TARGET)	\
         makefile.mk
 
 
-SHL1VERSIONMAP=$(TARGET).map 
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
index b9fa8f3af237..fa1ce919245c 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/Installer/LinuxInstaller.java
@@ -163,6 +163,7 @@ public class LinuxInstaller extends Installer {
 
             File completePackage = new File(packagePath, packageName);
             packageName = completePackage.getPath();
+            packageName = "\"" + packageName + "\""; // Quoting is necessary, if the path the the packages contains white spaces.
 
             if ( completePackage.exists() ) {
                 String relocations = helper.getRelocationString(packageData, packageName);
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.map b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.map
deleted file mode 100644
index 1cc0ac1898a8..000000000000
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen.map
+++ /dev/null
@@ -1,8 +0,0 @@
-LTH_1_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
index 415e76792b47..f3626c70312b 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
@@ -81,7 +81,7 @@ SHL1IMPLIB=		i$(REALNAME)
 SHL1DEPN=		$(SHL1LIBS)
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP= $(REALNAME).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # build DEF file
 DEF1NAME	 =$(SHL1TARGET)
diff --git a/lingucomponent/source/languageguessing/guesslang.map b/lingucomponent/source/languageguessing/guesslang.map
deleted file mode 100644
index b34eff63c44f..000000000000
--- a/lingucomponent/source/languageguessing/guesslang.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk
index f49e79060c4a..ebad4076b3ed 100644
--- a/lingucomponent/source/languageguessing/makefile.mk
+++ b/lingucomponent/source/languageguessing/makefile.mk
@@ -68,7 +68,7 @@ SHL1IMPLIB=     i$(TARGET)
 SHL1DEPN=       $(SHL1LIBS)
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
 .IF "$(OS)"!="MACOSX"
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 .ENDIF
 
 # build DEF file
diff --git a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.map b/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.map
deleted file mode 100644
index bf1fbe0696c8..000000000000
--- a/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell.map
+++ /dev/null
@@ -1,8 +0,0 @@
-LEXPS_1_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/lingucomponent/source/spellcheck/macosxspell/makefile.mk b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
index f91ab46e1553..6414560e0f4a 100644
--- a/lingucomponent/source/spellcheck/macosxspell/makefile.mk
+++ b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
@@ -81,7 +81,7 @@ SHL1IMPLIB=		i$(TARGET)
 SHL1DEPN=		$(SHL1LIBS)
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # --- Targets ------------------------------------------------------
 
diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomponent/source/spellcheck/spell/makefile.mk
index efedb6ad1008..4173d4dbae22 100644
--- a/lingucomponent/source/spellcheck/spell/makefile.mk
+++ b/lingucomponent/source/spellcheck/spell/makefile.mk
@@ -75,7 +75,7 @@ SHL1IMPLIB=		i$(TARGET)
 SHL1DEPN=		$(SHL1LIBS)
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # build DEF file
 DEF1NAME	 =$(SHL1TARGET)
diff --git a/lingucomponent/source/spellcheck/spell/spell.map b/lingucomponent/source/spellcheck/spell/spell.map
deleted file mode 100644
index bf1fbe0696c8..000000000000
--- a/lingucomponent/source/spellcheck/spell/spell.map
+++ /dev/null
@@ -1,8 +0,0 @@
-LEXPS_1_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/lingucomponent/source/thesaurus/libnth/lnth.map b/lingucomponent/source/thesaurus/libnth/lnth.map
deleted file mode 100644
index 1cc0ac1898a8..000000000000
--- a/lingucomponent/source/thesaurus/libnth/lnth.map
+++ /dev/null
@@ -1,8 +0,0 @@
-LTH_1_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomponent/source/thesaurus/libnth/makefile.mk
index dea6942bbef2..58e4d97e5561 100644
--- a/lingucomponent/source/thesaurus/libnth/makefile.mk
+++ b/lingucomponent/source/thesaurus/libnth/makefile.mk
@@ -95,7 +95,7 @@ SHL1IMPLIB=		i$(TARGET)
 SHL1DEPN=		$(SHL1LIBS)
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP= $(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # build DEF file
 DEF1NAME	 =$(SHL1TARGET)
diff --git a/package/util/exports.map b/package/util/exports.map
deleted file mode 100644
index 7e12f34d1b86..000000000000
--- a/package/util/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-PKG_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl
index 77a7f18fbc7d..89588d0c4d03 100644
--- a/setup_native/scripts/admin.pl
+++ b/setup_native/scripts/admin.pl
@@ -190,13 +190,11 @@ sub convert_stringlist_into_array
     {
         $first = $1;
         $last = $2;
-        if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; }
         # Problem with two directly following listseparators. For example a path with two ";;" directly behind each other
         $first =~ s/^$listseparator//;
         push(@newarray, "$first\n");
     }
 
-    if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; }
     push(@newarray, "$last\n");
 
     return \@newarray;
@@ -382,11 +380,8 @@ sub try_to_create_directory
         {
             $created_directory = 1;
 
-            if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-            {
-                my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
-                system($localcall);
-            }
+            my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
+            system($localcall);
         }
         else
         {
@@ -837,20 +832,14 @@ sub create_directory_with_privileges
 
         if ($returnvalue)
         {
-            if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-            {
-                my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-                system($localcall);
-            }
+            my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
+            system($localcall);
         }
     }
     else
     {
-        if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" )
-        {
-            my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
-            system($localcall);
-        }
+        my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1";
+        system($localcall);
     }
 }
 
diff --git a/setup_native/scripts/makefile.mk b/setup_native/scripts/makefile.mk
index b8fc6649eddf..de91bd011efe 100644
--- a/setup_native/scripts/makefile.mk
+++ b/setup_native/scripts/makefile.mk
@@ -50,7 +50,8 @@ UNIXTEXT= \
 UNIXTEXT+= $(BIN)$/stclient_wrapper.sh
 .ENDIF
 
-FAKEDB=$(BIN)$/noarch/fake-db-1.0-0.noarch.rpm
+NOARCH=$(BIN)$/noarch
+FAKEDB=$(NOARCH)/fake-db-1.0-0.noarch.rpm
 FAKEDBROOT=$(COMMONMISC)/$(TARGET)/fake-db-root
 
 # --- Targets ------------------------------------------------------
@@ -58,7 +59,7 @@ FAKEDBROOT=$(COMMONMISC)/$(TARGET)/fake-db-root
 .ENDIF # L10N_framework
 .INCLUDE :	target.mk
 .IF "$(L10N_framework)"==""
-.IF "$(OS)" == "SOLARIS" || "$(OS)" == "LINUX"
+.IF "$(OS)" == "SOLARIS" || ( "$(OS)" == "LINUX" && "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)" )
 
 ALLTAR: $(BIN)$/install $(BIN)$/uninstall
 
@@ -69,18 +70,21 @@ $(BIN)$/install: install_$(OS:l).sh
 .ENDIF
 
 .IF "$(OS)" == "LINUX"
+.IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
 $(FAKEDB) : fake-db.spec 
     $(MKDIRHIER) $(FAKEDBROOT)
     $(RPM) --define "_builddir $(shell @cd $(FAKEDBROOT) && pwd)" --define "_rpmdir $(shell @cd $(BIN) && pwd)" -bb $<
+    chmod g+w $(NOARCH)
 
 $(BIN)$/install: $(FAKEDB)
+.ENDIF          # "$(PKGFORMAT)"!="$(PKGFORMAT:s/rpm//)"
 
 $(BIN)$/uninstall: uninstall_linux.sh
     $(TYPE) $< | tr -d "\015" > $@
     -chmod 775 $@
 
-.ENDIF
+.ENDIF          # "$(OS)" == "LINUX"
 
 .IF "$(OS)" == "SOLARIS"
 
diff --git a/setup_native/source/java/javaversion.dat b/setup_native/source/java/javaversion.dat
index 17084cc92234..461bd7d6579a 100755
--- a/setup_native/source/java/javaversion.dat
+++ b/setup_native/source/java/javaversion.dat
@@ -26,30 +26,30 @@
 #*************************************************************************
 
 # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 18
-WINDOWSJAVAVERSION=Java 6 Update 18
+JAVAVERSION=Java 6 Update 19
+WINDOWSJAVAVERSION=Java 6 Update 19
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u18-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_18
+WINDOWSJAVAFILENAME=jre-6u19-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_19
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u18-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u19-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_18-fcs
+LINUXJAVANAME=jre-1.6.0_19-fcs
 
 # Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u18-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u19-linux-amd64.rpm
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_18_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_18_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_18_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_19_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_19_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_19_sparc.tar.gz
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_18_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_18_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_18_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_19_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_19_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_19_x86.tar.gz
 
 # Solaris (pkgUnit.xml, needs only to be changed in major changes)
 SOLARISJAVART=SUNWj6rt
diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat
index 17084cc92234..461bd7d6579a 100644
--- a/setup_native/source/java/javaversion2.dat
+++ b/setup_native/source/java/javaversion2.dat
@@ -26,30 +26,30 @@
 #*************************************************************************
 
 # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 18
-WINDOWSJAVAVERSION=Java 6 Update 18
+JAVAVERSION=Java 6 Update 19
+WINDOWSJAVAVERSION=Java 6 Update 19
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u18-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_18
+WINDOWSJAVAFILENAME=jre-6u19-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_19
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u18-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u19-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_18-fcs
+LINUXJAVANAME=jre-1.6.0_19-fcs
 
 # Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u18-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u19-linux-amd64.rpm
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_18_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_18_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_18_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_19_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_19_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_19_sparc.tar.gz
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_18_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_18_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_18_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_19_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_19_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_19_x86.tar.gz
 
 # Solaris (pkgUnit.xml, needs only to be changed in major changes)
 SOLARISJAVART=SUNWj6rt
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/exports.dxp b/setup_native/source/win32/customactions/reg4allmsdoc/exports.dxp
index 364ebc705df8..566981ba569e 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/exports.dxp
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/exports.dxp
@@ -1 +1,3 @@
 FindRegisteredExtensions
+LookForRegisteredExtensions
+RegisterSomeExtensions
\ No newline at end of file
diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 1be921ca5846..3aba597098fb 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -68,6 +68,11 @@ static const CHAR* g_Extensions[] =
     0
 };
 
+static const int WORD_START = 0;
+static const int EXCEL_START = 7;
+static const int POWERPOINT_START = 15;
+static const int POWERPOINT_END = 23;
+
 //    ".xlam",    // Office Excel 2007 XML macro-enabled add-in
 //    ".ppam",    // Office PowerPoint 2007 macro-enabled XML add-in
 //    ".ppsm",    // Office PowerPoint 2007 macro-enabled XML show
@@ -90,15 +95,6 @@ static inline void OutputDebugStringFormat( LPCSTR, ... )
 #endif
 
 //----------------------------------------------------------
-static bool IsModuleSelectedForInstallation( MSIHANDLE handle, LPCTSTR name )
-{
-    INSTALLSTATE current_state;
-    INSTALLSTATE future_state;
-    MsiGetFeatureState(handle, name, &current_state, &future_state);
-    return (future_state == INSTALLSTATE_LOCAL);
-}
-
-//----------------------------------------------------------
 static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
 {
     BOOL    bRet = false;
@@ -264,6 +260,23 @@ bool IsSetMsiProp( MSIHANDLE handle, LPCSTR name )
 }
 
 //----------------------------------------------------------
+static void registerForExtension( MSIHANDLE handle, const int nIndex, bool bRegister )
+{
+    CHAR sPropName[256];
+    StringCchCopyA( sPropName, 256, "REGISTER_" );
+    StringCchCatA( sPropName, 256, (g_Extensions[nIndex])+1 );
+    CharUpperBuffA( sPropName+9, 4 );
+
+    if ( bRegister ) {
+        MsiSetPropertyA( handle, sPropName, "1" );
+        OutputDebugStringFormat( "Set MSI property %s.\n", sPropName );
+    } else {
+        MsiSetPropertyA( handle, sPropName, "0" );
+        OutputDebugStringFormat( "Unset MSI property %s.\n", sPropName );
+    }
+}
+
+//----------------------------------------------------------
 static void registerForExtensions( MSIHANDLE handle, BOOL bRegisterAll )
 { // Check all file extensions
     int nIndex = 0;
@@ -271,23 +284,180 @@ static void registerForExtensions( MSIHANDLE handle, BOOL bRegisterAll )
     {
         BOOL bRegister = bRegisterAll || CheckExtensionInRegistry( g_Extensions[nIndex] );
         if ( bRegister )
-        {
-            CHAR sPropName[256];
-            StringCchCopyA( sPropName, 256, "REGISTER_" );
-            StringCchCatA( sPropName, 256, (g_Extensions[nIndex])+1 );
-            CharUpperBuffA( sPropName+9, 4 );
-            MsiSetPropertyA( handle, sPropName, "1" );
-            OutputDebugStringFormat( "Set MSI property %s.\n", sPropName );
-        }
+            registerForExtension( handle, nIndex, true );
+        ++nIndex;
+    }
+}
+
+//----------------------------------------------------------
+static bool checkSomeExtensionInRegistry( const int nStart, const int nEnd )
+{ // Check all file extensions
+    int nIndex = nStart;
+    bool bFound = false;
+
+    while ( !bFound && ( g_Extensions[nIndex] != 0 ) && ( nIndex < nEnd ) )
+    {
+        bFound = ! CheckExtensionInRegistry( g_Extensions[nIndex] );
+
+        if ( bFound )
+            OutputDebugStringFormat( "Found registration for [%s].\n", g_Extensions[nIndex] );
+
         ++nIndex;
     }
+    return bFound;
 }
 
 //----------------------------------------------------------
+static void registerSomeExtensions( MSIHANDLE handle, const int nStart, const int nEnd, bool bRegister )
+{ // Check all file extensions
+    int nIndex = nStart;
+
+    while ( ( g_Extensions[nIndex] != 0 ) && ( nIndex < nEnd ) )
+    {
+        registerForExtension( handle, nIndex++, bRegister );
+    }
+}
+
 //----------------------------------------------------------
 //----------------------------------------------------------
+//----------------------------------------------------------
+extern "C" UINT __stdcall LookForRegisteredExtensions( MSIHANDLE handle )
+{
+    OutputDebugStringFormat( "LookForRegisteredExtensions: " );
+
+    INSTALLSTATE current_state;
+    INSTALLSTATE future_state;
+
+    bool bWriterEnabled = false;
+    bool bCalcEnabled = false;
+    bool bImpressEnabled = false;
+    bool bRegisterNone = IsSetMsiProp( handle, "REGISTER_NO_MSO_TYPES" );
+
+    if ( ( ERROR_SUCCESS == MsiGetFeatureState( handle, L"gm_p_Wrt", &current_state, &future_state ) ) &&
+         ( (future_state == INSTALLSTATE_LOCAL) || ((current_state == INSTALLSTATE_LOCAL) && (future_state == INSTALLSTATE_UNKNOWN) ) ) )
+        bWriterEnabled = true;
+
+    OutputDebugStringFormat( "LookForRegisteredExtensions: Install state Writer is [%d], will be [%d]", current_state, future_state );
+    if ( bWriterEnabled )
+        OutputDebugStringFormat( "LookForRegisteredExtensions: Writer is enabled" );
+    else
+        OutputDebugStringFormat( "LookForRegisteredExtensions: Writer is NOT enabled" );
+
+    if ( ( ERROR_SUCCESS == MsiGetFeatureState( handle, L"gm_p_Calc", &current_state, &future_state ) ) &&
+         ( (future_state == INSTALLSTATE_LOCAL) || ((current_state == INSTALLSTATE_LOCAL) && (future_state == INSTALLSTATE_UNKNOWN) ) ) )
+        bCalcEnabled = true;
+
+    OutputDebugStringFormat( "LookForRegisteredExtensions: Install state Calc is [%d], will be [%d]", current_state, future_state );
+    if ( bCalcEnabled )
+        OutputDebugStringFormat( "LookForRegisteredExtensions: Calc is enabled" );
+    else
+        OutputDebugStringFormat( "LookForRegisteredExtensions: Calc is NOT enabled" );
+
+    if ( ( ERROR_SUCCESS == MsiGetFeatureState( handle, L"gm_p_Impress", &current_state, &future_state ) ) &&
+         ( (future_state == INSTALLSTATE_LOCAL) || ((current_state == INSTALLSTATE_LOCAL) && (future_state == INSTALLSTATE_UNKNOWN) ) ) )
+        bImpressEnabled = true;
+
+    OutputDebugStringFormat( "LookForRegisteredExtensions: Install state Impress is [%d], will be [%d]", current_state, future_state );
+    if ( bImpressEnabled )
+        OutputDebugStringFormat( "LookForRegisteredExtensions: Impress is enabled" );
+    else
+        OutputDebugStringFormat( "LookForRegisteredExtensions: Impress is NOT enabled" );
+
+    MsiSetPropertyA( handle, "SELECT_WORD", "" );
+    MsiSetPropertyA( handle, "SELECT_EXCEL", "" );
+    MsiSetPropertyA( handle, "SELECT_POWERPOINT", "" );
+
+    if ( ! bRegisterNone )
+    {
+        if ( IsSetMsiProp( handle, "REGISTER_ALL_MSO_TYPES" ) )
+        {
+            if ( bWriterEnabled )
+                MsiSetPropertyA( handle, "SELECT_WORD", "1" );
+            if ( bCalcEnabled )
+                MsiSetPropertyA( handle, "SELECT_EXCEL", "1" );
+            if ( bImpressEnabled )
+                MsiSetPropertyA( handle, "SELECT_POWERPOINT", "1" );
+        }
+        else
+        {
+            if ( bWriterEnabled && ! checkSomeExtensionInRegistry( WORD_START, EXCEL_START ) )
+            {
+                MsiSetPropertyA( handle, "SELECT_WORD", "1" );
+                OutputDebugStringFormat( "LookForRegisteredExtensions: Register for MicroSoft Word" );
+            }
+            if ( bCalcEnabled && ! checkSomeExtensionInRegistry( EXCEL_START, POWERPOINT_START ) )
+            {
+                MsiSetPropertyA( handle, "SELECT_EXCEL", "1" );
+                OutputDebugStringFormat( "LookForRegisteredExtensions: Register for MicroSoft Excel" );
+            }
+            if ( bImpressEnabled && ! checkSomeExtensionInRegistry( POWERPOINT_START, POWERPOINT_END ) )
+            {
+                MsiSetPropertyA( handle, "SELECT_POWERPOINT", "1" );
+                OutputDebugStringFormat( "LookForRegisteredExtensions: Register for MicroSoft PowerPoint" );
+            }
+        }
+    }
+
+    MsiSetPropertyA( handle, "FILETYPEDIALOGUSED", "1" );
+
+    return ERROR_SUCCESS;
+}
+
+//----------------------------------------------------------
+extern "C" UINT __stdcall RegisterSomeExtensions( MSIHANDLE handle )
+{
+    OutputDebugStringFormat( "RegisterSomeExtensions: " );
+
+    if ( IsSetMsiProp( handle, "SELECT_WORD" ) )
+    {
+        registerSomeExtensions( handle, WORD_START, EXCEL_START, true );
+        MsiSetFeatureState( handle, L"gm_p_Wrt_MSO_Reg", INSTALLSTATE_LOCAL );
+        OutputDebugStringFormat( "RegisterSomeExtensions: Register for MicroSoft Word" );
+    }
+    else
+    {
+        registerSomeExtensions( handle, WORD_START, EXCEL_START, false );
+        MsiSetFeatureState( handle, L"gm_p_Wrt_MSO_Reg", INSTALLSTATE_ABSENT );
+    }
+
+    if ( IsSetMsiProp( handle, "SELECT_EXCEL" ) )
+    {
+        registerSomeExtensions( handle, EXCEL_START, POWERPOINT_START, true );
+        MsiSetFeatureState( handle, L"gm_p_Calc_MSO_Reg", INSTALLSTATE_LOCAL );
+        OutputDebugStringFormat( "RegisterSomeExtensions: Register for MicroSoft Excel" );
+    }
+    else
+    {
+        registerSomeExtensions( handle, EXCEL_START, POWERPOINT_START, false );
+        MsiSetFeatureState( handle, L"gm_p_Calc_MSO_Reg", INSTALLSTATE_ABSENT );
+    }
+
+    if ( IsSetMsiProp( handle, "SELECT_POWERPOINT" ) )
+    {
+        registerSomeExtensions( handle, POWERPOINT_START, POWERPOINT_END, true );
+        MsiSetFeatureState( handle, L"gm_p_Impress_MSO_Reg", INSTALLSTATE_LOCAL );
+        OutputDebugStringFormat( "RegisterSomeExtensions: Register for MicroSoft PowerPoint" );
+    }
+    else
+    {
+        registerSomeExtensions( handle, POWERPOINT_START, POWERPOINT_END, false );
+        MsiSetFeatureState( handle, L"gm_p_Impress_MSO_Reg", INSTALLSTATE_ABSENT );
+    }
+
+    return ERROR_SUCCESS;
+}
+
+//----------------------------------------------------------
 extern "C" UINT __stdcall FindRegisteredExtensions( MSIHANDLE handle )
 {
+    if ( IsSetMsiProp( handle, "FILETYPEDIALOGUSED" ) )
+    {
+        OutputDebugStringFormat( "FindRegisteredExtensions: FILETYPEDIALOGUSED!" );
+        return ERROR_SUCCESS;
+    }
+
+    OutputDebugStringFormat( "FindRegisteredExtensions:" );
+
     bool bRegisterAll = IsSetMsiProp( handle, "REGISTER_ALL_MSO_TYPES" );
 
     if ( IsSetMsiProp( handle, "REGISTER_NO_MSO_TYPES" ) )
@@ -300,6 +470,15 @@ extern "C" UINT __stdcall FindRegisteredExtensions( MSIHANDLE handle )
     else
         OutputDebugStringFormat( "FindRegisteredExtensions: " );
 
+    // setting the msi properties SELECT_* will force registering for all corresponding
+    // file types
+    if ( IsSetMsiProp( handle, "SELECT_WORD" ) )
+        registerSomeExtensions( handle, WORD_START, EXCEL_START, true );
+    if ( IsSetMsiProp( handle, "SELECT_EXCEL" ) )
+        registerSomeExtensions( handle, EXCEL_START, POWERPOINT_START, true );
+    if ( IsSetMsiProp( handle, "SELECT_POWERPOINT" ) )
+        registerSomeExtensions( handle, POWERPOINT_START, POWERPOINT_END, true );
+
     registerForExtensions( handle, bRegisterAll );
 
     return ERROR_SUCCESS;
diff --git a/wizards/com/sun/star/wizards/makefile.mk b/wizards/com/sun/star/wizards/makefile.mk
index 50dc0713945c..fb9c3e18558d 100644
--- a/wizards/com/sun/star/wizards/makefile.mk
+++ b/wizards/com/sun/star/wizards/makefile.mk
@@ -37,7 +37,7 @@ PACKAGE = com$/sun$/star$/wizards
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge 
 
 .IF "$(SYSTEM_SAXON)" == "YES"
-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR)
+EXTRAJARFILES = $(SAXON_JAR)
 .ELSE
 JARFILES += saxon9.jar
 .ENDIF
diff --git a/wizards/com/sun/star/wizards/web/data/makefile.mk b/wizards/com/sun/star/wizards/web/data/makefile.mk
index 89362269fadc..1bfc02cf8351 100644
--- a/wizards/com/sun/star/wizards/web/data/makefile.mk
+++ b/wizards/com/sun/star/wizards/web/data/makefile.mk
@@ -38,7 +38,7 @@ PACKAGE = com$/sun$/star$/wizards$/web$/data
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar 
 
 .IF "$(SYSTEM_SAXON)" == "YES"
-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR)
+EXTRAJARFILES = $(SAXON_JAR)
 .ELSE
 JARFILES += saxon9.jar
 .ENDIF
diff --git a/wizards/com/sun/star/wizards/web/export/makefile.mk b/wizards/com/sun/star/wizards/web/export/makefile.mk
index b123fdc6d255..46cd65044e81 100644
--- a/wizards/com/sun/star/wizards/web/export/makefile.mk
+++ b/wizards/com/sun/star/wizards/web/export/makefile.mk
@@ -38,7 +38,7 @@ PACKAGE = com$/sun$/star$/wizards$/web$/export
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar java_uno.jar java_uno_accessbridge commonwizards.jar 
 
 .IF "$(SYSTEM_SAXON)" == "YES"
-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR)
+EXTRAJARFILES = $(SAXON_JAR)
 .ELSE
 JARFILES += saxon9.jar
 .ENDIF
diff --git a/wizards/com/sun/star/wizards/web/makefile.mk b/wizards/com/sun/star/wizards/web/makefile.mk
index a452e7683d21..9cc97e1b88ab 100644
--- a/wizards/com/sun/star/wizards/web/makefile.mk
+++ b/wizards/com/sun/star/wizards/web/makefile.mk
@@ -37,7 +37,7 @@ PACKAGE = com$/sun$/star$/wizards$/web
 JARFILES= unoil.jar jurt.jar ridl.jar juh.jar jut.jar java_uno.jar java_uno_accessbridge commonwizards.jar 
 
 .IF "$(SYSTEM_SAXON)" == "YES"
-XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(SAXON_JAR)
+EXTRAJARFILES = $(SAXON_JAR)
 .ELSE
 JARFILES += saxon9.jar
 .ENDIF
diff --git a/xmlsecurity/source/xmlsec/diagnose.cxx b/xmlsecurity/source/xmlsec/diagnose.cxx
index 1f17b12650b2..4c10d2f7d576 100644
--- a/xmlsecurity/source/xmlsec/diagnose.cxx
+++ b/xmlsecurity/source/xmlsec/diagnose.cxx
@@ -39,7 +39,7 @@ namespace xmlsecurity {
 struct UseDiagnose : public rtl::StaticWithInit<
     const bool, UseDiagnose>
 {
-    const bool operator () ()
+    bool operator () () const
     {
         ::rtl::OUString value;
         sal_Bool res = rtl::Bootstrap::get(
diff --git a/xmlsecurity/util/makefile.mk b/xmlsecurity/util/makefile.mk
index 1030fbbd10c3..6ef221c7e309 100644
--- a/xmlsecurity/util/makefile.mk
+++ b/xmlsecurity/util/makefile.mk
@@ -158,7 +158,7 @@ SHL4STDLIBS=\
                 $(XMLOFFLIB)		\
                 $(SVXCORELIB)
 
-SHL4VERSIONMAP = xmlsecurity.map
+SHL4VERSIONMAP = $(SOLARENV)/src/component.map
 SHL4DEPN=
 SHL4IMPLIB=i$(TARGET)
 SHL4DEF=$(MISC)$/$(SHL4TARGET).def
diff --git a/xmlsecurity/util/xmlsecurity.map b/xmlsecurity/util/xmlsecurity.map
deleted file mode 100644
index ac2c3750bfe0..000000000000
--- a/xmlsecurity/util/xmlsecurity.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};