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

[Jan Holesovsky]

 cppu/source/typelib/typelib.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit bd18753f4ea022860e368eda34d152b6e72e3774
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Nov 3 12:14:52 2010 +0100

    Workaround for the registration breakage on SUSE.
    
    Commit 55c3066e52ad1843549c442e8d74f886507c58f4 seems to break the SUSE boxes,
    this is a workaround for that.

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 10a7cb1..6d91289 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;