INTEGRATION: CWS dba29 (1.15.4); FILE MERGED

2005/04/01 10:56:46 fs 1.15.4.1: #i46412# m_pChildCommitListen->dispose before cleaning it up, to ensure that it doesn't forward any events we are not interested in anymore
This commit is contained in:
Jens-Heiner Rechtien 2005-04-06 08:47:25 +00:00
parent c0887691b5
commit 5e0c486d92

View file

@ -2,9 +2,9 @@
*
* $RCSfile: databasedocument.cxx,v $
*
* $Revision: 1.16 $
* $Revision: 1.17 $
*
* last change: $Author: rt $ $Date: 2005-03-30 11:55:24 $
* last change: $Author: hr $ $Date: 2005-04-06 09:47:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -290,6 +290,7 @@ sal_Bool SAL_CALL ODatabaseDocument::attachResource( const ::rtl::OUString& _rUR
if ( m_pChildCommitListen )
{
m_pChildCommitListen->dispose();
m_pChildCommitListen->release();
m_pChildCommitListen = NULL;
}
@ -1103,6 +1104,7 @@ void ODatabaseDocument::disposing()
notifyEvent(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnUnload")));
if ( m_pChildCommitListen )
{
m_pChildCommitListen->dispose();
m_pChildCommitListen->release();
m_pChildCommitListen = NULL;
}