diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:45:01 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:45:01 +0000 |
| commit | 45b9fb6495993c009d0b619f1dbcde176ffc11e9 (patch) | |
| tree | 4113016b0f6ff59e3898e97e9136950c07c71e9a /rdbmaker | |
| parent | fa4b0a4c8704933ab4cd8f92bf726782e3183bdf (diff) | |
INTEGRATION: CWS sb71 (1.7.16); FILE MERGED
2007/06/22 09:35:31 sb 1.7.16.1: #i75466# Support for dynamic loading of the reg shared library has been dropped.
Diffstat (limited to 'rdbmaker')
| -rw-r--r-- | rdbmaker/source/codemaker/typemanager.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/rdbmaker/source/codemaker/typemanager.cxx b/rdbmaker/source/codemaker/typemanager.cxx index 40a15df55..75d293238 100644 --- a/rdbmaker/source/codemaker/typemanager.cxx +++ b/rdbmaker/source/codemaker/typemanager.cxx @@ -4,9 +4,9 @@ * * $RCSfile: typemanager.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2006-07-19 16:25:09 $ + * last change: $Author: vg $ $Date: 2007-10-15 12:45:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -120,8 +120,7 @@ sal_Bool RegistryTypeManager::init(sal_Bool bMerged, const StringVector& regFile StringVector::const_iterator iter = regFiles.begin(); - RegistryLoader loader; - Registry tmpReg(loader); + Registry tmpReg; while (iter != regFiles.end()) { if (!tmpReg.open( convertToFileUrl(*iter), REG_READONLY)) @@ -136,7 +135,7 @@ sal_Bool RegistryTypeManager::init(sal_Bool bMerged, const StringVector& regFile if (m_pImpl->m_isMerged) { - Registry *pTmpReg = new Registry(loader); + Registry *pTmpReg = new Registry; OUString tmpName; osl::FileBase::createTempFile(0, 0, &tmpName); if (!pTmpReg->create(tmpName)) |