diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 15:15:57 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-03-30 15:15:57 +0000 |
| commit | 2bcd9496a5eaa3812f85d59fdd45a75a734d2751 (patch) | |
| tree | b1d67767dc8486f7bcf1ff535d2fcd27e715e1c4 /stoc | |
| parent | f2ef6ecd25f6ffe3aae0a0569b74e39b69c6a8bf (diff) | |
INTEGRATION: CWS sb14 (1.6.104); FILE MERGED
2004/03/12 14:18:49 sb 1.6.104.1: #i21150# Adapted to modified registry type reader.
Diffstat (limited to 'stoc')
| -rw-r--r-- | stoc/source/registry_tdprovider/tdcomp.cxx | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/stoc/source/registry_tdprovider/tdcomp.cxx b/stoc/source/registry_tdprovider/tdcomp.cxx index b6636c408579..e66e3a5f5607 100644 --- a/stoc/source/registry_tdprovider/tdcomp.cxx +++ b/stoc/source/registry_tdprovider/tdcomp.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tdcomp.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2004-03-25 14:47:54 $ + * last change: $Author: rt $ $Date: 2004-03-30 16:15:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,6 +63,9 @@ #include "base.hxx" #endif +#include "registry/reader.hxx" +#include "registry/version.h" + namespace stoc_rdbtdp { @@ -120,12 +123,11 @@ Sequence< Reference< XTypeDescription > > CompoundTypeDescriptionImpl::getMember { if (! _pMembers) { - RegistryTypeReaderLoader aLoader; - RegistryTypeReader aReader( - aLoader, (const sal_uInt8 *)_aBytes.getConstArray(), - _aBytes.getLength(), sal_False ); + typereg::Reader aReader( + _aBytes.getConstArray(), _aBytes.getLength(), false, + TYPEREG_VERSION_1); - sal_uInt16 nFields = (sal_uInt16)aReader.getFieldCount(); + sal_uInt16 nFields = aReader.getFieldCount(); Sequence< Reference< XTypeDescription > > * pTempMembers = new Sequence< Reference< XTypeDescription > >( nFields ); Reference< XTypeDescription > * pMembers = pTempMembers->getArray(); @@ -135,7 +137,8 @@ Sequence< Reference< XTypeDescription > > CompoundTypeDescriptionImpl::getMember try { _xTDMgr->getByHierarchicalName( - aReader.getFieldType( nFields ).replace( '/', '.' ) ) >>= pMembers[nFields]; + aReader.getFieldTypeName( nFields ).replace( '/', '.' ) ) + >>= pMembers[nFields]; } catch (NoSuchElementException &) { @@ -163,12 +166,11 @@ Sequence< OUString > CompoundTypeDescriptionImpl::getMemberNames() { if (! _pMemberNames) { - RegistryTypeReaderLoader aLoader; - RegistryTypeReader aReader( - aLoader, (const sal_uInt8 *)_aBytes.getConstArray(), - _aBytes.getLength(), sal_False ); + typereg::Reader aReader( + _aBytes.getConstArray(), _aBytes.getLength(), false, + TYPEREG_VERSION_1); - sal_uInt16 nFields = (sal_uInt16)aReader.getFieldCount(); + sal_uInt16 nFields = aReader.getFieldCount(); Sequence< OUString > * pTempMemberNames = new Sequence< OUString >( nFields ); OUString * pMemberNames = pTempMemberNames->getArray(); |