summaryrefslogtreecommitdiff
path: root/rdbmaker
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-10-15 11:45:01 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-10-15 11:45:01 +0000
commitb0c784018bc2a37a6ea05790a9bd7f9100cb1e6f (patch)
treef494803ad3041807cc123d4e2e8fe7b7b9ed9bd7 /rdbmaker
parent929516d46819286691eeb4c043ebb36a7f364a79 (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.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/rdbmaker/source/codemaker/typemanager.cxx b/rdbmaker/source/codemaker/typemanager.cxx
index b1b1a3398ba6..32e34f28db46 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))