[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - connectivity/source lingucomponent/source sdext/source ucb/source

[Michael Stahl]

 connectivity/source/drivers/mozab/makefile.mk      |    8 ++++++++
 connectivity/source/drivers/mozab/mozabdrv.map     |    8 ++++++++
 lingucomponent/source/languageguessing/makefile.mk |    7 +++++--
 sdext/source/pdfimport/makefile.mk                 |    4 ++++
 sdext/source/presenter/makefile.mk                 |    4 ++++
 ucb/source/ucp/cmis/makefile.mk                    |    4 ++++
 6 files changed, 33 insertions(+), 2 deletions(-)

New commits:
commit deb6451f3bbc44afe4a798e0fd28ab395bea840a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Dec 15 15:44:24 2011 +0100

    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 5f1799f5.

diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk
index a99e1f4..2e2e22e 100644
--- a/lingucomponent/source/languageguessing/makefile.mk
+++ b/lingucomponent/source/languageguessing/makefile.mk
@@ -70,13 +70,16 @@ SHL1STDLIBS= \
         $(UNOTOOLSLIB)
 
 # build DLL
+.IF "$(GUI)"=="WNT"
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
+.ELSE # just a quick hack for GCC fdo#42865
+SHL1USE_EXPORTS = name
+.ENDIF
 SHL1LIBS=       $(SLB)$/$(TARGET).lib
 SHL1IMPLIB=     i$(TARGET)
 SHL1DEPN=       $(SHL1LIBS)
 SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
 
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
 # build DEF file
 DEF1NAME    =$(SHL1TARGET)
 DEF1EXPORTFILE= exports.dxp
commit 7eaf07eea371fadbc48c4d59c8b49bf8daf2eb6a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Dec 15 14:32:40 2011 +0100

    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.
    (cherry picked from commit 5bb7eea39420c79ee72b7559f4e3d90d1abb4994)

diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 07e6dcc..d1d4873 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 0000000..a431a07
--- /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 9262ef6..641e90f 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 a0d8d0f..5606c42 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -109,7 +109,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 be4a36c..1af7c20 100644
--- a/ucb/source/ucp/cmis/makefile.mk
+++ b/ucb/source/ucp/cmis/makefile.mk
@@ -71,7 +71,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