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

INTEGRATION: CWS jl3 (1.6.82); FILE MERGED

Browse Source 
2003/12/19 11:32:29 dbo 1.6.82.1: #114506# cleanup
This commit is contained in:
Kurt Zenker
2004-03-25 13:47:54 +00:00
parent 49c6d82499
commit feff0a521a
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stoc/source/registry_tdprovider/tdcomp.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: tdcomp.cxx,v $ * $RCSfile: tdcomp.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: kso $ $Date: 2002-11-11 08:35:47 $ * last change: $Author: kz $ $Date: 2004-03-25 14:47:54 $
* *
* 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
@@ -100,11 +100,9 @@ Reference< XTypeDescription > CompoundTypeDescriptionImpl::getBaseType()
Reference< XTypeDescription > xBaseTD; Reference< XTypeDescription > xBaseTD;
if (_xTDMgr->getByHierarchicalName( _aBaseType ) >>= xBaseTD) if (_xTDMgr->getByHierarchicalName( _aBaseType ) >>= xBaseTD)
{ {
MutexGuard aGuard( _aMutex ); MutexGuard aGuard( getMutex() );
if (! _xBaseTD.is()) if (! _xBaseTD.is())
{
_xBaseTD = xBaseTD; _xBaseTD = xBaseTD;
}
return _xBaseTD; return _xBaseTD;
} }
} }
@@ -145,7 +143,7 @@ Sequence< Reference< XTypeDescription > > CompoundTypeDescriptionImpl::getMember
OSL_ENSURE( pMembers[nFields].is(), "### compound member unknown!" ); OSL_ENSURE( pMembers[nFields].is(), "### compound member unknown!" );
} }
ClearableMutexGuard aGuard( _aMutex ); ClearableMutexGuard aGuard( getMutex() );
if (_pMembers) if (_pMembers)
{ {
aGuard.clear(); aGuard.clear();
@@ -179,7 +177,7 @@ Sequence< OUString > CompoundTypeDescriptionImpl::getMemberNames()
pMemberNames[nFields] = aReader.getFieldName( nFields ); pMemberNames[nFields] = aReader.getFieldName( nFields );
} }
ClearableMutexGuard aGuard( _aMutex ); ClearableMutexGuard aGuard( getMutex() );
if (_pMemberNames) if (_pMemberNames)
{ {
aGuard.clear(); aGuard.clear();