summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
Diffstat (limited to 'cppu')
-rw-r--r--cppu/inc/typelib/typedescription.h24
-rw-r--r--cppu/prj/d.lst3
-rw-r--r--cppu/source/typelib/static_types.cxx72
-rw-r--r--cppu/source/uno/lbmap.cxx22
-rw-r--r--cppu/util/extra.mk4
-rw-r--r--cppu/util/makefile.mk4
6 files changed, 6 insertions, 123 deletions
diff --git a/cppu/inc/typelib/typedescription.h b/cppu/inc/typelib/typedescription.h
index 80f8fdfcfdfa..6e188f934044 100644
--- a/cppu/inc/typelib/typedescription.h
+++ b/cppu/inc/typelib/typedescription.h
@@ -1144,30 +1144,6 @@ void SAL_CALL typelib_static_enum_type_init(
sal_Int32 nDefaultValue )
SAL_THROW_EXTERN_C();
-/** Inits incomplete static compound type reference. Thread synchronizes on typelib init mutex.
- All discriminants are handled as int64 values. The pDiscriminantTypeRef must be of
- type byte, short, ..., up to hyper.
-
- @param ppRef pointer to type reference pointer
- @param pTypeName name of union type
- @param pDiscriminantType discriminant type
- @param nDefaultDiscriminant default discriminant
- @param pDefaultType default value type of union
- @param nMembers number of union members
- @param pDiscriminants member discriminants
- @param pMemberTypes member types
-*/
-void SAL_CALL typelib_static_union_type_init(
- typelib_TypeDescriptionReference ** ppRef,
- const sal_Char * pTypeName,
- typelib_TypeDescriptionReference * pDiscriminantType,
- sal_Int64 nDefaultDiscriminant,
- typelib_TypeDescriptionReference * pDefaultType,
- sal_Int32 nMembers,
- sal_Int64 * pDiscriminants,
- typelib_TypeDescriptionReference ** pMemberTypes )
- SAL_THROW_EXTERN_C();
-
/** Completes a typedescription to be used for, e.g., marshalling values. COMPOUND, UNION,
INTERFACE and ENUM type descriptions may be partly initialized (see typelib_static_...(),
typelib_TypeDescription::bComplete). For interface type descriptions, this will also
diff --git a/cppu/prj/d.lst b/cppu/prj/d.lst
index f019d78ad661..3355b6dc2c52 100644
--- a/cppu/prj/d.lst
+++ b/cppu/prj/d.lst
@@ -59,7 +59,7 @@ mkdir: %_DEST%\inc%_EXT%\uno
..\%__SRC%\lib\ipurpenvhelper* %_DEST%\lib%_EXT%\*
..\%__SRC%\bin\purpe*.dll %_DEST%\bin%_EXT%\*
-..\%__SRC%\lib\libuno_purpenvhelper* %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\libuno_purpenvhelper*.*.* %_DEST%\lib%_EXT%\*
..\%__SRC%\bin\unsafe_u*.dll %_DEST%\bin%_EXT%\*
..\%__SRC%\lib\libunsafe_uno_uno.* %_DEST%\lib%_EXT%\*
@@ -68,3 +68,4 @@ mkdir: %_DEST%\inc%_EXT%\uno
..\%__SRC%\lib\libaffine_uno_uno.* %_DEST%\lib%_EXT%\*
linklib: libuno_cppu.*.*
+linklib: libuno_purpenvhelper*.*.*
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index f0787c19ae5c..c1221e4e84a3 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -671,78 +671,6 @@ void SAL_CALL typelib_static_array_type_init(
}
}
-//##################################################################################################
-void SAL_CALL typelib_static_union_type_init(
- typelib_TypeDescriptionReference ** ppRef,
- const sal_Char * pTypeName,
- typelib_TypeDescriptionReference * pDiscriminantTypeRef,
- sal_Int64 nDefaultDiscriminant,
- typelib_TypeDescriptionReference * pDefaultTypeRef,
- sal_Int32 nMembers,
- sal_Int64 * pDiscriminants,
- typelib_TypeDescriptionReference ** pMemberTypes )
- SAL_THROW_EXTERN_C()
-{
- if (! *ppRef)
- {
- MutexGuard aGuard( typelib_StaticInitMutex::get() );
- if (! *ppRef)
- {
- OSL_ASSERT( ! TYPELIB_TYPEDESCRIPTIONREFERENCE_ISREALLYWEAK(typelib_TypeClass_UNION) );
- OUString aTypeName( OUString::createFromAscii( pTypeName ) );
- *ppRef = igetTypeByName( aTypeName.pData );
- if (!*ppRef)
- {
- typelib_UnionTypeDescription * pUnion = 0;
- ::typelib_typedescription_newEmpty(
- (typelib_TypeDescription **)&pUnion, typelib_TypeClass_UNION, aTypeName.pData );
- // discriminant type
- ::typelib_typedescriptionreference_acquire( pUnion->pDiscriminantTypeRef = pDiscriminantTypeRef );
-
- sal_Int32 nPos;
-
- pUnion->nMembers = nMembers;
- // default discriminant
- if (nMembers)
- {
- pUnion->pDiscriminants = new sal_Int64[ nMembers ];
- for ( nPos = nMembers; nPos--; )
- {
- pUnion->pDiscriminants[nPos] = pDiscriminants[nPos];
- }
- }
- // default default discriminant
- pUnion->nDefaultDiscriminant = nDefaultDiscriminant;
-
- // union member types
- pUnion->ppTypeRefs = new typelib_TypeDescriptionReference *[ nMembers ];
- for ( nPos = nMembers; nPos--; )
- {
- ::typelib_typedescriptionreference_acquire(
- pUnion->ppTypeRefs[nPos] = pMemberTypes[nPos] );
- }
-
- // default union type
- ::typelib_typedescriptionreference_acquire( pUnion->pDefaultTypeRef = pDefaultTypeRef );
-
- typelib_TypeDescription * pReg = (typelib_TypeDescription *)pUnion;
-
- pReg->pWeakRef = (typelib_TypeDescriptionReference *)pReg;
- pReg->nSize = typelib_typedescription_getAlignedUnoSize( pReg, 0, pReg->nAlignment );
- pReg->nAlignment = adjustAlignment( pReg->nAlignment );
- pReg->bComplete = sal_False;
-
- ::typelib_typedescription_register( &pReg );
- *ppRef = (typelib_TypeDescriptionReference *)pReg;
- OSL_ASSERT( *ppRef == pReg->pWeakRef );
- }
-#ifndef CPPU_LEAK_STATIC_DATA
- // another static ref
- ++((*ppRef)->nStaticRefCount);
-#endif
- }
- }
-}
} // extern "C"
}
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 91eefb4097b1..131f5c8b137e 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -164,29 +164,7 @@ struct MappingsData
Mutex aNegativeLibsMutex;
t_OUStringSet aNegativeLibs;
- ~MappingsData() SAL_THROW( () );
};
-//__________________________________________________________________________________________________
-MappingsData::~MappingsData() SAL_THROW( () )
-{
-#if OSL_DEBUG_LEVEL > 1
- OSL_ENSURE( aName2Entry.empty() && aMapping2Entry.empty(), "### unrevoked mappings!" );
- t_OUString2Entry::const_iterator iPos( aName2Entry.begin() );
- while (iPos != aName2Entry.end())
- {
- MappingEntry * pEntry = (*iPos).second;
- OString aName( OUStringToOString( pEntry->aMappingName, RTL_TEXTENCODING_ASCII_US ) );
- OSL_TRACE( "### unrevoked mapping: %s", aName.getStr() );
- ++iPos;
- }
- OSL_ENSURE( aCallbacks.empty(), "### callbacks left!" );
- if (aCallbacks.size())
- {
- OString aSize( OString::valueOf( (sal_Int32)aCallbacks.size() ) );
- OSL_TRACE( "### %d unrevoked callbacks", aSize.getStr() );
- }
-#endif
-}
//--------------------------------------------------------------------------------------------------
static MappingsData & getMappingsData() SAL_THROW( () )
{
diff --git a/cppu/util/extra.mk b/cppu/util/extra.mk
index cc18523b92b9..dc06e9284e72 100644
--- a/cppu/util/extra.mk
+++ b/cppu/util/extra.mk
@@ -46,7 +46,7 @@ USE_DEFFILE :=TRUE
SHL3TARGET := unsafe_uno_uno
SHL3IMPLIB := i$(SHL3TARGET)
-SHL3STDLIBS := $(purpenv_helper_LIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
+SHL3STDLIBS := $(purpenv_helper_LIB) $(SALLIB)
SHL3OBJS := $(SLO)$/UnsafeBridge.obj
.IF "$(GUI)"=="OS2"
SHL3VERSIONMAP=unsafe_os2.map
@@ -60,7 +60,7 @@ SHL3RPATH := URELIB
SHL4TARGET := affine_uno_uno
SHL4IMPLIB := i$(SHL4TARGET)
-SHL4STDLIBS := $(purpenv_helper_LIB) $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
+SHL4STDLIBS := $(purpenv_helper_LIB) $(SALLIB)
SHL4OBJS := $(SLO)$/AffineBridge.obj
.IF "$(GUI)"=="OS2"
SHL4VERSIONMAP=unsafe_os2.map
diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk
index 8264639311b8..d9c80645d29b 100644
--- a/cppu/util/makefile.mk
+++ b/cppu/util/makefile.mk
@@ -60,7 +60,7 @@ SHL1TARGET=$(TARGET)$(UDK_MAJOR)
SHL1TARGET= uno_$(TARGET)
.ENDIF
-SHL1STDLIBS = $(SALLIB) $(SALHELPERLIB)
+SHL1STDLIBS = $(SALLIB)
SHL1DEPN=
SHL1IMPLIB=i$(TARGET)
@@ -85,7 +85,7 @@ SHL2VERSIONMAP:=$(SHL2TARGET).map
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
SHL2DEF := $(MISC)$/$(SHL2TARGET).def
SHL2IMPLIB := i$(SHL2TARGET)
-SHL2STDLIBS := $(CPPULIB) $(SALHELPERLIB) $(SALLIB)
+SHL2STDLIBS := $(CPPULIB) $(SALLIB)
SHL2RPATH := URELIB
SHL2OBJS := \
$(SLO)$/helper_purpenv_Environment.obj \
generated by cgit (git 2.34.1) at 2025-02-07 13:54:23 +0000