summaryrefslogtreecommitdiff
path: root/registry
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-10-15 11:28:03 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-10-15 11:28:03 +0000
commitd4e73e9074f59f6463046b387e46671a22729b2b (patch)
tree089c2a43b050f0a45c4d851a4fe74d51c067a734 /registry
parent632df174930be1dcf9a66e7d577efbfe0f6f47df (diff)
INTEGRATION: CWS sb71 (1.24.2); FILE MERGED
2007/10/02 09:08:27 sb 1.24.2.3: RESYNC: (1.25-1.26); FILE MERGED 2007/08/23 17:02:15 sb 1.24.2.2: RESYNC: (1.24-1.25); FILE MERGED 2007/06/22 09:34:22 sb 1.24.2.1: #i75466# Support for dynamic loading of the reg shared library has been dropped.
Diffstat (limited to 'registry')
-rw-r--r--registry/source/regimpl.cxx21
1 files changed, 5 insertions, 16 deletions
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 583bf1e0e07b..a8e5d08575f6 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: regimpl.cxx,v $
*
- * $Revision: 1.26 $
+ * $Revision: 1.27 $
*
- * last change: $Author: vg $ $Date: 2007-09-20 14:48:15 $
+ * last change: $Author: vg $ $Date: 2007-10-15 12:28:03 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -106,9 +106,6 @@
sal_helper::ORealDynamicLoader* sal_helper::ODynamicLoader<RegistryTypeReader_Api>::m_pLoader = NULL;
#endif
-
-extern "C" RegistryTypeReader_Api* TYPEREG_CALLTYPE initRegistryTypeReader_Api();
-extern "C" RegistryTypeWriter_Api* TYPEREG_CALLTYPE initRegistryTypeWriter_Api();
namespace {
void printString(rtl::OUString const & s) {
@@ -1394,11 +1391,7 @@ RegError ORegistry::checkBlop(OStoreStream& rValue,
sal_uInt8* pSrcBuffer,
sal_Bool bReport)
{
- RegistryTypeReader_Api* pReaderApi;
-
- pReaderApi = initRegistryTypeReader_Api();
-
- RegistryTypeReader reader(pReaderApi, pSrcBuffer, srcValueSize, sal_False);
+ RegistryTypeReader reader(pSrcBuffer, srcValueSize, sal_False);
if (reader.getTypeClass() == RT_TYPE_INVALID)
{
@@ -1425,7 +1418,7 @@ RegError ORegistry::checkBlop(OStoreStream& rValue,
if (!rValue.readAt(VALUE_HEADEROFFSET, pBuffer, valueSize, rwBytes) &&
(rwBytes == valueSize))
{
- RegistryTypeReader reader2(pReaderApi, pBuffer, valueSize, sal_False);
+ RegistryTypeReader reader2(pBuffer, valueSize, sal_False);
if ((reader.getTypeClass() != reader2.getTypeClass())
|| reader2.getTypeClass() == RT_TYPE_INVALID)
@@ -1527,17 +1520,13 @@ RegError ORegistry::mergeModuleValue(OStoreStream& rTargetValue,
RegistryTypeReader& reader2)
{
sal_uInt16 index = 0;
- RegistryTypeWriter_Api* pWriterApi;
StringSet nameSet;
sal_uInt32 count = checkTypeReaders(reader, reader2, nameSet);
if (count != reader.getFieldCount())
{
- pWriterApi = initRegistryTypeWriter_Api();
-
- RegistryTypeWriter writer(pWriterApi,
- reader.getTypeClass(),
+ RegistryTypeWriter writer(reader.getTypeClass(),
reader.getTypeName(),
reader.getSuperTypeName(),
(sal_uInt16)count,