diff options
author | Oliver Bolte <obo@openoffice.org> | 2004-08-12 11:18:31 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2004-08-12 11:18:31 +0000 |
commit | a292c70b3a62a6a1956282a916f62d7688faeb4e (patch) | |
tree | 386afddd819228f47fb635d41426444f02dd0edb /stoc | |
parent | INTEGRATION: CWS unotlc (1.15.16); FILE MERGED (diff) | |
download | core-a292c70b3a62a6a1956282a916f62d7688faeb4e.tar.gz core-a292c70b3a62a6a1956282a916f62d7688faeb4e.zip |
INTEGRATION: CWS unotlc (1.6.16); FILE MERGED
2004/08/03 15:08:08 dbo 1.6.16.2: RESYNC: (1.6-1.7); FILE MERGED
2004/07/12 13:30:07 dbo 1.6.16.1: #i20303# fixing resolve order: first tdmgr, then local provider
Diffstat (limited to 'stoc')
-rw-r--r-- | stoc/source/registry_tdprovider/tdservice.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx index f66fee597bd4..a3925c1b1672 100644 --- a/stoc/source/registry_tdprovider/tdservice.cxx +++ b/stoc/source/registry_tdprovider/tdservice.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tdservice.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2004-07-23 15:04:58 $ + * last change: $Author: obo $ $Date: 2004-08-12 12:18:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -483,9 +483,9 @@ void ServiceTypeDescriptionImpl::getReferences() sal_uInt32 nMI = 0; sal_uInt32 nOI = 0; - while ( nRefs-- ) + for ( sal_uInt16 nPos = 0; nPos < nRefs; ++nPos ) { - RTReferenceType eType = aReader.getReferenceSort( nRefs ); + RTReferenceType eType = aReader.getReferenceSort( nPos ); switch ( eType ) { case RT_REF_EXPORTS: // service @@ -494,7 +494,7 @@ void ServiceTypeDescriptionImpl::getReferences() try { aTypeDesc = _xTDMgr->getByHierarchicalName( - aReader.getReferenceTypeName( nRefs ).replace( + aReader.getReferenceTypeName( nPos ).replace( '/', '.' ) ); } catch ( NoSuchElementException const & e ) @@ -508,7 +508,7 @@ void ServiceTypeDescriptionImpl::getReferences() static_cast< OWeakObject * >( this ) ); } - RTFieldAccess nAccess = aReader.getReferenceFlags( nRefs ); + RTFieldAccess nAccess = aReader.getReferenceFlags( nPos ); if ( nAccess & RT_ACCESS_OPTIONAL ) { // optional service @@ -539,7 +539,7 @@ void ServiceTypeDescriptionImpl::getReferences() try { aTypeDesc = _xTDMgr->getByHierarchicalName( - aReader.getReferenceTypeName( nRefs ).replace( + aReader.getReferenceTypeName( nPos ).replace( '/', '.' ) ); } catch ( NoSuchElementException const & e ) @@ -553,7 +553,7 @@ void ServiceTypeDescriptionImpl::getReferences() static_cast< OWeakObject * >( this ) ); } - RTFieldAccess nAccess = aReader.getReferenceFlags( nRefs ); + RTFieldAccess nAccess = aReader.getReferenceFlags( nPos ); if ( nAccess & RT_ACCESS_OPTIONAL ) { // optional interface @@ -580,9 +580,9 @@ void ServiceTypeDescriptionImpl::getReferences() } break; } - case RT_REF_INVALID: case RT_REF_OBSERVES: case RT_REF_NEEDS: + break; default: OSL_ENSURE( sal_False, "### unsupported reference type!" ); break; |