INTEGRATION: CWS geordi2q14 (1.12.32); FILE MERGED

2004/01/29 18:26:45 hr 1.12.32.1: #111934#: merge CWS ooo111fix2
This commit is contained in:
Jens-Heiner Rechtien
2004-02-02 18:47:00 +00:00
parent a6e0116ada
commit ac7bfdde52

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: registry.cxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -92,10 +92,6 @@ using namespace salhelper;
ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pLoader = NULL; ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pLoader = NULL;
#endif #endif
#if defined(MACOSX) && ( __GNUC__ < 3 )
ORealDynamicLoader* ODynamicLoader<Registry_Api>::m_pStaticLoader = NULL;
#endif
OString getTempName() OString getTempName()
{ {
static OUString TMP(RTL_CONSTASCII_USTRINGPARAM("TMP")); static OUString TMP(RTL_CONSTASCII_USTRINGPARAM("TMP"));