Merge to DEV300_m77

47 files changed, 199 insertions, 235 deletions

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/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 253e7d9e2d6e..178948ae0d3a 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -523,7 +523,7 @@ namespace abp
 
         // ................................................................
         // create the interaction handler (needed for authentication and error handling)
-        static ::rtl::OUString s_sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sdb.InteractionHandler");
+        static ::rtl::OUString s_sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler");
         Reference< XInteractionHandler > xInteractions;
         try
         {
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/datman.cxx b/extensions/source/bibliography/datman.cxx
index 92a59665d1b5..9fa401a1620c 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -148,7 +148,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
         try
         {
 
-            Reference<XInterface> xHdl = xMgr->createInstance(C2U("com.sun.star.sdb.InteractionHandler"));
+            Reference<XInterface> xHdl = xMgr->createInstance(C2U("com.sun.star.task.InteractionHandler"));
             Reference<task::XInteractionHandler> xIHdl(xHdl, UNO_QUERY);
             xConn = xComplConn->connectWithCompletion(xIHdl);
 //          xConn = xDataSource->getConnection(sUser, sPwd);
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/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 675452801029..b97eb60504b4 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -518,7 +518,7 @@ namespace dbp
     //---------------------------------------------------------------------
     Reference< XInteractionHandler > OControlWizard::getInteractionHandler(Window* _pWindow) const
     {
-        const ::rtl::OUString sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.sdb.InteractionHandler");
+        const ::rtl::OUString sInteractionHandlerServiceName = ::rtl::OUString::createFromAscii("com.sun.star.task.InteractionHandler");
         Reference< XInteractionHandler > xHandler;
         try
         {
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index 4615d2529adb..13920c5978f7 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -145,7 +145,7 @@ namespace dbp
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
                                         getFormConnection(const OAccessRegulator&) const;
 
-        /** returns the com.sun.star.sdb.InteractionHandler
+        /** returns the com.sun.star.task.InteractionHandler
             @param  _pWindow    The window will be used when an error message has to be shown.
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler(Window* _pWindow) const;
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/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 8302f9fff503..fbf2cc38b63e 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -30,6 +30,7 @@
 
 #include "controltype.hxx"
 #include "propctrlr.hrc"
+#include "extensio.hrc"
 #include "fontdialog.hxx"
 #include "formcomponenthandler.hxx"
 #include "formlinkdialog.hxx"
@@ -2535,17 +2536,38 @@ namespace pcr
         Reference< XQueriesSupplier > xSupplyQueries( m_xRowSetConnection, UNO_QUERY );
         Reference< XNameAccess > xQueryNames;
         if ( xSupplyQueries.is() )
+        {
             xQueryNames = xSupplyQueries->getQueries();
-        DBG_ASSERT( xQueryNames.is(), "FormComponentPropertyHandler::impl_fillQueryNames_throw: no way to obtain the queries of the connection!" );
-        if ( !xQueryNames.is() )
+            impl_fillQueryNames_throw(xQueryNames,_out_rNames);
+        }
+    }
+    //------------------------------------------------------------------------
+    void FormComponentPropertyHandler::impl_fillQueryNames_throw( const Reference< XNameAccess >& _xQueryNames,::std::vector< ::rtl::OUString >& _out_rNames,const ::rtl::OUString& _sName ) const
+    {
+        DBG_ASSERT( _xQueryNames.is(), "FormComponentPropertyHandler::impl_fillQueryNames_throw: no way to obtain the queries of the connection!" );
+        if ( !_xQueryNames.is() )
             return;
 
-        Sequence< ::rtl::OUString> aQueryNames = xQueryNames->getElementNames();
+        Sequence< ::rtl::OUString> aQueryNames = _xQueryNames->getElementNames();
         sal_uInt32 nCount = aQueryNames.getLength();
         const ::rtl::OUString* pQueryNames = aQueryNames.getConstArray();
+        sal_Bool bAdd = _sName.getLength();
 
         for ( sal_uInt32 i=0; i<nCount; i++, ++pQueryNames )
-            _out_rNames.push_back( *pQueryNames );
+        {
+            ::rtl::OUStringBuffer sTemp;
+            if ( bAdd )
+            {
+                sTemp.append(_sName);
+                sTemp.appendAscii("/");
+            }
+            sTemp.append(*pQueryNames);
+            Reference< XNameAccess > xSubQueries(_xQueryNames->getByName(*pQueryNames),UNO_QUERY);
+            if ( xSubQueries.is() )
+                impl_fillQueryNames_throw(xSubQueries,_out_rNames,sTemp.makeStringAndClear());
+            else
+                _out_rNames.push_back( sTemp.makeStringAndClear() );
+        }
     }
 
     //------------------------------------------------------------------------
@@ -2707,7 +2729,7 @@ namespace pcr
 
             SvNumberFormatter* pFormatter = pSupplier->GetNumberFormatter();
             double dPreviewVal = OFormatSampleControl::getPreviewValue(pFormatter,nFormatKey);
-            SvxNumberInfoItem aFormatter( pFormatter, dPreviewVal, SID_ATTR_NUMBERFORMAT_INFO );
+            SvxNumberInfoItem aFormatter( pFormatter, dPreviewVal, String( PcrRes( RID_STR_TEXT_FORMAT ) ), SID_ATTR_NUMBERFORMAT_INFO );
             aCoreSet.Put( aFormatter );
 
             // a tab dialog with a single page
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index dfe976e6de75..ea724c61828c 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -235,6 +235,15 @@ namespace pcr
         */
         void impl_fillQueryNames_throw( ::std::vector< ::rtl::OUString >& _out_rNames ) const;
 
+        /** describes the UI for selecting a query name
+
+            @precond
+                m_xRowSetConnection is not <NULL/>
+        */
+        void impl_fillQueryNames_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xQueryNames
+                    ,::std::vector< ::rtl::OUString >& _out_rNames
+                    ,const ::rtl::OUString& _sName = ::rtl::OUString() ) const;
+
         /** describes the UI for selecting a ListSource (for list-like form controls)
             @precond
                 ->m_xRowSetConnection is not <NULL/>
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/propctrlr/propres.src b/extensions/source/propctrlr/propres.src
index 2701c0e3a1df..23b11a932e34 100644
--- a/extensions/source/propctrlr/propres.src
+++ b/extensions/source/propctrlr/propres.src
@@ -61,3 +61,8 @@ String RID_EMBED_IMAGE_PLACEHOLDER
 {
     Text [ en-US ] = "<Embedded-Image>";
 };
+
+String RID_STR_TEXT_FORMAT
+{
+    Text [ en-US ] = "Text";
+};
diff --git a/extensions/source/propctrlr/propresid.hrc b/extensions/source/propctrlr/propresid.hrc
index bdf79c7d5c81..5328617735a9 100644
--- a/extensions/source/propctrlr/propresid.hrc
+++ b/extensions/source/propctrlr/propresid.hrc
@@ -42,6 +42,7 @@
 #define RID_STR_PROPPAGE_DEFAULT            ( RID_PROPCONTROLLER_START +  1 )
 #define RID_STR_PROPPAGE_DATA               ( RID_PROPCONTROLLER_START +  2 )
 #define RID_STR_HELP_SECTION_LABEL          ( RID_PROPCONTROLLER_START +  3 )
-#define RID_EMBED_IMAGE_PLACEHOLDER          ( RID_PROPCONTROLLER_START +  5 )
+#define RID_EMBED_IMAGE_PLACEHOLDER         ( RID_PROPCONTROLLER_START +  4 )
+#define RID_STR_TEXT_FORMAT                 ( RID_PROPCONTROLLER_START +  5 )
 
 #endif // EXTENSIONS_PROPRESID_HRC
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 3bbc8dd7d7b7..e168fd0da830 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/util/Time.hpp>
 #include "modulepcr.hxx"
 #include "propresid.hrc"
+
 //............................................................................
 namespace pcr
 {
@@ -115,39 +116,52 @@ namespace pcr
             getTypedControlWindow()->SetFormatKey( nFormatKey );
 
             SvNumberFormatter* pNF = getTypedControlWindow()->GetFormatter();
-            getTypedControlWindow()->SetValue( getPreviewValue(pNF,getTypedControlWindow()->GetFormatKey()) );
+            const SvNumberformat* pEntry = pNF->GetEntry( nFormatKey );
+            OSL_ENSURE( pEntry, "OFormatSampleControl::setValue: invalid format entry!" );
+
+            const bool bIsTextFormat = ( pEntry && pEntry->IsTextFormat() );
+            if ( bIsTextFormat )
+                getTypedControlWindow()->SetText( String( PcrRes( RID_STR_TEXT_FORMAT ) ) );
+            else
+                getTypedControlWindow()->SetValue( pEntry ? getPreviewValue( *pEntry ) : 1234.56789 );
         }
         else
             getTypedControlWindow()->SetText( String() );
     }
     //------------------------------------------------------------------
+    double OFormatSampleControl::getPreviewValue( const SvNumberformat& i_rEntry )
+    {
+        double nValue = 1234.56789;
+        switch ( i_rEntry.GetType() & ~NUMBERFORMAT_DEFINED )
+        {
+            case NUMBERFORMAT_DATE:
+                {
+                    Date aCurrentDate;
+                    static ::com::sun::star::util::Date STANDARD_DB_DATE(30,12,1899);
+                    nValue = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(static_cast<sal_Int32>(aCurrentDate.GetDate())),STANDARD_DB_DATE);
+                }
+                break;
+            case NUMBERFORMAT_TIME:
+            case NUMBERFORMAT_DATETIME:
+                {
+                    Time aCurrentTime;
+                    nValue = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(aCurrentTime.GetTime()));
+                }
+                break;
+            default:
+                break;
+        }
+        return nValue;
+    }
+
+    //------------------------------------------------------------------
     double OFormatSampleControl::getPreviewValue(SvNumberFormatter* _pNF,sal_Int32 _nFormatKey)
     {
         const SvNumberformat* pEntry = _pNF->GetEntry(_nFormatKey);
         DBG_ASSERT( pEntry, "OFormattedNumericControl::SetFormatDescription: invalid format key!" );
         double nValue = 1234.56789;
         if ( pEntry )
-        {
-            switch (pEntry->GetType() & ~NUMBERFORMAT_DEFINED)
-            {
-                case NUMBERFORMAT_DATE:
-                    {
-                        Date aCurrentDate;
-                        static ::com::sun::star::util::Date STANDARD_DB_DATE(30,12,1899);
-                        nValue = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(static_cast<sal_Int32>(aCurrentDate.GetDate())),STANDARD_DB_DATE);
-                    }
-                    break;
-                case NUMBERFORMAT_TIME:
-                case NUMBERFORMAT_DATETIME:
-                    {
-                        Time aCurrentTime;
-                        nValue = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(aCurrentTime.GetTime()));
-                    }
-                    break;
-                default:
-                    break;
-            }
-        }
+            nValue = getPreviewValue( *pEntry );
         return nValue;
     }
     //------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index 88bb20223516..82835d1df16e 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -87,6 +87,9 @@ namespace pcr
         * \return current date or time or the value 1234.56789
         */
         static double getPreviewValue(SvNumberFormatter* _pNF,sal_Int32 _nFormatKey);
+
+    private:
+        static double getPreviewValue( const SvNumberformat& i_rEntry );
     };
 
     //========================================================================
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)