diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:45:36 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:45:36 +0000 |
| commit | 3430babf0e388ecf8c781f001680e2a0f53ff6f8 (patch) | |
| tree | 279523d90ff4feea9e77c52b79e4595786428e13 | |
| parent | 3405fe1446759a4d63375ea40494f5e6a4db8674 (diff) | |
INTEGRATION: CWS sb71 (1.8.18); FILE MERGED
2007/06/22 09:35:31 sb 1.8.18.1: #i75466# Support for dynamic loading of the reg shared library has been dropped.
| -rw-r--r-- | rdbmaker/source/rdbmaker/typeblop.cxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/rdbmaker/source/rdbmaker/typeblop.cxx b/rdbmaker/source/rdbmaker/typeblop.cxx index c67a681c7..953917f46 100644 --- a/rdbmaker/source/rdbmaker/typeblop.cxx +++ b/rdbmaker/source/rdbmaker/typeblop.cxx @@ -4,9 +4,9 @@ * * $RCSfile: typeblop.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2006-06-20 04:10:51 $ + * last change: $Author: vg $ $Date: 2007-10-15 12:45:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -329,10 +329,6 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) if ( !aTypeAny.hasValue() ) return length; - RegistryTypeWriterLoader rtwLoader; - if ( !rtwLoader.isLoaded() ) - return length; - Reference< XTypeDescription > xType; aTypeAny >>= xType; @@ -351,7 +347,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) Sequence< Reference< XConstantTypeDescription > > constTypes( xCFace->getConstants()); sal_uInt16 constCount = (sal_uInt16)constTypes.getLength(); - RegistryTypeWriter writer(rtwLoader, RT_TYPE_MODULE, uTypeName.replace('.', '/'), + RegistryTypeWriter writer(RT_TYPE_MODULE, uTypeName.replace('.', '/'), OUString(), constCount, 0, 0); for (sal_uInt16 i=0; i < constCount; i++) @@ -381,7 +377,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) constCount++; } - RegistryTypeWriter writer(rtwLoader, RT_TYPE_MODULE, uTypeName.replace('.', '/'), + RegistryTypeWriter writer(RT_TYPE_MODULE, uTypeName.replace('.', '/'), OUString(), constCount, 0, 0); if ( 0 < constCount ) @@ -436,7 +432,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) inheritedMemberCount = (sal_uInt16)getInheritedMemberCount( xSuperType ); } - RegistryTypeWriter writer(rtwLoader, RT_TYPE_INTERFACE, uTypeName.replace('.', '/'), + RegistryTypeWriter writer(RT_TYPE_INTERFACE, uTypeName.replace('.', '/'), uSuperType, attrCount, memberCount-attrCount, 0); Uik uik = xIFace->getUik(); @@ -507,7 +503,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) uSuperType = xSuperType->getName().replace('.','/'); } - RegistryTypeWriter writer(rtwLoader, rtTypeClass, uTypeName.replace('.', '/'), + RegistryTypeWriter writer(rtTypeClass, uTypeName.replace('.', '/'), uSuperType, memberCount, 0, 0); for (sal_Int16 i=0; i < memberCount; i++) @@ -532,7 +528,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) Sequence< sal_Int32 > enumValues( xEnum->getEnumValues()); sal_uInt16 enumCount = (sal_uInt16)enumNames.getLength(); - RegistryTypeWriter writer(rtwLoader, RT_TYPE_ENUM, uTypeName.replace('.', '/'), + RegistryTypeWriter writer(RT_TYPE_ENUM, uTypeName.replace('.', '/'), OUString(), enumCount, 0, 0); RTConstValue constValue; @@ -557,7 +553,7 @@ sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop) if ( !xTD.is() ) return length; - RegistryTypeWriter writer(rtwLoader, RT_TYPE_TYPEDEF, uTypeName.replace('.', '/'), + RegistryTypeWriter writer(RT_TYPE_TYPEDEF, uTypeName.replace('.', '/'), xTD->getReferencedType()->getName().replace('.', '/'), 0, 0, 0); length = writer.getBlopSize(); |