diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:00:03 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 14:00:03 +0000 |
| commit | f560330ba83a68906589f88b3372c31d8117da31 (patch) | |
| tree | 7605522f46ea53d510ebe0c70ea4c3bcebdbe4f2 /registry/source | |
| parent | ebfecd47a9e9343cb442d638db749825a2a7f4a9 (diff) | |
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
Diffstat (limited to 'registry/source')
| -rw-r--r-- | registry/source/regimpl.cxx | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index b89656efd5c3..a5de2dc342ad 100644 --- a/registry/source/regimpl.cxx +++ b/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 |