10 files changed, 8 insertions, 49 deletions
diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk
index 0e11dc46aa24..ae787f82c226 100644
--- a/starmath/util/makefile.mk
+++ b/starmath/util/makefile.mk
@@ -52,7 +52,7 @@ RESLIB1SRSFILES=\
 SHL1TARGET= sm$(DLLPOSTFIX)
 SHL1IMPLIB= smimp
 
-SHL1VERSIONMAP= sm.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=		$(SHL1TARGET)
 
@@ -76,7 +76,7 @@ SHL1STDLIBS= \
 
 SHL2TARGET= smd$(DLLPOSTFIX)
 SHL2IMPLIB= smdimp
-SHL2VERSIONMAP= sm.map
+SHL2VERSIONMAP=$(SOLARENV)/src/component.map
 SHL2DEF=$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=		$(SHL2TARGET)
 
@@ -93,7 +93,7 @@ SHL2STDLIBS= \
             $(SALLIB)
 
 SHL2DEPN=	makefile.mk
-SHL2VERSIONMAP= smd.map
+SHL2VERSIONMAP=$(SOLARENV)/src/component.map
 SHL2OBJS=   $(SLO)$/smdetect.obj \
             $(SLO)$/detreg.obj \
             $(SLO)$/eqnolefilehdr.obj
diff --git a/starmath/util/sm.map b/starmath/util/sm.map
deleted file mode 100644
index 62f014e12ba0..000000000000
--- a/starmath/util/sm.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SM_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/starmath/util/smd.map b/starmath/util/smd.map
deleted file mode 100644
index 62f014e12ba0..000000000000
--- a/starmath/util/smd.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SM_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/sw/qa/core/export.map b/sw/qa/core/export.map
index ab2e7cd007b0..df94ae98ee5c 100644
--- a/sw/qa/core/export.map
+++ b/sw/qa/core/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/sw/util/makefile.mk b/sw/util/makefile.mk
index 08afadc10698..c2ab9f87018b 100644
--- a/sw/util/makefile.mk
+++ b/sw/util/makefile.mk
@@ -138,7 +138,7 @@ DEFLIB1NAME=swall $(SWLIBFILES:b)
 
 SHL2TARGET= swd$(DLLPOSTFIX)
 SHL2IMPLIB= swdimp
-SHL2VERSIONMAP= swd.map
+SHL2VERSIONMAP=$(SOLARENV)/src/component.map
 SHL2DEF=$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=       $(SHL2TARGET)
 
@@ -345,7 +345,7 @@ TARGET_VBA=vbaswobj
 SHL5TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno
 SHL5IMPLIB=     i$(TARGET_VBA)
 
-SHL5VERSIONMAP=$(TARGET_VBA).map
+SHL5VERSIONMAP=$(SOLARENV)/src/component.map
 SHL5DEF=$(MISC)$/$(SHL5TARGET).def
 DEF5NAME=$(SHL5TARGET)
 SHL5STDLIBS= \
diff --git a/sw/util/msword.map b/sw/util/msword.map
index db60fc5ce8c8..16b9d25b0b78 100755..100644
--- a/sw/util/msword.map
+++ b/sw/util/msword.map
@@ -1,4 +1,4 @@
-MSWORD_1_0 {
+UDK_3_0_0 {
         global:
                 ImportRTF;
                 ExportRTF;
diff --git a/sw/util/sw.map b/sw/util/sw.map
deleted file mode 100644
index 272fab31a03d..000000000000
--- a/sw/util/sw.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SW_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/sw/util/swd.map b/sw/util/swd.map
deleted file mode 100644
index 272fab31a03d..000000000000
--- a/sw/util/swd.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SW_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/sw/util/swui.map b/sw/util/swui.map
index f40bd255fe1d..ad5e33836c7c 100644
--- a/sw/util/swui.map
+++ b/sw/util/swui.map
@@ -1,4 +1,4 @@
-SWUI_1_0 {
+UDK_3_0_0 {
     global:
     CreateDialogFactory;
     local:
diff --git a/sw/util/vbaswobj.map b/sw/util/vbaswobj.map
deleted file mode 100644
index 737cddbfe3df..000000000000
--- a/sw/util/vbaswobj.map
+++ /dev/null
@@ -1,9 +0,0 @@
-OOO_1.1 {
-    global:
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};