CWS-TOOLING: integrate CWS sb109

2009-04-21 13:42:45 +0200 sb  r271035 : removed obsolete psprint dependency
2009-04-21 10:33:31 +0200 sb  r271024 : changes to previous -c270971 so that build does not break for USE_SHELL!=bash (but instead resulting bridgetest_xxx scripts are nonfunctional)
2009-04-21 08:56:48 +0200 sb  r271017 : merged in cws/sb107 -c 268250 (avoid warnings about format specifier and argument mismatch (on 64bit debug builds))
2009-04-20 16:42:27 +0200 sb  r270995 : #i98625# add make_xxx functions for C++ representations of UNO polystructs; fixed and adapted tests (patch by thb, slightly adapted)
2009-04-20 14:23:45 +0200 sb  r270981 : #i84751# selective performance improvements (patch by mmeeks, slightly adapted)
2009-04-20 13:39:50 +0200 sb  r270978 : #i99711# removed dead code (patch by cmc, slightly modified)
2009-04-20 11:59:39 +0200 sb  r270972 : #i97975# avoid crashes during shutdown (patch by cmc, slightly modified)
2009-04-20 11:57:52 +0200 sb  r270971 : made tests work again after LD_LIBRARY_PATH clean up
2009-04-20 09:49:32 +0200 sb  r270963 : #i95593# made tests work again after LD_LIBRARY_PATH cleanup
2009-04-17 13:52:33 +0200 sb  r270941 : merged in cws/sb107 -c 270023 (added svn:ignore)
2009-04-15 13:46:24 +0200 sb  r270841 : #i92131# dead code elimination (based on a patch by cmc)
2009-04-15 13:29:27 +0200 sb  r270839 : #i100743# use a FastLess for the Data map (based on a patch my mmeeks)
2009-04-15 13:12:11 +0200 sb  r270837 : #i100583# dead code elimination (patch by cmc)
2009-04-15 13:02:19 +0200 sb  r270835 : avoid bogus Solaris C++ compiler warning when building with debug=x
2009-04-15 11:49:46 +0200 sb  r270828 : adapted to cleared LD_LIBRARY_PATH
2009-04-15 10:49:48 +0200 sb  r270826 : #i101101# for performance reasons, do not put ComponentContext in unsafe appartment
2009-04-15 10:08:20 +0200 sb  r270824 : #i99113# removed duplicated stocservices.uno lib from basis layer

2 files changed, 0 insertions, 94 deletions

diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index 197d15081..7b54ed498 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 30e0adce9..9cb40fe3c 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( () )
 {