mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS sb18 (1.2.100); FILE MERGED

Browse Source 
2004/05/24 09:31:14 sb 1.2.100.1: #i21150# Adapted to new registry type reader.
This commit is contained in:
Oliver Bolte
2004-06-03 14:03:11 +00:00
parent d4fa15c631
commit 1d1ebdf5c1
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rdbmaker/source/codemaker/typemanager.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: typemanager.cxx,v $ * $RCSfile: typemanager.cxx,v $
* *
* $Revision: 1.2 $ * $Revision: 1.3 $
* *
* last change: $Author: jsc $ $Date: 2001-08-17 13:09:49 $ * last change: $Author: obo $ $Date: 2004-06-03 15:03:11 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -69,12 +69,6 @@
using namespace rtl; using namespace rtl;
RegistryTypeReaderLoader & getRegistryTypeReaderLoader()
{
static RegistryTypeReaderLoader aLoader;
return aLoader;
}
TypeManager::TypeManager() TypeManager::TypeManager()
{ {
m_pImpl = new TypeManagerImpl(); m_pImpl = new TypeManagerImpl();
@@ -220,9 +214,7 @@ TypeReader RegistryTypeManager::getTypeReader(const OString& name)
sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
if (!key.getValue(OUString(), pBuffer)) if (!key.getValue(OUString(), pBuffer))
{ {
RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader(); reader = TypeReader(pBuffer, valueSize, sal_True);
reader = TypeReader(rReaderLoader, pBuffer, valueSize, sal_True);
} }
rtl_freeMemory(pBuffer); rtl_freeMemory(pBuffer);
} }
@@ -249,9 +241,7 @@ RTTypeClass RegistryTypeManager::getTypeClass(const OString& name)
sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize); sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
if (!key.getValue(OUString(), pBuffer)) if (!key.getValue(OUString(), pBuffer))
{ {
RegistryTypeReaderLoader & rReaderLoader = getRegistryTypeReaderLoader(); TypeReader reader(pBuffer, valueSize, sal_False);
TypeReader reader(rReaderLoader, pBuffer, valueSize, sal_False);
RTTypeClass ret = reader.getTypeClass(); RTTypeClass ret = reader.getTypeClass();