From 6fd2d815174df8274153ddb7e99eab26ab7e563c Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 15 Dec 2011 14:32:40 +0100
Subject: fdo#43707: tweak workarounds for fdo#42865:

Apparently on Windows the SAL_DLLPUBLIC_EXPORT does not work for unknown
reasons, so use the old mapfiles on that platform.

Should fix regressions from 1fb5eb21, 48dbaa51, a9da5a0b.
---
 connectivity/source/drivers/mozab/makefile.mk  | 8 ++++++++
 connectivity/source/drivers/mozab/mozabdrv.map | 8 ++++++++
 sdext/source/pdfimport/makefile.mk             | 4 ++++
 sdext/source/presenter/makefile.mk             | 4 ++++
 ucb/source/ucp/cmis/makefile.mk                | 4 ++++
 5 files changed, 28 insertions(+)
 create mode 100644 connectivity/source/drivers/mozab/mozabdrv.map

diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 07e6dcce0b4a..d1d487344941 100755
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -85,7 +85,11 @@ SLOFILES=\
             
 # --- MOZAB BASE Library -----------------------------------
 
+.IF "$(GUI)"=="WNT"
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+.ELSE # just a quick hack for GCC fdo#42865
 SHL1USE_EXPORTS = name
+.ENDIF
 SHL1TARGET=	$(TARGET)$(DLLPOSTFIX)
 SHL1OBJS=$(SLOFILES)
 SHL1STDLIBS=\
@@ -145,7 +149,11 @@ DEPOBJFILES=$(SLO2FILES)
 
 # --- MOZAB BASE Library -----------------------------------
 
+.IF "$(GUI)"=="WNT"
+SHL2VERSIONMAP=$(TARGET2).map
+.ELSE # just a quick hack for GCC fdo#42865
 SHL2USE_EXPORTS = name
+.ENDIF
 SHL2NOCHECK=TRUE
 SHL2TARGET=	$(TARGET2)$(DLLPOSTFIX)
 SHL2OBJS=$(SLO2FILES)
diff --git a/connectivity/source/drivers/mozab/mozabdrv.map b/connectivity/source/drivers/mozab/mozabdrv.map
new file mode 100644
index 000000000000..a431a0737754
--- /dev/null
+++ b/connectivity/source/drivers/mozab/mozabdrv.map
@@ -0,0 +1,8 @@
+UDK_3_0_0 {
+    global:
+        OMozabConnection_CreateInstance;
+        OMozillaBootstrap_CreateInstance;
+        setMozabServiceFactory;
+    local:
+        *;
+};
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk
index 9262ef654dff..641e90fbcc94 100644
--- a/sdext/source/pdfimport/makefile.mk
+++ b/sdext/source/pdfimport/makefile.mk
@@ -91,7 +91,11 @@ SHL1STDLIBS=\
 SHL1DEPN=
 SHL1IMPLIB=	i$(SHL1TARGET)
 SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
+.IF "$(GUI)"=="WNT"
+SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map
+.ELSE # just a quick hack for GCC fdo#42865
 SHL1USE_EXPORTS = name
+.ENDIF
 SHL1RPATH=OXT
 
 DEF1NAME=$(SHL1TARGET)
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 6d9e5bb6f6c4..7d74d96420a8 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -108,7 +108,11 @@ SHL1DEPN=
 SHL1IMPLIB=		i$(SHL1TARGET)
 SHL1LIBS=		$(SLB)$/$(TARGET).lib
 SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
+.IF "$(GUI)"=="WNT"
+SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map
+.ELSE # just a quick hack for GCC fdo#42865
 SHL1USE_EXPORTS = name
+.ENDIF
 SHL1RPATH=      OXT
 DEF1NAME=		$(SHL1TARGET)
 
diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk
index a99d638dd340..4170bba84d40 100644
--- a/ucb/source/ucp/cmis/makefile.mk
+++ b/ucb/source/ucp/cmis/makefile.mk
@@ -70,7 +70,11 @@ SHL1STDLIBS = \
 
 SHL1TARGET = $(TARGET)
 
+.IF "$(GUI)"=="WNT"
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+.ELSE # just a quick hack for GCC fdo#42865
 SHL1USE_EXPORTS = name
+.ENDIF
 SHL1DEPN =
 SHL1IMPLIB = i$(TARGET)
 SHL1LIBS = $(SLB)$/$(TARGET).lib
-- 
cgit