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

35 files changed, 21 insertions, 148 deletions

diff --git a/filter/source/config/cache/exports.map b/filter/source/config/cache/exports.map
deleted file mode 100644
index 85610ad80888..000000000000
--- a/filter/source/config/cache/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-            GetVersionInfo;
-            component_getImplementationEnvironment;
-            component_getFactory;
-            component_writeInfo;
-
-    local:
-            *;
-};
diff --git a/filter/source/config/cache/makefile.mk b/filter/source/config/cache/makefile.mk
index 50ef0c73a03a..611a0cc65346 100644
--- a/filter/source/config/cache/makefile.mk
+++ b/filter/source/config/cache/makefile.mk
@@ -76,7 +76,7 @@ DEF1NAME=       $(SHL1TARGET)
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
 SHL1DEPN=
 SHL1IMPLIB=     i$(SHL1TARGET)
-SHL1VERSIONMAP= exports.map
+SHL1VERSIONMAP= $(SOLARENV)/src/component.map
 
 # --- Targets ----------------------------------
 
diff --git a/filter/source/flash/exports.map b/filter/source/flash/exports.map
deleted file mode 100644
index ebfdcf95c118..000000000000
--- a/filter/source/flash/exports.map
+++ /dev/null
@@ -1,9 +0,0 @@
-FLASH_1_0 {
-        global:
-                component_getImplementationEnvironment;
-                component_getFactory;
-                component_writeInfo;
-
-        local:
-                *;
-};
diff --git a/filter/source/flash/makefile.mk b/filter/source/flash/makefile.mk
index d544921f40cd..a3dd74ebc2e1 100644
--- a/filter/source/flash/makefile.mk
+++ b/filter/source/flash/makefile.mk
@@ -90,7 +90,7 @@ SHL1STDLIBS+=\
 
 SHL1DEPN=
 SHL1IMPLIB=	i$(SHL1TARGET)
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
diff --git a/filter/source/msfilter/powerpoint/exports.map b/filter/source/msfilter/powerpoint/exports.map
deleted file mode 100644
index a7e1e75c930a..000000000000
--- a/filter/source/msfilter/powerpoint/exports.map
+++ /dev/null
@@ -1,9 +0,0 @@
-PPTIMPORTER_1_0 {
-        global:
-                component_getImplementationEnvironment;
-                component_getFactory;
-                component_writeInfo;
-
-        local:
-                *;
-};
\ No newline at end of file
diff --git a/filter/source/msfilter/powerpoint/makefile.mk b/filter/source/msfilter/powerpoint/makefile.mk
index 2326f6bcfea7..ede5fb21c01b 100644
--- a/filter/source/msfilter/powerpoint/makefile.mk
+++ b/filter/source/msfilter/powerpoint/makefile.mk
@@ -58,7 +58,7 @@ SHL1STDLIBS=\
 SHL1DEPN=
 SHL1IMPLIB=	i$(SHL1TARGET)
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=$(SHL1TARGET)
diff --git a/filter/source/pdf/exports.map b/filter/source/pdf/exports.map
deleted file mode 100644
index c673092ae700..000000000000
--- a/filter/source/pdf/exports.map
+++ /dev/null
@@ -1,9 +0,0 @@
-PDFFILTER_1_0 {
-        global:
-                component_getImplementationEnvironment;
-                component_getFactory;
-                component_writeInfo;
-
-        local:
-                *;
-}; 
\ No newline at end of file
diff --git a/filter/source/pdf/makefile.mk b/filter/source/pdf/makefile.mk
index 5c4064d02cbd..cb80df024de2 100644
--- a/filter/source/pdf/makefile.mk
+++ b/filter/source/pdf/makefile.mk
@@ -77,7 +77,7 @@ SHL1DEPN=
 SHL1IMPLIB=	i$(SHL1TARGET)
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/filter/source/placeware/makefile.mk b/filter/source/placeware/makefile.mk
index 6fdfe7ecb0fd..b02190f9c289 100644
--- a/filter/source/placeware/makefile.mk
+++ b/filter/source/placeware/makefile.mk
@@ -57,7 +57,7 @@ SHL1STDLIBS= \
         $(CPPULIB)		\
         $(CPPUHELPERLIB)	\
         $(SALLIB)
-SHL1VERSIONMAP=$(TARGET).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 SHL1DEPN=
 SHL1IMPLIB=	i$(TARGET)
diff --git a/filter/source/placeware/placeware.map b/filter/source/placeware/placeware.map
deleted file mode 100644
index ac2c3750bfe0..000000000000
--- a/filter/source/placeware/placeware.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/filter/source/svg/exports.map b/filter/source/svg/exports.map
deleted file mode 100644
index c673092ae700..000000000000
--- a/filter/source/svg/exports.map
+++ /dev/null
@@ -1,9 +0,0 @@
-PDFFILTER_1_0 {
-        global:
-                component_getImplementationEnvironment;
-                component_getFactory;
-                component_writeInfo;
-
-        local:
-                *;
-}; 
\ No newline at end of file
diff --git a/filter/source/svg/makefile.mk b/filter/source/svg/makefile.mk
index 17b999ce29bb..598d106b8932 100644
--- a/filter/source/svg/makefile.mk
+++ b/filter/source/svg/makefile.mk
@@ -76,7 +76,7 @@ SHL1STDLIBS+=\
 SHL1DEPN=
 SHL1IMPLIB=	i$(SHL1TARGET)
 SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
 
 DEF1NAME=$(SHL1TARGET)
diff --git a/filter/source/t602/makefile.mk b/filter/source/t602/makefile.mk
index eb183798f4a2..ed048c5d39a3 100644
--- a/filter/source/t602/makefile.mk
+++ b/filter/source/t602/makefile.mk
@@ -51,7 +51,7 @@ SHL1TARGETDEPN=makefile.mk
 SHL1OBJS=$(SLOFILES)
 SHL1TARGET=$(LIBNAME)$(DLLPOSTFIX)
 SHL1IMPLIB=i$(LIBNAME)
-SHL1VERSIONMAP=$(LIBNAME).map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 #SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/filter/source/t602/t602filter.map b/filter/source/t602/t602filter.map
deleted file mode 100644
index ea06e33d056c..000000000000
--- a/filter/source/t602/t602filter.map
+++ /dev/null
@@ -1,8 +0,0 @@
-T602IMP_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};
diff --git a/filter/source/xmlfilteradaptor/makefile.mk b/filter/source/xmlfilteradaptor/makefile.mk
index da4319036874..bd1dc91f0f9e 100644
--- a/filter/source/xmlfilteradaptor/makefile.mk
+++ b/filter/source/xmlfilteradaptor/makefile.mk
@@ -48,7 +48,7 @@ CDEFS+=-DCOMPMOD_NAMESPACE=framework
 SHL1TARGET=		xmlfa$(DLLPOSTFIX)
 SHL1IMPLIB=		i$(SHL1TARGET)
 
-SHL1VERSIONMAP= xmlfa.map
+SHL1VERSIONMAP= $(SOLARENV)/src/component.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=		$(SHL1TARGET)
 
diff --git a/filter/source/xmlfilteradaptor/xmlfa.map b/filter/source/xmlfilteradaptor/xmlfa.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/filter/source/xmlfilteradaptor/xmlfa.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/filter/source/xmlfilterdetect/makefile.mk b/filter/source/xmlfilterdetect/makefile.mk
index 05195af889b1..3f350d9caa0b 100644
--- a/filter/source/xmlfilterdetect/makefile.mk
+++ b/filter/source/xmlfilterdetect/makefile.mk
@@ -49,7 +49,7 @@ CDEFS+=-DCOMPMOD_NAMESPACE=framework
 SHL1TARGET=		xmlfd$(DLLPOSTFIX)
 SHL1IMPLIB=		i$(SHL1TARGET)
 
-SHL1VERSIONMAP= xmlfd.map
+SHL1VERSIONMAP= $(SOLARENV)/src/component.map
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=		$(SHL1TARGET)
 
diff --git a/filter/source/xmlfilterdetect/xmlfd.map b/filter/source/xmlfilterdetect/xmlfd.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/filter/source/xmlfilterdetect/xmlfd.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/filter/source/xsltfilter/exports.map b/filter/source/xsltfilter/exports.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/filter/source/xsltfilter/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/filter/source/xsltfilter/makefile.mk b/filter/source/xsltfilter/makefile.mk
index 1746abe0431d..2e48e018ac36 100644
--- a/filter/source/xsltfilter/makefile.mk
+++ b/filter/source/xsltfilter/makefile.mk
@@ -48,7 +48,7 @@ SHL1TARGETDEPN=makefile.mk
 SHL1OBJS=$(SLOFILES)
 SHL1TARGET=$(LIBNAME)$(DLLPOSTFIX)
 SHL1IMPLIB=i$(LIBNAME)
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/hwpfilter/source/hwp.map b/hwpfilter/source/hwp.map
deleted file mode 100644
index ac2c3750bfe0..000000000000
--- a/hwpfilter/source/hwp.map
+++ /dev/null
@@ -1,8 +0,0 @@
-UDK_3_0_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-    *;
-};
diff --git a/hwpfilter/source/makefile.mk b/hwpfilter/source/makefile.mk
index 91dcc3d6b4ca..dca3b9c69603 100644
--- a/hwpfilter/source/makefile.mk
+++ b/hwpfilter/source/makefile.mk
@@ -92,7 +92,7 @@ SHL1STDLIBS+= \
 
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
 SHL1LIBS=   $(SLB)$/$(TARGET).lib
-SHL1VERSIONMAP = hwp.map
+SHL1VERSIONMAP = $(SOLARENV)/src/component.map
 
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/unoxml/source/rdf/makefile.mk b/unoxml/source/rdf/makefile.mk
index 298c1dcdae25..c763183b805f 100644
--- a/unoxml/source/rdf/makefile.mk
+++ b/unoxml/source/rdf/makefile.mk
@@ -62,7 +62,7 @@ SHL1OBJS=   $(SLOFILES)
 SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB= i$(TARGET)
 
-SHL1VERSIONMAP=../service/exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/unoxml/source/service/exports.map b/unoxml/source/service/exports.map
deleted file mode 100644
index ba501f9ae076..000000000000
--- a/unoxml/source/service/exports.map
+++ /dev/null
@@ -1,10 +0,0 @@
-UDK_3_0_0 {
-    global:
-        GetVersionInfo;
-        component_getImplementationEnvironment;
-        component_getFactory;
-        component_writeInfo;
-
-    local:
-        *;
-};
diff --git a/unoxml/source/service/makefile.mk b/unoxml/source/service/makefile.mk
index e86e07f1c89e..8d7aa85156fc 100644
--- a/unoxml/source/service/makefile.mk
+++ b/unoxml/source/service/makefile.mk
@@ -57,7 +57,7 @@ SHL1OBJS=   $(SLOFILES)
 SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
 SHL1IMPLIB= i$(TARGET)
 
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/unoxml/test/export.map b/unoxml/test/export.map
index bfd13f454044..9979a3bad75b 100644
--- a/unoxml/test/export.map
+++ b/unoxml/test/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.1 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/writerfilter/qa/cppunittests/doctok/export.map b/writerfilter/qa/cppunittests/doctok/export.map
index 4ca70fa85463..879fa8953788 100644
--- a/writerfilter/qa/cppunittests/doctok/export.map
+++ b/writerfilter/qa/cppunittests/doctok/export.map
@@ -1,4 +1,4 @@
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/writerfilter/qa/cppunittests/odiapi/export.map b/writerfilter/qa/cppunittests/odiapi/export.map
index 4f4704fc5e88..9979a3bad75b 100644
--- a/writerfilter/qa/cppunittests/odiapi/export.map
+++ b/writerfilter/qa/cppunittests/odiapi/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/writerfilter/qa/cppunittests/qname/export.map b/writerfilter/qa/cppunittests/qname/export.map
index 4f4704fc5e88..9979a3bad75b 100644
--- a/writerfilter/qa/cppunittests/qname/export.map
+++ b/writerfilter/qa/cppunittests/qname/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/writerfilter/qa/cppunittests/sl/export.map b/writerfilter/qa/cppunittests/sl/export.map
index 4f4704fc5e88..9979a3bad75b 100644
--- a/writerfilter/qa/cppunittests/sl/export.map
+++ b/writerfilter/qa/cppunittests/sl/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/writerfilter/qa/cppunittests/xxml/export.map b/writerfilter/qa/cppunittests/xxml/export.map
index 4f4704fc5e88..9979a3bad75b 100644
--- a/writerfilter/qa/cppunittests/xxml/export.map
+++ b/writerfilter/qa/cppunittests/xxml/export.map
@@ -29,7 +29,7 @@
 #
 #*************************************************************************
 
-UDK_3.0 {
+UDK_3_0_0 {
     global:
         registerAllTestFunction;
 
diff --git a/writerfilter/util/exports.map b/writerfilter/util/exports.map
deleted file mode 100644
index be4802aef7ab..000000000000
--- a/writerfilter/util/exports.map
+++ /dev/null
@@ -1,9 +0,0 @@
-WFT_1_0 {
-   global:
-       component_getImplementationEnvironment;
-       component_writeInfo;
-       component_getFactory;
-   local:
-       *;
-};
-
diff --git a/writerfilter/util/makefile.mk b/writerfilter/util/makefile.mk
index 4e99764c688f..8ff01237f32b 100644
--- a/writerfilter/util/makefile.mk
+++ b/writerfilter/util/makefile.mk
@@ -70,7 +70,7 @@ SHL1STDLIBS=\
 SHL1DEPN=
 SHL1IMPLIB= i$(SHL1TARGET)
 SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP=exports.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 
 DEF1NAME=$(SHL1TARGET)
 
diff --git a/writerperfect/util/makefile.mk b/writerperfect/util/makefile.mk
index 4da935247054..dca29e005287 100644
--- a/writerperfect/util/makefile.mk
+++ b/writerperfect/util/makefile.mk
@@ -39,7 +39,7 @@ SHL1STDLIBS+= \
 SHL1TARGET = wpft$(DLLPOSTFIX)
 SHL1IMPLIB = i$(SHL1TARGET)
 SHL1LIBS = $(LIB1TARGET)
-SHL1VERSIONMAP=wpft.map
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 DEF1NAME=$(SHL1TARGET)
 
 .INCLUDE :  target.mk
diff --git a/writerperfect/util/wpft.map b/writerperfect/util/wpft.map
deleted file mode 100644
index 7152f7ebd013..000000000000
--- a/writerperfect/util/wpft.map
+++ /dev/null
@@ -1,8 +0,0 @@
-WPFT_1_0 {
-    global:
-        component_getImplementationEnvironment;
-        component_writeInfo;
-        component_getFactory;
-    local:
-        *;
-};