LEAK_STATIC_DATA is only ever defined for WNT

Change-Id: I1aa7b56b44e5efc8ad407c8d0fe09927f622b5e7

19 files changed, 0 insertions, 76 deletions

diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
index 2e22d92d080d..c5117ac40b6f 100644
--- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx
@@ -231,12 +231,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
             MutexGuard guard( Mutex::getGlobalMutex() );
             if (! s_rtti)
             {
-#ifdef LEAK_STATIC_DATA
-                s_rtti = new RTTI();
-#else
                 static RTTI rtti_data;
                 s_rtti = &rtti_data;
-#endif
             }
         }
         rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index d4ecf85dfbe9..72730762f71d 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -298,12 +298,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
index bd7164c0dab1..74dabc8acc77 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx
@@ -229,12 +229,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
index 53319a4d9581..44da1cd15089 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx
@@ -266,12 +266,8 @@ namespace CPPU_CURRENT_NAMESPACE
                MutexGuard guard( Mutex::getGlobalMutex() );
                if (! s_rtti)
                {
-#ifdef LEAK_STATIC_DATA
-                   s_rtti = new RTTI();
-#else
                    static RTTI rtti_data;
                    s_rtti = &rtti_data;
-#endif
                }
            }
            rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
index 14d37506d78f..855e75cfe8b4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx
@@ -242,12 +242,8 @@ namespace CPPU_CURRENT_NAMESPACE
             MutexGuard guard( Mutex::getGlobalMutex() );
             if (! s_rtti)
             {
-#ifdef LEAK_STATIC_DATA
-                s_rtti = new RTTI();
-#else
                 static RTTI rtti_data;
                 s_rtti = &rtti_data;
-#endif
             }
         }
         rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
index 76755f85879c..95688e33f7d0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx
@@ -228,12 +228,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
index 4c5105dfccf8..3a67731321d5 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx
@@ -241,12 +241,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = s_rtti->getRTTI(reinterpret_cast<typelib_CompoundTypeDescription *>(pTypeDescr));
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
index 544e72e1e1fb..6f0581d31bf2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx
@@ -242,12 +242,8 @@ namespace CPPU_CURRENT_NAMESPACE
             MutexGuard guard( Mutex::getGlobalMutex() );
             if (! s_rtti)
             {
-#ifdef LEAK_STATIC_DATA
-                s_rtti = new RTTI();
-#else
                 static RTTI rtti_data;
                 s_rtti = &rtti_data;
-#endif
             }
         }
         rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
index 44ef70b7cb12..50220539498e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx
@@ -239,12 +239,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx
index 339bd27433da..0e6537256356 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips64/except.cxx
@@ -240,12 +240,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
index e70a5df4eba1..225a241d412d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx
@@ -230,12 +230,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
index 76755f85879c..95688e33f7d0 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
@@ -228,12 +228,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
index bd7164c0dab1..74dabc8acc77 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx
@@ -229,12 +229,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
index abf406cdc863..6049fb5094cd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx
@@ -229,12 +229,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
index 720e4d617afb..261339c2b533 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx
@@ -240,12 +240,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx
index 720e4d617afb..261339c2b533 100644
--- a/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc64/except.cxx
@@ -240,12 +240,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
index 547a2d779d81..53fb3c8cabc0 100644
--- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx
@@ -303,12 +303,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = s_rtti->getRTTI( reinterpret_cast<typelib_CompoundTypeDescription *>(pTypeDescr) );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
index 7308f3e71adb..8e403ac522c8 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx
@@ -242,12 +242,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
index 472863acc114..7b957003b4d1 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx
@@ -239,12 +239,8 @@ void raiseException( uno_Any * pUnoExc, uno_Mapping * pUno2Cpp )
         MutexGuard guard( Mutex::getGlobalMutex() );
         if (! s_rtti)
         {
-#ifdef LEAK_STATIC_DATA
-            s_rtti = new RTTI();
-#else
             static RTTI rtti_data;
             s_rtti = &rtti_data;
-#endif
         }
     }
     rtti = (type_info *)s_rtti->getRTTI( (typelib_CompoundTypeDescription *) pTypeDescr );