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

19 files changed, 10 insertions, 97 deletions

diff --git a/chart2/source/controller/controller.map b/chart2/source/controller/controller.map
deleted file mode 100644
index ac2c3750bfe0..000000000000
--- a/chart2/source/controller/controller.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/chart2/source/controller/makefile.mk b/chart2/source/controller/makefile.mk
index 45060a60d297..06c4c903655c 100644
--- a/chart2/source/controller/makefile.mk
+++ b/chart2/source/controller/makefile.mk
@@ -104,7 +104,7 @@ SHL1STDLIBS=	$(CHARTTOOLS)		\
 #specifies the exported symbols for Windows only:
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP = controller.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 
 #--------definition file
 
diff --git a/chart2/source/model/makefile.mk b/chart2/source/model/makefile.mk
index 8fb1e9dc3bed..17c6824e5966 100644
--- a/chart2/source/model/makefile.mk
+++ b/chart2/source/model/makefile.mk
@@ -91,7 +91,7 @@ SHL1STDLIBS=	$(CHARTTOOLS) 		\
 #specifies the exported symbols for Windows only:
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP = model.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 
 #--------definition file
 
diff --git a/chart2/source/model/model.map b/chart2/source/model/model.map
deleted file mode 100644
index 07b1790d5754..000000000000
--- a/chart2/source/model/model.map
+++ /dev/null
@@ -1,8 +0,0 @@
-CHART_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/chart2/source/tools/tools.map b/chart2/source/tools/tools.map
deleted file mode 100644
index 07b1790d5754..000000000000
--- a/chart2/source/tools/tools.map
+++ /dev/null
@@ -1,8 +0,0 @@
-CHART_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/chart2/source/view/view.map b/chart2/source/view/view.map
deleted file mode 100644
index d86ffaa9bdd4..000000000000
--- a/chart2/source/view/view.map
+++ /dev/null
@@ -1,9 +0,0 @@
-CHART_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-
-    local:
-        *;
-};
diff --git a/sc/addin/rot13/exports.map b/sc/addin/rot13/exports.map
index fa447824beda..c662c9148aba 100644
--- a/sc/addin/rot13/exports.map
+++ b/sc/addin/rot13/exports.map
@@ -1,4 +1,4 @@
-SC_1_0 {
+UDK_3_0_0 {
     global:
         GetFunctionCount;
         GetFunctionData;
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index 3c51d15634de..7277e5218d46 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -142,7 +142,7 @@ LIB4FILES=	\
 
 SHL2TARGET= scd$(DLLPOSTFIX)
 SHL2IMPLIB= scdimp
-SHL2VERSIONMAP= scd.map
+SHL2VERSIONMAP=$(SOLARENV)/src/component.map
 SHL2DEF=$(MISC)$/$(SHL2TARGET).def
 DEF2NAME=		$(SHL2TARGET)
 
@@ -288,7 +288,7 @@ TARGET_VBA=vbaobj
 SHL9TARGET=$(TARGET_VBA)$(DLLPOSTFIX).uno
 SHL9IMPLIB=	i$(TARGET_VBA)
 
-SHL9VERSIONMAP=$(TARGET_VBA).map
+SHL9VERSIONMAP=$(SOLARENV)/src/component.map
 SHL9DEF=$(MISC)$/$(SHL9TARGET).def
 DEF9NAME=$(SHL9TARGET)
 .IF "$(VBA_EXTENSION)"=="YES"
diff --git a/sc/util/sc.map b/sc/util/sc.map
deleted file mode 100644
index bfd1401a7685..000000000000
--- a/sc/util/sc.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SC_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/sc/util/scd.map b/sc/util/scd.map
deleted file mode 100644
index bfd1401a7685..000000000000
--- a/sc/util/scd.map
+++ /dev/null
@@ -1,8 +0,0 @@
-SC_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/sc/util/scfilt.map b/sc/util/scfilt.map
index 589736f24eb1..642b8db15088 100644
--- a/sc/util/scfilt.map
+++ b/sc/util/scfilt.map
@@ -1,4 +1,4 @@
-SCFILT_1_0 {
+UDK_3_0_0 {
   global:
     ScFilterCreate;
   local:
diff --git a/sc/util/scui.map b/sc/util/scui.map
index f40bd255fe1d..ad5e33836c7c 100644
--- a/sc/util/scui.map
+++ b/sc/util/scui.map
@@ -1,4 +1,4 @@
-SWUI_1_0 {
+UDK_3_0_0 {
     global:
     CreateDialogFactory;
     local:
diff --git a/sc/util/vbaobj.map b/sc/util/vbaobj.map
deleted file mode 100644
index 737cddbfe3df..000000000000
--- a/sc/util/vbaobj.map
+++ /dev/null
@@ -1,9 +0,0 @@
-OOO_1.1 {
-    global:
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/scaddins/source/analysis/exports.map b/scaddins/source/analysis/exports.map
deleted file mode 100644
index 50dda088ac94..000000000000
--- a/scaddins/source/analysis/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-SC_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-
-    local:
-        *;
-};
-
diff --git a/scaddins/source/analysis/makefile.mk b/scaddins/source/analysis/makefile.mk
index e51d10825758..979360f052f7 100644
--- a/scaddins/source/analysis/makefile.mk
+++ b/scaddins/source/analysis/makefile.mk
@@ -113,7 +113,7 @@ SHL1STDLIBS= \
 
 SHL1DEPN=makefile.mk
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/scaddins/source/datefunc/exports.map b/scaddins/source/datefunc/exports.map
deleted file mode 100644
index 50dda088ac94..000000000000
--- a/scaddins/source/datefunc/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-SC_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-
-    local:
-        *;
-};
-
diff --git a/scaddins/source/datefunc/makefile.mk b/scaddins/source/datefunc/makefile.mk
index a626956044e1..563751538701 100644
--- a/scaddins/source/datefunc/makefile.mk
+++ b/scaddins/source/datefunc/makefile.mk
@@ -100,7 +100,7 @@ SHL1STDLIBS= \
 
 SHL1DEPN=makefile.mk
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/sccomp/source/solver/exports.map b/sccomp/source/solver/exports.map
deleted file mode 100644
index fe0280ec6c21..000000000000
--- a/sccomp/source/solver/exports.map
+++ /dev/null
@@ -1,9 +0,0 @@
-SOLVER_1_0 {
-        global:
-                component_getImplementationEnvironment;
-                component_getFactory;
-                component_writeInfo;
-
-        local:
-                *;
-};
diff --git a/sccomp/source/solver/makefile.mk b/sccomp/source/solver/makefile.mk
index 72cdad75d317..509dbe226832 100644
--- a/sccomp/source/solver/makefile.mk
+++ b/sccomp/source/solver/makefile.mk
@@ -64,7 +64,7 @@ SHL1STDLIBS=    $(COMPHELPERLIB)    \
 
 SHL1DEPN=       makefile.mk
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP= exports.map
+SHL1VERSIONMAP= $(SOLARENV)/src/component.map
 DEF1NAME=       $(SHL1TARGET)
 
 # --- Resources --------------------------------