diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-11-15 16:00:49 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-11-15 20:52:02 +0100 |
| commit | 1fb5eb2162d79a44f5bb90627c1ca340d1322129 (patch) | |
| tree | f67c1e90c71c41920c7e002fd42ca21728eee6f1 /sdext | |
| parent | 48dbaa517f1a72a9bf11fa4db7425510c86c677b (diff) | |
fdo#42865: sdext: no mapfile
In order to not have the offending local _ZNSs4_Rep20_S_empty_rep_storageE
symbol in PresenterScreen.uno.so and pdfimport.uno.so,
build them with hidden visibility.
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/pdfimport/makefile.mk | 3 | ||||
| -rw-r--r-- | sdext/source/pdfimport/services.cxx | 3 | ||||
| -rw-r--r-- | sdext/source/presenter/PresenterComponent.cxx | 5 | ||||
| -rw-r--r-- | sdext/source/presenter/makefile.mk | 3 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk index 8e0dfa0b48c2..64fc1af2feb0 100644 --- a/sdext/source/pdfimport/makefile.mk +++ b/sdext/source/pdfimport/makefile.mk @@ -30,6 +30,7 @@ PRJ=..$/.. PRJNAME=sdext TARGET=pdfimport ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ----------------------------------------------------- @@ -90,7 +91,7 @@ SHL1STDLIBS=\ SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map +SHL1USE_EXPORTS = name SHL1RPATH=OXT DEF1NAME=$(SHL1TARGET) diff --git a/sdext/source/pdfimport/services.cxx b/sdext/source/pdfimport/services.cxx index b158e4433500..c2c0270d69ec 100644 --- a/sdext/source/pdfimport/services.cxx +++ b/sdext/source/pdfimport/services.cxx @@ -121,7 +121,8 @@ namespace } } -extern "C" sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL +component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) { Reference< XRegistryKey > xRootKey( static_cast< XRegistryKey* >( pRegistryKey ) ); diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx index d59a5b5dd0b4..f40052b74d70 100644 --- a/sdext/source/presenter/PresenterComponent.cxx +++ b/sdext/source/presenter/PresenterComponent.cxx @@ -119,15 +119,12 @@ extern "C" return g_moduleCount.canUnload( &g_moduleCount , pTime ); } - sal_Bool SAL_CALL component_writeInfo( + SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey ) { return component_writeInfoHelper(pServiceManager, pRegistryKey, gServiceEntries); } - - - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 9ced62ec2dad..a085439a4db9 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -32,6 +32,7 @@ GEN_HID=FALSE EXTNAME=PresenterScreen ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # survive zip dependencies MAXLINELENGTH:=100000 @@ -108,7 +109,7 @@ SHL1DEPN= SHL1IMPLIB= i$(SHL1TARGET) SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map +SHL1USE_EXPORTS = name SHL1RPATH= OXT DEF1NAME= $(SHL1TARGET) |