diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:47:00 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-02 18:47:00 +0000 |
| commit | ac7bfdde52260b8387442aa984671cc51a1da246 (patch) | |
| tree | 6f27a4f872e114cefde9349b82fbfcf11653cbf0 /registry | |
| parent | a6e0116ada95837539a6bb3c2296af9b7f3855a6 (diff) | |
INTEGRATION: CWS geordi2q14 (1.12.32); FILE MERGED
2004/01/29 18:26:45 hr 1.12.32.1: #111934#: merge CWS ooo111fix2
Diffstat (limited to 'registry')
| -rw-r--r-- | registry/source/registry.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/registry/source/registry.cxx b/registry/source/registry.cxx index 9fa0ab17d588..af3d221f2f63 100644 --- a/registry/source/registry.cxx +++ b/registry/source/registry.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registry.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: hr $ $Date: 2003-07-16 17:26:32 $ + * last change: $Author: hr $ $Date: 2004-02-02 19:47:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,10 +92,6 @@ using namespace salhelper; ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pLoader = NULL; #endif -#if defined(MACOSX) && ( __GNUC__ < 3 ) -ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pStaticLoader = NULL; -#endif - OString getTempName() { static OUString TMP(RTL_CONSTASCII_USTRINGPARAM("TMP")); |