summaryrefslogtreecommitdiff
path: root/cppu/source
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2010-11-03 12:14:52 +0100
committerJan Holesovsky <kendy@suse.cz>2010-11-03 12:19:34 +0100
commitb7f08e5afec5b9f11916c691589476f84612fde6 (patch)
tree83f8cd42e9415f3b05c8f28a38d071bdab06d8f7 /cppu/source
parent2fe98374de1d2e0bb812326514d240007c945721 (diff)
Workaround for the registration breakage on SUSE.
Commit 55c3066e52ad1843549c442e8d74f886507c58f4 seems to break the SUSE boxes, this is a workaround for that.
Diffstat (limited to 'cppu/source')
-rw-r--r--cppu/source/typelib/typelib.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 3cf9abe0934e..9bec9a1fb6e4 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -275,6 +275,9 @@ inline void TypeDescriptor_Init_Impl::callChain(
//__________________________________________________________________________________________________
TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
{
+#ifdef DONT_LEAK_STATIC_DATA
+ // The cleanup from commit 55c3066e52ad1843549c442e8d74f886507c58f4
+ // introduced a breakage on SUSE, Caolan will have a look
if( pCache )
{
TypeDescriptionList_Impl::const_iterator aIt = pCache->begin();
@@ -355,6 +358,7 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
delete pCallbacks;
pCallbacks = 0;
+#endif
if( pMutex )
{
delete pMutex;