mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#42865: sdext: no mapfile

Browse Source 
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.
This commit is contained in:
Michael Stahl
2011-11-15 16:00:49 +01:00
parent 48dbaa517f
commit 1fb5eb2162
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sdext/source/pdfimport/makefile.mk
View File

@@ -30,6 +30,7 @@ PRJ=..$/..
PRJNAME=sdext PRJNAME=sdext
TARGET=pdfimport TARGET=pdfimport
ENABLE_EXCEPTIONS=TRUE ENABLE_EXCEPTIONS=TRUE
VISIBILITY_HIDDEN=TRUE
# --- Settings ----------------------------------------------------- # --- Settings -----------------------------------------------------
@@ -90,7 +91,7 @@ SHL1STDLIBS=\
SHL1DEPN= SHL1DEPN=
SHL1IMPLIB= i$(SHL1TARGET) SHL1IMPLIB= i$(SHL1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEF= $(MISC)$/$(SHL1TARGET).def
SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map SHL1USE_EXPORTS = name
SHL1RPATH=OXT SHL1RPATH=OXT
DEF1NAME=$(SHL1TARGET) DEF1NAME=$(SHL1TARGET)

3
sdext/source/pdfimport/services.cxx
View File

@@ -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 ) ); Reference< XRegistryKey > xRootKey( static_cast< XRegistryKey* >( pRegistryKey ) );

5
sdext/source/presenter/PresenterComponent.cxx
View File

@@ -119,15 +119,12 @@ extern "C"
return g_moduleCount.canUnload( &g_moduleCount , pTime ); 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 ) void * pServiceManager, void * pRegistryKey )
{ {
return component_writeInfoHelper(pServiceManager, pRegistryKey, gServiceEntries); return component_writeInfoHelper(pServiceManager, pRegistryKey, gServiceEntries);
} }
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {

3
sdext/source/presenter/makefile.mk
View File

@@ -32,6 +32,7 @@ GEN_HID=FALSE
EXTNAME=PresenterScreen EXTNAME=PresenterScreen
ENABLE_EXCEPTIONS=TRUE ENABLE_EXCEPTIONS=TRUE
VISIBILITY_HIDDEN=TRUE
# survive zip dependencies # survive zip dependencies
MAXLINELENGTH:=100000 MAXLINELENGTH:=100000
@@ -108,7 +109,7 @@ SHL1DEPN=
SHL1IMPLIB= i$(SHL1TARGET) SHL1IMPLIB= i$(SHL1TARGET)
SHL1LIBS= $(SLB)$/$(TARGET).lib SHL1LIBS= $(SLB)$/$(TARGET).lib
SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEF= $(MISC)$/$(SHL1TARGET).def
SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map SHL1USE_EXPORTS = name
SHL1RPATH= OXT SHL1RPATH= OXT
DEF1NAME= $(SHL1TARGET) DEF1NAME= $(SHL1TARGET)