INTEGRATION: CWS beta2regression02 (1.2.50); FILE MERGED
2003/04/30 08:24:25 mba 1.2.50.2: #109223#: allow to remove Lock without closing 2003/04/30 08:06:20 mba 1.2.50.1: #109223#: allow to remove Lock without closing
This commit is contained in:
parent
1d45d969d1
commit
65baefa0b0
1 changed files with 14 additions and 3 deletions
|
@ -2,9 +2,9 @@
|
|||
*
|
||||
* $RCSfile: object.cxx,v $
|
||||
*
|
||||
* $Revision: 1.2 $
|
||||
* $Revision: 1.3 $
|
||||
*
|
||||
* last change: $Author: mh $ $Date: 2002-05-31 08:13:29 $
|
||||
* last change: $Author: vg $ $Date: 2003-05-02 15:23:37 $
|
||||
*
|
||||
* The Contents of this file are made available subject to the terms of
|
||||
* either of the following licenses
|
||||
|
@ -478,7 +478,7 @@ void SotObject::OwnerLock
|
|||
nOwnerLockCount++;
|
||||
AddRef();
|
||||
}
|
||||
else
|
||||
else if ( nOwnerLockCount )
|
||||
{
|
||||
if( 0 == --nOwnerLockCount )
|
||||
DoClose();
|
||||
|
@ -486,6 +486,17 @@ void SotObject::OwnerLock
|
|||
}
|
||||
}
|
||||
|
||||
void SotObject::RemoveOwnerLock()
|
||||
{
|
||||
if ( nOwnerLockCount )
|
||||
{
|
||||
--nOwnerLockCount;
|
||||
ReleaseRef();
|
||||
}
|
||||
else
|
||||
DBG_ERROR("OwnerLockCount underflow!");
|
||||
}
|
||||
|
||||
//=========================================================================
|
||||
BOOL SotObject::DoClose()
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue