sb118: #i108776# changed addsym.awk to also export STLport num_put symbols, and simplified it by requiring that first section is labeled UDK_3_0_0; adapted map files accordingly, replacing many individual ones with solenv/src templates

64 files changed, 41 insertions, 533 deletions

diff --git a/bridges/test/java_uno/acquire/makefile.mk b/bridges/test/java_uno/acquire/makefile.mk
index dc4ad8658db1..f4f0a070a301 100644
--- a/bridges/test/java_uno/acquire/makefile.mk
+++ b/bridges/test/java_uno/acquire/makefile.mk
@@ -47,7 +47,7 @@ SLOFILES = $(SLO)$/testacquire.obj
 SHL1TARGET = testacquire.uno
 SHL1OBJS = $(SLOFILES)
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
-SHL1VERSIONMAP = testacquire.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1IMPLIB = itestacquire
 
 JAVAFILES = TestAcquire.java
diff --git a/bridges/test/java_uno/acquire/testacquire.map b/bridges/test/java_uno/acquire/testacquire.map
deleted file mode 100644
index 227274db922d..000000000000
--- a/bridges/test/java_uno/acquire/testacquire.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3.1 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/bridges/test/java_uno/any/test_javauno_any.map b/bridges/test/java_uno/any/test_javauno_any.map
index 4959db8fccc8..c50f7b162db7 100644
--- a/bridges/test/java_uno/any/test_javauno_any.map
+++ b/bridges/test/java_uno/any/test_javauno_any.map
@@ -1,4 +1,4 @@
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         Java_test_java_1uno_anytest_TestJni_create_1jni_1transport;
     local:
diff --git a/bridges/test/java_uno/equals/makefile.mk b/bridges/test/java_uno/equals/makefile.mk
index f95f1c0adb14..2bf1ea1a2c8d 100644
--- a/bridges/test/java_uno/equals/makefile.mk
+++ b/bridges/test/java_uno/equals/makefile.mk
@@ -54,7 +54,7 @@ SLOFILES = $(SLO)$/testequals.obj
 SHL1TARGET = testequals.uno
 SHL1OBJS = $(SLOFILES)
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
-SHL1VERSIONMAP = testequals.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1IMPLIB = itestequals
 
 JAVAFILES = TestEquals.java
diff --git a/bridges/test/java_uno/equals/testequals.map b/bridges/test/java_uno/equals/testequals.map
deleted file mode 100644
index 227274db922d..000000000000
--- a/bridges/test/java_uno/equals/testequals.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3.1 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-    local:
-        *;
-};
diff --git a/cli_ure/source/native/msvc.map b/cli_ure/source/native/msvc.map
index 2fba6b6d3e7e..429f750cc2b0 100644
--- a/cli_ure/source/native/msvc.map
+++ b/cli_ure/source/native/msvc.map
@@ -1,4 +1,4 @@
-UDK_3.1 {
+UDK_3_0_0 {
     global:
 
     local:
diff --git a/cppuhelper/qa/ifcontainer/export.map b/cppuhelper/qa/ifcontainer/export.map
index 4ca70fa85463..879fa8953788 100644
--- a/cppuhelper/qa/ifcontainer/export.map
+++ b/cppuhelper/qa/ifcontainer/export.map
@@ -1,4 +1,4 @@
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/cppuhelper/qa/propertysetmixin/comp.map b/cppuhelper/qa/propertysetmixin/comp.map
deleted file mode 100644
index a8e5ed605cf1..000000000000
--- a/cppuhelper/qa/propertysetmixin/comp.map
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: comp.map,v $
-#
-# $Revision: 1.3 $
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/cppuhelper/qa/propertysetmixin/makefile.mk b/cppuhelper/qa/propertysetmixin/makefile.mk
index fa3db612928b..bfd10bf02ee2 100644
--- a/cppuhelper/qa/propertysetmixin/makefile.mk
+++ b/cppuhelper/qa/propertysetmixin/makefile.mk
@@ -54,20 +54,15 @@ INCPRE += -I$(MISC)/$(TARGET)/inc
 
 SHL1TARGET = $(TARGET)
 SHL1OBJS = $(SLO)/test_propertysetmixin.obj
+SHL1VERSIONMAP = test.map
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(CPPUNITLIB) $(SALLIB)
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1RPATH = NONE
 DEF1NAME = $(SHL1TARGET)
 
-.IF "$(COMNAME)" == "gcc3"
-SHL1VERSIONMAP = test.gcc3.map
-.ELSE
-SHL1VERSIONMAP = test.map
-.ENDIF
-
 SHL2TARGET = $(TARGET).uno
 SHL2OBJS = $(SLO)/comp_propertysetmixin.obj
-SHL2VERSIONMAP = comp.map
+SHL2VERSIONMAP = $(SOLARENV)/src/component.map
 SHL2STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL2IMPLIB = i$(SHL2TARGET)
 SH21RPATH = NONE
diff --git a/cppuhelper/qa/propertysetmixin/test.gcc3.map b/cppuhelper/qa/propertysetmixin/test.gcc3.map
deleted file mode 100644
index 246034ea6792..000000000000
--- a/cppuhelper/qa/propertysetmixin/test.gcc3.map
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-#   OpenOffice.org - a multi-platform office productivity suite
-#
-#   $RCSfile: test.gcc3.map,v $
-#
-#   $Revision: 1.2 $
-#
-#   last change: $Author: ihi $ $Date: 2008-04-24 16:58:39 $
-#
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
-#
-#
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library 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 for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        cppunitTestPlugIn;
-
-        _ZN4_STL7num_put*; # STLport
-
-    local:
-        *;
-};
diff --git a/cppuhelper/qa/unourl/export.map b/cppuhelper/qa/unourl/export.map
index 4ca70fa85463..879fa8953788 100644
--- a/cppuhelper/qa/unourl/export.map
+++ b/cppuhelper/qa/unourl/export.map
@@ -1,4 +1,4 @@
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/cppuhelper/test/cfg_test.map b/cppuhelper/test/cfg_test.map
deleted file mode 100644
index ac2c3750bfe0..000000000000
--- a/cppuhelper/test/cfg_test.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/io/source/TextInputStream/makefile.mk b/io/source/TextInputStream/makefile.mk
index 1fb5aa33743a..5c2457eab3a7 100644
--- a/io/source/TextInputStream/makefile.mk
+++ b/io/source/TextInputStream/makefile.mk
@@ -44,7 +44,7 @@ SLOFILES= \
     $(SLO)$/TextInputStream.obj
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = tinstrm.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB)	\
diff --git a/io/source/TextInputStream/tinstrm.map b/io/source/TextInputStream/tinstrm.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/io/source/TextInputStream/tinstrm.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/io/source/TextOutputStream/makefile.mk b/io/source/TextOutputStream/makefile.mk
index 7a4c0d6ba37f..3c8a4aef87b8 100644
--- a/io/source/TextOutputStream/makefile.mk
+++ b/io/source/TextOutputStream/makefile.mk
@@ -45,7 +45,7 @@ SLOFILES= \
     $(SLO)$/TextOutputStream.obj
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = toutstrm.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB)	\
diff --git a/io/source/TextOutputStream/toutstrm.map b/io/source/TextOutputStream/toutstrm.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/io/source/TextOutputStream/toutstrm.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/io/source/acceptor/acceptor.map b/io/source/acceptor/acceptor.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/io/source/acceptor/acceptor.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/io/source/acceptor/makefile.mk b/io/source/acceptor/makefile.mk
index 843f26296dae..9e3f74ead1e4 100644
--- a/io/source/acceptor/makefile.mk
+++ b/io/source/acceptor/makefile.mk
@@ -56,7 +56,7 @@ SLOFILES= \
         $(SLO)$/acc_socket.obj
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = acceptor.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 SHL1RPATH=URELIB
 
 SHL1STDLIBS= \
diff --git a/io/source/connector/connectr.map b/io/source/connector/connectr.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/io/source/connector/connectr.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/io/source/connector/makefile.mk b/io/source/connector/makefile.mk
index 471f6b9d258f..ec988b1bd620 100644
--- a/io/source/connector/makefile.mk
+++ b/io/source/connector/makefile.mk
@@ -56,7 +56,7 @@ SLOFILES= \
     $(SLO)$/ctr_socket.obj
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = connectr.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 SHL1RPATH=URELIB
 
 SHL1STDLIBS= \
diff --git a/io/source/stm/makefile.mk b/io/source/stm/makefile.mk
index 43b6f2566ddf..f443e07f90e9 100644
--- a/io/source/stm/makefile.mk
+++ b/io/source/stm/makefile.mk
@@ -57,7 +57,7 @@ SLOFILES = 	$(SLO)$/opipe.obj\
         $(SLO)$/opump.obj
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = stm.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB) 	 \
diff --git a/io/source/stm/stm.map b/io/source/stm/stm.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/io/source/stm/stm.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/javaunohelper/source/javaunohelper.map b/javaunohelper/source/javaunohelper.map
index a7bf6b0721af..dcbe0506ae77 100644
--- a/javaunohelper/source/javaunohelper.map
+++ b/javaunohelper/source/javaunohelper.map
@@ -1,4 +1,4 @@
-UDK_3.1 {
+UDK_3_0_0 {
     global:
     Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo;
     Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory;
diff --git a/jvmaccess/util/cc5_solaris_sparc.map b/jvmaccess/util/cc5_solaris_sparc.map
index 07c5a934b518..968be173e0a8 100644
--- a/jvmaccess/util/cc5_solaris_sparc.map
+++ b/jvmaccess/util/cc5_solaris_sparc.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         # jvmaccess/virtualmachine.hxx:
         __1cJjvmaccessOVirtualMachineLAttachGuardRCreationException2t6M_v_; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -56,7 +56,7 @@ UDK_3.2 {
         __1cJjvmaccesscQ__RTTI__1CpnJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException *
         __1cJjvmaccesscR__RTTI__1CpknJjvmaccessOVirtualMachineLAttachGuardRCreationException__; # RTTI for jvmaccess::VirtualMachine::AttachGuard::CreationException const *
         __1cJjvmaccessOVirtualMachine2t5B6MpnHJavaVM__ibpnHJNIEnv___v_; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *) #Nvariant 1
-} UDK_3.1;
+} UDK_3_0_0;
 
 UDK_3.3 {
     global:
diff --git a/jvmaccess/util/gcc3.map b/jvmaccess/util/gcc3.map
index 29a602c878f7..9c8401064685 100644
--- a/jvmaccess/util/gcc3.map
+++ b/jvmaccess/util/gcc3.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         # jvmaccess/virtualmachine.hxx:
         _ZN9jvmaccess14VirtualMachine11AttachGuard17CreationExceptionC1Ev; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -63,7 +63,7 @@ UDK_3.2 {
     # We put the '*' at the beginning because its unlikely that these symbols will ever be a postfix of another symbol.
         _*ZN9jvmaccess14VirtualMachineC1EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
         _*ZN9jvmaccess14VirtualMachineC2EP10_Jv_JavaVMibP10_Jv_JNIEnv; # jvmaccess::VirtualMachine::VirtualMachine(JavaVM *, int, bool, JNIEnv *)
-} UDK_3.1;
+} UDK_3_0_0;
 
 UDK_3.3 {
     global:
diff --git a/jvmaccess/util/msvc_win32_intel.map b/jvmaccess/util/msvc_win32_intel.map
index fd148b1892ba..4620b1caa940 100644
--- a/jvmaccess/util/msvc_win32_intel.map
+++ b/jvmaccess/util/msvc_win32_intel.map
@@ -1,4 +1,4 @@
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         # jvmaccess/virtualmachine.hxx:
         ??0CreationException@AttachGuard@VirtualMachine@jvmaccess@@QAE@XZ; # jvmaccess::VirtualMachine::AttachGuard::CreationException::CreationException()
@@ -15,7 +15,7 @@ UDK_3.1 {
 
 UDK_3.2 {
     global:
-} UDK_3.1;
+} UDK_3_0_0;
 
 UDK_3.3 {
     global:
diff --git a/remotebridges/source/bridge/makefile.mk b/remotebridges/source/bridge/makefile.mk
index 75b5f3a6152e..8ccebe70910d 100644
--- a/remotebridges/source/bridge/makefile.mk
+++ b/remotebridges/source/bridge/makefile.mk
@@ -47,7 +47,7 @@ SLOFILES= \
         $(SLO)$/bridge_connection.obj\
         $(SLO)$/bridge_provider.obj 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = remotebridge.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB)	\
diff --git a/remotebridges/source/bridge/remotebridge.map b/remotebridges/source/bridge/remotebridge.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/remotebridges/source/bridge/remotebridge.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/remotebridges/source/factory/brdgfctr.map b/remotebridges/source/factory/brdgfctr.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/remotebridges/source/factory/brdgfctr.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/remotebridges/source/factory/makefile.mk b/remotebridges/source/factory/makefile.mk
index 97eb02415a47..bdbaf3463998 100644
--- a/remotebridges/source/factory/makefile.mk
+++ b/remotebridges/source/factory/makefile.mk
@@ -47,7 +47,7 @@ SLOFILES= \
     $(SLO)$/bridgeimpl.obj 
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = brdgfctr.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB)	\
diff --git a/remotebridges/source/unourl_resolver/makefile.mk b/remotebridges/source/unourl_resolver/makefile.mk
index 81f8b1c67609..b0f584444c12 100644
--- a/remotebridges/source/unourl_resolver/makefile.mk
+++ b/remotebridges/source/unourl_resolver/makefile.mk
@@ -47,7 +47,7 @@ SLOFILES= \
         $(SLO)$/unourl_resolver.obj
 
 SHL1TARGET=	$(TARGET)
-SHL1VERSIONMAP = uuresolver.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(SALLIB)		\
diff --git a/remotebridges/source/unourl_resolver/uuresolver.map b/remotebridges/source/unourl_resolver/uuresolver.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/remotebridges/source/unourl_resolver/uuresolver.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/sal/qa/export.map b/sal/qa/export.map
index 9e347a81a1c3..5fcd70dc41f8 100755
--- a/sal/qa/export.map
+++ b/sal/qa/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         cppunitTestPlugIn;
 
diff --git a/sal/qa/osl/module/export_dll.map b/sal/qa/osl/module/export_dll.map
index 0b8a37c365e6..2c2ff37f651c 100644
--- a/sal/qa/osl/module/export_dll.map
+++ b/sal/qa/osl/module/export_dll.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         firstfunc;
 
diff --git a/sal/qa/rtl/textenc/gcc3_export.map b/sal/qa/rtl/textenc/gcc3_export.map
deleted file mode 100644
index 9d838c3df0e1..000000000000
--- a/sal/qa/rtl/textenc/gcc3_export.map
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: gcc3_export.map,v $
-#
-# $Revision: 1.3 $
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        registerAllTestFunction;
-
-        _ZN4_STL7num_put*; # STLport
-
-    local:
-        *;
-};
diff --git a/sal/qa/rtl/textenc/makefile.mk b/sal/qa/rtl/textenc/makefile.mk
index 31f700b7b96a..177ae7cf213d 100644
--- a/sal/qa/rtl/textenc/makefile.mk
+++ b/sal/qa/rtl/textenc/makefile.mk
@@ -51,11 +51,7 @@ SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL1IMPLIB= i$(SHL1TARGET)
 DEF1NAME    =$(SHL1TARGET)
-.IF "$(COMNAME)" == "gcc3"
-SHL1VERSIONMAP = gcc3_export.map
-.ELSE
 SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
-.ENDIF
 
 # END --------------------------------------------------------------
 
@@ -67,11 +63,7 @@ SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
 
 SHL2IMPLIB= i$(SHL2TARGET)
 DEF2NAME    =$(SHL2TARGET)
-.IF "$(COMNAME)" == "gcc3"
-SHL2VERSIONMAP = gcc3_export.map
-.ELSE
 SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
-.ENDIF
 
 # END --------------------------------------------------------------
 
diff --git a/salhelper/test/rtti/sols.map b/salhelper/test/rtti/sols.map
index 962d648475f4..babf2c901585 100644
--- a/salhelper/test/rtti/sols.map
+++ b/salhelper/test/rtti/sols.map
@@ -1,4 +1,4 @@
-SAMPLELIB {
+UDK_3_0_0 {
     global:
 GetVersionInfo;
 _fini;
diff --git a/stoc/source/corereflection/corefl.map b/stoc/source/corereflection/corefl.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/stoc/source/corereflection/corefl.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/stoc/source/corereflection/makefile.mk b/stoc/source/corereflection/makefile.mk
index ecfb94c312ac..542ea9257b16 100644
--- a/stoc/source/corereflection/makefile.mk
+++ b/stoc/source/corereflection/makefile.mk
@@ -59,7 +59,7 @@ NOOPTFILES += $(SLO)$/criface.obj
 .ENDIF
 
 SHL1TARGET=	$(TARGET)
-SHL1VERSIONMAP = corefl.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 SHL1STDLIBS= \
         $(CPPULIB)		\
         $(CPPUHELPERLIB)	\
diff --git a/stoc/source/inspect/introspection.map b/stoc/source/inspect/introspection.map
deleted file mode 100644
index c2806d230702..000000000000
--- a/stoc/source/inspect/introspection.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3.1 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/stoc/source/inspect/makefile.mk b/stoc/source/inspect/makefile.mk
index 1f60c8d308f5..2158d8fc6d18 100644
--- a/stoc/source/inspect/makefile.mk
+++ b/stoc/source/inspect/makefile.mk
@@ -54,7 +54,7 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB)	\
         $(SALLIB)
 
-SHL1VERSIONMAP = introspection.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1RPATH=URELIB
 
 SHL1DEPN=
diff --git a/stoc/source/invocation/inv.map b/stoc/source/invocation/inv.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/stoc/source/invocation/inv.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/stoc/source/invocation/makefile.mk b/stoc/source/invocation/makefile.mk
index 92740c6ec233..ecb042e6b7c8 100644
--- a/stoc/source/invocation/makefile.mk
+++ b/stoc/source/invocation/makefile.mk
@@ -54,7 +54,7 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB)	\
         $(SALLIB)
 
-SHL1VERSIONMAP = inv.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 SHL1DEPN=
 SHL1IMPLIB=	i$(TARGET)
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
diff --git a/stoc/source/invocation_adapterfactory/invadp.map b/stoc/source/invocation_adapterfactory/invadp.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/stoc/source/invocation_adapterfactory/invadp.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/stoc/source/invocation_adapterfactory/makefile.mk b/stoc/source/invocation_adapterfactory/makefile.mk
index 99d5cfdeafeb..568724bd86d8 100644
--- a/stoc/source/invocation_adapterfactory/makefile.mk
+++ b/stoc/source/invocation_adapterfactory/makefile.mk
@@ -54,7 +54,7 @@ SHL1STDLIBS=	\
         $(CPPUHELPERLIB)	\
         $(SALLIB)
 
-SHL1VERSIONMAP = invadp.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 SHL1RPATH=URELIB
 
 SHL1DEPN=
diff --git a/stoc/source/javaloader/javaloader.map b/stoc/source/javaloader/javaloader.map
deleted file mode 100644
index ac2c3750bfe0..000000000000
--- a/stoc/source/javaloader/javaloader.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/stoc/source/javaloader/makefile.mk b/stoc/source/javaloader/makefile.mk
index 2b29baa82cf4..bfd4e785607a 100644
--- a/stoc/source/javaloader/makefile.mk
+++ b/stoc/source/javaloader/makefile.mk
@@ -56,7 +56,7 @@ SHL1STDLIBS=\
         $(SALLIB) \
         $(JVMACCESSLIB)
 
-SHL1VERSIONMAP = javaloader.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1DEPN=		
 SHL1IMPLIB=		i$(TARGET)
 SHL1LIBS= 		$(SLB)$/$(TARGET).lib 
diff --git a/stoc/source/javavm/jen.map b/stoc/source/javavm/jen.map
deleted file mode 100644
index ac2c3750bfe0..000000000000
--- a/stoc/source/javavm/jen.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/stoc/source/javavm/makefile.mk b/stoc/source/javavm/makefile.mk
index ffd00418b050..90e61016cff9 100644
--- a/stoc/source/javavm/makefile.mk
+++ b/stoc/source/javavm/makefile.mk
@@ -58,7 +58,7 @@ SLOFILES= \
         $(SLO)$/interact.obj 
 
 SHL1TARGET= $(TARGET)
-SHL1VERSIONMAP = jen.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1STDLIBS= \
         $(CPPUHELPERLIB) 	\
         $(CPPULIB)	    	\
diff --git a/stoc/source/namingservice/makefile.mk b/stoc/source/namingservice/makefile.mk
index c5a975a3f4a3..60cbcd121797 100644
--- a/stoc/source/namingservice/makefile.mk
+++ b/stoc/source/namingservice/makefile.mk
@@ -54,7 +54,7 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB)	\
         $(SALLIB)
 
-SHL1VERSIONMAP = namingservice.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1DEPN=
 SHL1IMPLIB=	i$(TARGET)
diff --git a/stoc/source/namingservice/namingservice.map b/stoc/source/namingservice/namingservice.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/stoc/source/namingservice/namingservice.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/stoc/source/proxy_factory/makefile.mk b/stoc/source/proxy_factory/makefile.mk
index 53917afd466d..42464067d3df 100644
--- a/stoc/source/proxy_factory/makefile.mk
+++ b/stoc/source/proxy_factory/makefile.mk
@@ -49,7 +49,7 @@ SLOFILES= \
         $(SLO)$/proxyfac.obj
 
 SHL1TARGET=$(TARGET)
-SHL1VERSIONMAP = proxyfac.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
     $(CPPULIB)		\
diff --git a/stoc/source/proxy_factory/proxyfac.map b/stoc/source/proxy_factory/proxyfac.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/stoc/source/proxy_factory/proxyfac.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/stoc/test/registry_tdprovider/makefile.mk b/stoc/test/registry_tdprovider/makefile.mk
index 2571e503648a..e9295b6b172d 100644
--- a/stoc/test/registry_tdprovider/makefile.mk
+++ b/stoc/test/registry_tdprovider/makefile.mk
@@ -44,16 +44,11 @@ SLOFILES = $(SLO)$/testregistrytdprovider.obj
 
 SHL1TARGET = testregistrytdprovider.uno
 SHL1OBJS = $(SLOFILES)
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL1IMPLIB = itestregistrytdprovider
 DEF1NAME = $(SHL1TARGET)
 
-.IF "$(COMNAME)" == "gcc3"
-SHL1VERSIONMAP = testregistrytdprovider.gcc3.map
-.ELSE
-SHL1VERSIONMAP = testregistrytdprovider.map
-.ENDIF
-
 .INCLUDE: target.mk
 
 ALLTAR: test
diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map b/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map
deleted file mode 100644
index 8dde2c857ecf..000000000000
--- a/stoc/test/registry_tdprovider/testregistrytdprovider.gcc3.map
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: testregistrytdprovider.gcc3.map,v $
-#
-# $Revision: 1.3 $
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-
-        _ZN4_STL7num_put*; # STLport
-
-    local:
-        *;
-};
diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.map b/stoc/test/registry_tdprovider/testregistrytdprovider.map
deleted file mode 100644
index 278c9f82db17..000000000000
--- a/stoc/test/registry_tdprovider/testregistrytdprovider.map
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: testregistrytdprovider.map,v $
-#
-# $Revision: 1.4 $
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/stoc/test/tdmanager/makefile.mk b/stoc/test/tdmanager/makefile.mk
index 594cf1d94e51..6502b8010ebd 100644
--- a/stoc/test/tdmanager/makefile.mk
+++ b/stoc/test/tdmanager/makefile.mk
@@ -44,16 +44,11 @@ SLOFILES = $(SLO)$/testtdmanager.obj
 
 SHL1TARGET = testtdmanager.uno
 SHL1OBJS = $(SLOFILES)
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 SHL1STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
 SHL1IMPLIB = itesttdmanager
 DEF1NAME = $(SHL1TARGET)
 
-.IF "$(COMNAME)" == "gcc3"
-SHL1VERSIONMAP = testtdmanager.gcc3.map
-.ELSE
-SHL1VERSIONMAP = testtdmanager.map
-.ENDIF
-
 .INCLUDE: target.mk
 
 ALLTAR: test
diff --git a/stoc/test/tdmanager/testtdmanager.gcc3.map b/stoc/test/tdmanager/testtdmanager.gcc3.map
deleted file mode 100644
index 21b96547e640..000000000000
--- a/stoc/test/tdmanager/testtdmanager.gcc3.map
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: testtdmanager.gcc3.map,v $
-#
-# $Revision: 1.3 $
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-
-        _ZN4_STL7num_put*; # STLport
-
-    local:
-        *;
-};
diff --git a/stoc/test/tdmanager/testtdmanager.map b/stoc/test/tdmanager/testtdmanager.map
deleted file mode 100644
index ef5dfdf0e99d..000000000000
--- a/stoc/test/tdmanager/testtdmanager.map
+++ /dev/null
@@ -1,40 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: testtdmanager.map,v $
-#
-# $Revision: 1.4 $
-#
-# 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.
-#
-#*************************************************************************
-
-UDK_3_0_0 {
-    global:
-        component_getFactory;
-        component_getImplementationEnvironment;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/stoc/test/testsmgr_cpnt.map b/stoc/test/testsmgr_cpnt.map
index d8c4047c5603..ab5ed357b461 100644
--- a/stoc/test/testsmgr_cpnt.map
+++ b/stoc/test/testsmgr_cpnt.map
@@ -1,4 +1,4 @@
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         component_getImplementationEnvironment;
         component_writeInfo;
diff --git a/stoc/util/bootstrap.map b/stoc/util/bootstrap.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/stoc/util/bootstrap.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/stoc/util/makefile.mk b/stoc/util/makefile.mk
index aa0cb8f6e0ab..53703fe6f8a9 100644
--- a/stoc/util/makefile.mk
+++ b/stoc/util/makefile.mk
@@ -54,7 +54,7 @@ LIB1FILES=	$(SLB)$/bootstrap.lib \
         $(SLB)$/regtypeprov.lib \
         $(SLB)$/typemgr.lib
 
-SHL1VERSIONMAP = bootstrap.map
+SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL1STDLIBS= \
         $(CPPULIB)		\
@@ -79,7 +79,7 @@ LIB2FILES=	\
         $(SLB)$/typeconverter.lib \
         $(SLB)$/uriproc.lib 
 
-SHL2VERSIONMAP = stocservices.map
+SHL2VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
 SHL2STDLIBS= \
         $(CPPULIB)		\
diff --git a/stoc/util/stocservices.map b/stoc/util/stocservices.map
deleted file mode 100644
index 30c5bb729ac7..000000000000
--- a/stoc/util/stocservices.map
+++ /dev/null
@@ -1,9 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-        component_canUnload;
-    local:
-    *;
-};
diff --git a/ure/source/uretest/version.map b/ure/source/uretest/version.map
index e25f3015ec1f..9187dc717339 100644
--- a/ure/source/uretest/version.map
+++ b/ure/source/uretest/version.map
@@ -38,6 +38,8 @@ UDK_3_0_0 {
         _ZTI*;
         _ZTS*;
 
+        _ZN4_STL7num_put*; # for STLport
+
     local:
         *;
 };