[Libreoffice-commits] .: Branch 'libreoffice-3-3' - cppu/source

[Caolán McNamara]

 cppu/source/typelib/typelib.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 43738da82e783ab89501c7a240eba1bd438a4193
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 5 12:37:49 2010 +0000

    can undo this now with dial-down in solenv
    (cherry picked from commit 23b34d1adafa71612f093d6b5aa015f307785a3f)

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 6d91289..10a7cb1 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -275,9 +275,6 @@ 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();
@@ -358,7 +355,6 @@ TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW( () )
     delete pCallbacks;
     pCallbacks = 0;
 
-#endif
     if( pMutex )
     {
         delete pMutex;