INTEGRATION: CWS geordi2q01 (1.16.22); FILE MERGED

2003/08/18 13:05:45 hr 1.16.22.1: #i18350#: join changes from CWS ooo11rc3

registry/source/regimpl.cxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: regimpl.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-26 15:37:46 $
+ *  last change: $Author: hjs $ $Date: 2003-08-18 15:00:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,8 +69,18 @@
 #include    <unistd.h>
 #endif
 
+#ifdef MACOSX
+// Get the store.hxx inlines non-inline, solves crashes in cppumaker
+#define inline
+#endif
+
 #include    "regimpl.hxx"
 
+#ifdef MACOSX
+// Get the store.hxx inlines non-inline, solves crashes in cppumaker
+#undef inline
+#endif
+
 #ifndef __REGISTRY_REFLREAD_HXX__
 #include    <registry/reflread.hxx>
 #endif
@@ -520,7 +530,6 @@ RegError ORegistry::initRegistry(const OUString& regName, RegAccessMode accessMo
             m_name = regName;
             m_isOpen = sal_True;
 
-
             m_openKeyTable[ROOT] = new ORegKey(ROOT, rStoreDir, this);
             return REG_NO_ERROR;
         } else