From b7f08e5afec5b9f11916c691589476f84612fde6 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Wed, 3 Nov 2010 12:14:52 +0100 Subject: Workaround for the registration breakage on SUSE. Commit 55c3066e52ad1843549c442e8d74f886507c58f4 seems to break the SUSE boxes, this is a workaround for that. --- cppu/source/typelib/typelib.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'cppu') 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; -- cgit