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

66 files changed, 50 insertions, 187 deletions

diff --git a/basebmp/test/export.map b/basebmp/test/export.map
index bec25dde11..fd7e0db7b4 100644
--- a/basebmp/test/export.map
+++ b/basebmp/test/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         cppunitTestPlugIn;
 
diff --git a/basegfx/test/export.map b/basegfx/test/export.map
index b9c3a8de8c..39608fbaf8 100644
--- a/basegfx/test/export.map
+++ b/basegfx/test/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         cppunitTestPlugIn;
 
diff --git a/canvas/source/cairo/exports.map b/canvas/source/cairo/exports.map
deleted file mode 100644
index 4101b0d761..0000000000
--- a/canvas/source/cairo/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-CAN_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk
index 27a1aeb6dc..1c88f6e501 100644
--- a/canvas/source/cairo/makefile.mk
+++ b/canvas/source/cairo/makefile.mk
@@ -125,7 +125,7 @@ SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
diff --git a/canvas/source/factory/canvasfactory.map b/canvas/source/factory/canvasfactory.map
deleted file mode 100644
index 44fb01f371..0000000000
--- a/canvas/source/factory/canvasfactory.map
+++ /dev/null
@@ -1,8 +0,0 @@
-CAN_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/canvas/source/factory/makefile.mk b/canvas/source/factory/makefile.mk
index 1051b953ae..af43916b0b 100644
--- a/canvas/source/factory/makefile.mk
+++ b/canvas/source/factory/makefile.mk
@@ -47,7 +47,7 @@ SHL1STDLIBS = \
         $(CPPULIB) \
         $(CPPUHELPERLIB) \
         $(SALLIB)
-SHL1VERSIONMAP = canvasfactory.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 
 SHL1DEPN =
 SHL1IMPLIB = i$(TARGET)
diff --git a/canvas/source/null/exports.map b/canvas/source/null/exports.map
deleted file mode 100644
index 4101b0d761..0000000000
--- a/canvas/source/null/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-CAN_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/canvas/source/null/makefile.mk b/canvas/source/null/makefile.mk
index 99a6bbab93..834b75e5a2 100644
--- a/canvas/source/null/makefile.mk
+++ b/canvas/source/null/makefile.mk
@@ -64,7 +64,7 @@ SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
diff --git a/canvas/source/simplecanvas/exports.map b/canvas/source/simplecanvas/exports.map
deleted file mode 100644
index 4101b0d761..0000000000
--- a/canvas/source/simplecanvas/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-CAN_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/canvas/source/simplecanvas/makefile.mk b/canvas/source/simplecanvas/makefile.mk
index c0a60250ab..3f045775ef 100644
--- a/canvas/source/simplecanvas/makefile.mk
+++ b/canvas/source/simplecanvas/makefile.mk
@@ -56,7 +56,7 @@ SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
diff --git a/canvas/source/vcl/exports.map b/canvas/source/vcl/exports.map
deleted file mode 100644
index 4101b0d761..0000000000
--- a/canvas/source/vcl/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-CAN_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/canvas/source/vcl/makefile.mk b/canvas/source/vcl/makefile.mk
index fdfdd62d16..96a2688e13 100644
--- a/canvas/source/vcl/makefile.mk
+++ b/canvas/source/vcl/makefile.mk
@@ -79,7 +79,7 @@ SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 DEF1NAME=$(SHL1TARGET)
 DEF1EXPORTFILE=exports.dxp
diff --git a/dtrans/source/generic/exports.map b/dtrans/source/generic/exports.map
deleted file mode 100644
index 28449cc0f4..0000000000
--- a/dtrans/source/generic/exports.map
+++ /dev/null
@@ -1,9 +0,0 @@
-DTRANS_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
-
diff --git a/dtrans/source/generic/makefile.mk b/dtrans/source/generic/makefile.mk
index aa856865a3..32386db107 100644
--- a/dtrans/source/generic/makefile.mk
+++ b/dtrans/source/generic/makefile.mk
@@ -50,7 +50,7 @@ SLOFILES= \
 
 SHL1TARGET= dtrans
 
-SHL1VERSIONMAP= exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1STDLIBS= \
         $(SALLIB)	\
diff --git a/dtrans/util/exports.map b/dtrans/util/exports.map
deleted file mode 100644
index 7c56baa9bd..0000000000
--- a/dtrans/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/dtrans/util/makefile.mk b/dtrans/util/makefile.mk
index 2e96661376..255f772113 100644
--- a/dtrans/util/makefile.mk
+++ b/dtrans/util/makefile.mk
@@ -68,7 +68,7 @@ SHL1IMPLIB=i$(SHL1TARGET)
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=		$(SHL1TARGET)
 DEF1EXPORTFILE=	exports.dxp
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 
 .IF "$(GUI)"=="WNT"
diff --git a/goodies/source/filter.vcl/egif/exports.map b/goodies/source/filter.vcl/egif/exports.map
index 10820132c0..61e4682c65 100644
--- a/goodies/source/filter.vcl/egif/exports.map
+++ b/goodies/source/filter.vcl/egif/exports.map
@@ -1,4 +1,4 @@
-GIFEXPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicExport;
                 DoExportDialog;
diff --git a/goodies/source/filter.vcl/eos2met/exports.map b/goodies/source/filter.vcl/eos2met/exports.map
index ce76d38500..61e4682c65 100644
--- a/goodies/source/filter.vcl/eos2met/exports.map
+++ b/goodies/source/filter.vcl/eos2met/exports.map
@@ -1,4 +1,4 @@
-METEXPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicExport;
                 DoExportDialog;
diff --git a/goodies/source/filter.vcl/epbm/exports.map b/goodies/source/filter.vcl/epbm/exports.map
index 2d09b0bdb7..61e4682c65 100644
--- a/goodies/source/filter.vcl/epbm/exports.map
+++ b/goodies/source/filter.vcl/epbm/exports.map
@@ -1,4 +1,4 @@
-PBMEXPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicExport;
                 DoExportDialog;
diff --git a/goodies/source/filter.vcl/epgm/exports.map b/goodies/source/filter.vcl/epgm/exports.map
index 3967c4684f..61e4682c65 100644
--- a/goodies/source/filter.vcl/epgm/exports.map
+++ b/goodies/source/filter.vcl/epgm/exports.map
@@ -1,4 +1,4 @@
-PGMEXPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicExport;
                 DoExportDialog;
diff --git a/goodies/source/filter.vcl/epict/exports.map b/goodies/source/filter.vcl/epict/exports.map
index 2f21c5c04b..61e4682c65 100644
--- a/goodies/source/filter.vcl/epict/exports.map
+++ b/goodies/source/filter.vcl/epict/exports.map
@@ -1,4 +1,4 @@
-PICTEXPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicExport;
                 DoExportDialog;
diff --git a/goodies/source/filter.vcl/eppm/exports.map b/goodies/source/filter.vcl/eppm/exports.map
index 0462b75b7b..61e4682c65 100644
--- a/goodies/source/filter.vcl/eppm/exports.map
+++ b/goodies/source/filter.vcl/eppm/exports.map
@@ -1,4 +1,4 @@
-PPMEXPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicExport;
                 DoExportDialog;
diff --git a/goodies/source/filter.vcl/eps/exports.map b/goodies/source/filter.vcl/eps/exports.map
index 1b61354c28..61e4682c65 100644
--- a/goodies/source/filter.vcl/eps/exports.map
+++ b/goodies/source/filter.vcl/eps/exports.map
@@ -1,4 +1,4 @@
-EPSEXPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicExport;
                 DoExportDialog;
diff --git a/goodies/source/filter.vcl/eras/exports.map b/goodies/source/filter.vcl/eras/exports.map
index 4a78a96ee9..d4e28c4470 100644
--- a/goodies/source/filter.vcl/eras/exports.map
+++ b/goodies/source/filter.vcl/eras/exports.map
@@ -1,4 +1,4 @@
-RASEXPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicExport;
 
diff --git a/goodies/source/filter.vcl/etiff/exports.map b/goodies/source/filter.vcl/etiff/exports.map
index 094e72c0f5..d4e28c4470 100644
--- a/goodies/source/filter.vcl/etiff/exports.map
+++ b/goodies/source/filter.vcl/etiff/exports.map
@@ -1,4 +1,4 @@
-TIFEXPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicExport;
 
diff --git a/goodies/source/filter.vcl/expm/exports.map b/goodies/source/filter.vcl/expm/exports.map
index f1f42312c8..d4e28c4470 100644
--- a/goodies/source/filter.vcl/expm/exports.map
+++ b/goodies/source/filter.vcl/expm/exports.map
@@ -1,4 +1,4 @@
-XPMEXPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicExport;
 
diff --git a/goodies/source/filter.vcl/icgm/exports.map b/goodies/source/filter.vcl/icgm/exports.map
index eaa1db885d..cc7f07dd11 100644
--- a/goodies/source/filter.vcl/icgm/exports.map
+++ b/goodies/source/filter.vcl/icgm/exports.map
@@ -1,4 +1,4 @@
-CGMIMPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 ImportCGM;
 
diff --git a/goodies/source/filter.vcl/idxf/exports.map b/goodies/source/filter.vcl/idxf/exports.map
index d107435568..941e4ab9bd 100644
--- a/goodies/source/filter.vcl/idxf/exports.map
+++ b/goodies/source/filter.vcl/idxf/exports.map
@@ -1,4 +1,4 @@
-DXFIMPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicImport;
 
diff --git a/goodies/source/filter.vcl/ieps/exports.map b/goodies/source/filter.vcl/ieps/exports.map
index 59406d7255..941e4ab9bd 100644
--- a/goodies/source/filter.vcl/ieps/exports.map
+++ b/goodies/source/filter.vcl/ieps/exports.map
@@ -1,4 +1,4 @@
-EPSIMPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicImport;
 
diff --git a/goodies/source/filter.vcl/ios2met/exports.map b/goodies/source/filter.vcl/ios2met/exports.map
index 440afa9245..941e4ab9bd 100644
--- a/goodies/source/filter.vcl/ios2met/exports.map
+++ b/goodies/source/filter.vcl/ios2met/exports.map
@@ -1,4 +1,4 @@
-METIMPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicImport;
 
diff --git a/goodies/source/filter.vcl/ipbm/exports.map b/goodies/source/filter.vcl/ipbm/exports.map
index 0e2a1bcdec..941e4ab9bd 100644
--- a/goodies/source/filter.vcl/ipbm/exports.map
+++ b/goodies/source/filter.vcl/ipbm/exports.map
@@ -1,4 +1,4 @@
-PBMIMPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicImport;
 
diff --git a/goodies/source/filter.vcl/ipcd/exports.map b/goodies/source/filter.vcl/ipcd/exports.map
index a0719af28b..941e4ab9bd 100644
--- a/goodies/source/filter.vcl/ipcd/exports.map
+++ b/goodies/source/filter.vcl/ipcd/exports.map
@@ -1,4 +1,4 @@
-PCDIMPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicImport;
 
diff --git a/goodies/source/filter.vcl/ipcx/exports.map b/goodies/source/filter.vcl/ipcx/exports.map
index d44f79111a..941e4ab9bd 100644
--- a/goodies/source/filter.vcl/ipcx/exports.map
+++ b/goodies/source/filter.vcl/ipcx/exports.map
@@ -1,4 +1,4 @@
-PCXIMPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicImport;
 
diff --git a/goodies/source/filter.vcl/ipict/exports.map b/goodies/source/filter.vcl/ipict/exports.map
index 2576cecdca..941e4ab9bd 100644
--- a/goodies/source/filter.vcl/ipict/exports.map
+++ b/goodies/source/filter.vcl/ipict/exports.map
@@ -1,4 +1,4 @@
-PICTIMPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicImport;
 
diff --git a/goodies/source/filter.vcl/ipsd/exports.map b/goodies/source/filter.vcl/ipsd/exports.map
index b2cda91bec..941e4ab9bd 100644
--- a/goodies/source/filter.vcl/ipsd/exports.map
+++ b/goodies/source/filter.vcl/ipsd/exports.map
@@ -1,4 +1,4 @@
-PSDIMPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicImport;
 
diff --git a/goodies/source/filter.vcl/iras/exports.map b/goodies/source/filter.vcl/iras/exports.map
index ebd8464837..941e4ab9bd 100644
--- a/goodies/source/filter.vcl/iras/exports.map
+++ b/goodies/source/filter.vcl/iras/exports.map
@@ -1,4 +1,4 @@
-RASIMPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicImport;
 
diff --git a/goodies/source/filter.vcl/itga/exports.map b/goodies/source/filter.vcl/itga/exports.map
index cb127f330e..941e4ab9bd 100644
--- a/goodies/source/filter.vcl/itga/exports.map
+++ b/goodies/source/filter.vcl/itga/exports.map
@@ -1,4 +1,4 @@
-TGAIMPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicImport;
 
diff --git a/goodies/source/filter.vcl/itiff/exports.map b/goodies/source/filter.vcl/itiff/exports.map
index 983df22340..941e4ab9bd 100644
--- a/goodies/source/filter.vcl/itiff/exports.map
+++ b/goodies/source/filter.vcl/itiff/exports.map
@@ -1,4 +1,4 @@
-TIFIMPORTER_1_0 {
+UDK_3_0_0 {
         global:
                 GraphicImport;
 
diff --git a/i18npool/source/breakiterator/data/dict.map b/i18npool/source/breakiterator/data/dict.map
index 271ba8b2b8..ebd4f9185d 100644
--- a/i18npool/source/breakiterator/data/dict.map
+++ b/i18npool/source/breakiterator/data/dict.map
@@ -1,4 +1,4 @@
-OOO_1.1 {
+UDK_3_0_0 {
 global:
     GetVersionInfo;
     getDataArea;
diff --git a/i18npool/source/collator/data/collator_data.map b/i18npool/source/collator/data/collator_data.map
index 09f298912e..412635f19e 100644
--- a/i18npool/source/collator/data/collator_data.map
+++ b/i18npool/source/collator/data/collator_data.map
@@ -1,4 +1,4 @@
-OOO_1.1 {
+UDK_3_0_0 {
 global:
     GetVersionInfo;
     get_zh_charset;
diff --git a/i18npool/source/indexentry/data/index_data.map b/i18npool/source/indexentry/data/index_data.map
index b9add8b3a6..30d03853d6 100644
--- a/i18npool/source/indexentry/data/index_data.map
+++ b/i18npool/source/indexentry/data/index_data.map
@@ -1,4 +1,4 @@
-OOO_1.1 {
+UDK_3_0_0 {
 global:
     GetVersionInfo;
     get_indexdata_ko_dict;
diff --git a/i18npool/source/localedata/data/localedata_en.map b/i18npool/source/localedata/data/localedata_en.map
index 10e5a998c9..ab13f03374 100644
--- a/i18npool/source/localedata/data/localedata_en.map
+++ b/i18npool/source/localedata/data/localedata_en.map
@@ -1,4 +1,4 @@
-OOO_1.1 {
+UDK_3_0_0 {
 global:
 GetVersionInfo;
 getAllCalendars_en_AU;
diff --git a/i18npool/source/localedata/data/localedata_es.map b/i18npool/source/localedata/data/localedata_es.map
index edcdd4e153..7743539232 100644
--- a/i18npool/source/localedata/data/localedata_es.map
+++ b/i18npool/source/localedata/data/localedata_es.map
@@ -1,4 +1,4 @@
-OOO_1.1 {
+UDK_3_0_0 {
 global:
 GetVersionInfo;
 getAllCalendars_es_AR;
diff --git a/i18npool/source/localedata/data/localedata_euro.map b/i18npool/source/localedata/data/localedata_euro.map
index 1a28eb537b..e64bf08261 100644
--- a/i18npool/source/localedata/data/localedata_euro.map
+++ b/i18npool/source/localedata/data/localedata_euro.map
@@ -1,4 +1,4 @@
-OOO_1.1 {
+UDK_3_0_0 {
 global:
 GetVersionInfo;
 getAllCalendars_ast_ES;
diff --git a/i18npool/source/localedata/data/localedata_others.map b/i18npool/source/localedata/data/localedata_others.map
index a8212624e8..7a4fa6cd07 100644
--- a/i18npool/source/localedata/data/localedata_others.map
+++ b/i18npool/source/localedata/data/localedata_others.map
@@ -1,4 +1,4 @@
-OOO_1.1 {
+UDK_3_0_0 {
 global:
 getAllCalendars_af_NA;
 getAllCalendars_af_ZA;
diff --git a/i18npool/source/search/i18nsearch.map b/i18npool/source/search/i18nsearch.map
deleted file mode 100644
index 02fe32ac58..0000000000
--- a/i18npool/source/search/i18nsearch.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-global:
-    GetVersionInfo;
-    component_getImplementationEnvironment;
-    component_getFactory;
-    component_writeInfo;
-
-local:
-    *;
-};
diff --git a/i18npool/source/search/makefile.mk b/i18npool/source/search/makefile.mk
index 2e81ec3f1d..ad10347bff 100644
--- a/i18npool/source/search/makefile.mk
+++ b/i18npool/source/search/makefile.mk
@@ -72,7 +72,7 @@ SHL1STDLIBS= \
                 $(I18NREGEXPLIB)
 
 SHL1DEPN=		makefile.mk
-SHL1VERSIONMAP= i18nsearch.map
+SHL1VERSIONMAP= $(SOLARENV)/src/component.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=		$(SHL1TARGET)
 
diff --git a/i18npool/source/textconversion/data/textconv_dict.map b/i18npool/source/textconversion/data/textconv_dict.map
index 03f9073c5d..afd873b6f3 100644
--- a/i18npool/source/textconversion/data/textconv_dict.map
+++ b/i18npool/source/textconversion/data/textconv_dict.map
@@ -1,4 +1,4 @@
-OOO_1.1 {
+UDK_3_0_0 {
 global:
     GetVersionInfo;
     getHangul2HanjaData;
diff --git a/i18npool/util/i18npool.map b/i18npool/util/i18npool.map
deleted file mode 100644
index 02fe32ac58..0000000000
--- a/i18npool/util/i18npool.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-global:
-    GetVersionInfo;
-    component_getImplementationEnvironment;
-    component_getFactory;
-    component_writeInfo;
-
-local:
-    *;
-};
diff --git a/i18npool/util/makefile.mk b/i18npool/util/makefile.mk
index 582089a309..6ea6ab1fd2 100644
--- a/i18npool/util/makefile.mk
+++ b/i18npool/util/makefile.mk
@@ -64,7 +64,7 @@ SHL1IMPLIB= i$(SHL1TARGET)
 
 SHL1DEPN=	makefile.mk \
         $(SLB)/i18nisolang$(ISOLANG_MAJOR)$(COMID).lib
-SHL1VERSIONMAP=$(PRJNAME).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/o3tl/qa/export.map b/o3tl/qa/export.map
index bec25dde11..fd7e0db7b4 100644
--- a/o3tl/qa/export.map
+++ b/o3tl/qa/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         cppunitTestPlugIn;
 
diff --git a/svl/qa/complex/ConfigItems/helper/exports.map b/svl/qa/complex/ConfigItems/helper/exports.map
deleted file mode 100644
index 85610ad808..0000000000
--- a/svl/qa/complex/ConfigItems/helper/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-            GetVersionInfo;
-            component_getImplementationEnvironment;
-            component_getFactory;
-            component_writeInfo;
-
-    local:
-            *;
-};
diff --git a/svl/qa/complex/ConfigItems/helper/makefile.mk b/svl/qa/complex/ConfigItems/helper/makefile.mk
index d41fe6c129..c0557afac2 100644
--- a/svl/qa/complex/ConfigItems/helper/makefile.mk
+++ b/svl/qa/complex/ConfigItems/helper/makefile.mk
@@ -73,7 +73,7 @@ SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=       $(SHL1TARGET)
 
-SHL1VERSIONMAP= exports.map
+SHL1VERSIONMAP= $(SOLARENV)/src/component.map
 
 # --- Targets ------------------------------------------------------
 
diff --git a/svl/source/fsstor/exports.map b/svl/source/fsstor/exports.map
deleted file mode 100644
index f4ed78b9e9..0000000000
--- a/svl/source/fsstor/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/svl/source/fsstor/makefile.mk b/svl/source/fsstor/makefile.mk
index 7f46009750..a4b5e5d7fc 100644
--- a/svl/source/fsstor/makefile.mk
+++ b/svl/source/fsstor/makefile.mk
@@ -60,7 +60,7 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
diff --git a/svl/source/passwordcontainer/exports.map b/svl/source/passwordcontainer/exports.map
deleted file mode 100644
index f4ed78b9e9..0000000000
--- a/svl/source/passwordcontainer/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/svl/source/passwordcontainer/makefile.mk b/svl/source/passwordcontainer/makefile.mk
index 3c74246ee3..e9dd4b68e2 100644
--- a/svl/source/passwordcontainer/makefile.mk
+++ b/svl/source/passwordcontainer/makefile.mk
@@ -56,7 +56,7 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
diff --git a/svtools/source/hatchwindow/exports.map b/svtools/source/hatchwindow/exports.map
deleted file mode 100644
index f4ed78b9e9..0000000000
--- a/svtools/source/hatchwindow/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/svtools/source/hatchwindow/makefile.mk b/svtools/source/hatchwindow/makefile.mk
index 8366763a81..6b99aa8484 100644
--- a/svtools/source/hatchwindow/makefile.mk
+++ b/svtools/source/hatchwindow/makefile.mk
@@ -59,7 +59,7 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
diff --git a/svtools/source/productregistration/exports.map b/svtools/source/productregistration/exports.map
deleted file mode 100644
index f4ed78b9e9..0000000000
--- a/svtools/source/productregistration/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/svtools/source/productregistration/makefile.mk b/svtools/source/productregistration/makefile.mk
index 1892f1600d..86bfd4308e 100644
--- a/svtools/source/productregistration/makefile.mk
+++ b/svtools/source/productregistration/makefile.mk
@@ -63,7 +63,7 @@ SHL1STDLIBS=\
     $(CPPULIB) \
     $(SALLIB)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=	$(SHL1TARGET)
 
diff --git a/svtools/workben/unodialog/makefile.mk b/svtools/workben/unodialog/makefile.mk
index c6cd6e5d84..9ad708884b 100644
--- a/svtools/workben/unodialog/makefile.mk
+++ b/svtools/workben/unodialog/makefile.mk
@@ -60,7 +60,7 @@ SLOFILES=   $(SLO)$/unodialogsample.obj \
 # --- library -----------------------------------
 
 SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1STDLIBS= \
         $(CPPULIB)          \
diff --git a/svtools/workben/unodialog/udlg.map b/svtools/workben/unodialog/udlg.map
deleted file mode 100644
index 276f9673d0..0000000000
--- a/svtools/workben/unodialog/udlg.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDLG_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/tools/test/export.map b/tools/test/export.map
index 0809f76d5c..fcbe221c99 100644
--- a/tools/test/export.map
+++ b/tools/test/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/ucbhelper/workben/myucp/exports.map b/ucbhelper/workben/myucp/exports.map
deleted file mode 100644
index f4ed78b9e9..0000000000
--- a/ucbhelper/workben/myucp/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/ucbhelper/workben/myucp/makefile.mk b/ucbhelper/workben/myucp/makefile.mk
index ca6b3f941b..256bd6946d 100644
--- a/ucbhelper/workben/myucp/makefile.mk
+++ b/ucbhelper/workben/myucp/makefile.mk
@@ -72,7 +72,7 @@ LIB1OBJFILES=$(SLOFILES)
 
 SHL1TARGET=$(TARGET)
 SHL1IMPLIB=i$(TARGET)
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 # @@@ Add additional libs here.
 SHL1STDLIBS=\