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

INTEGRATION: CWS hr18 (1.1.252); FILE MERGED

Browse Source 
2005/08/15 13:33:08 hr 1.1.252.2: #i53224#: OEventListenerAdapter::stopComponentListening(): fix dispose loop, 2nd try
2005/08/11 16:23:46 hr 1.1.252.1: #53224#: OEventListenerAdapter::stopComponentListening(): fix dispose loop
This commit is contained in:
Rüdiger Timm
2005-09-05 08:05:12 +00:00
parent e2f04fae28
commit 50b694c8e1
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
unotools/source/misc/eventlisteneradapter.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: eventlisteneradapter.cxx,v $ * $RCSfile: eventlisteneradapter.cxx,v $
* *
* $Revision: 1.1 $ * $Revision: 1.2 $
* *
* last change: $Author: fs $ $Date: 2001-04-19 16:13:35 $ * last change: $Author: rt $ $Date: 2005-09-05 09:05:12 $
* *
* 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
@@ -169,24 +169,23 @@ namespace utl
//--------------------------------------------------------------------- //---------------------------------------------------------------------
void OEventListenerAdapter::stopComponentListening( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComp ) void OEventListenerAdapter::stopComponentListening( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComp )
{ {
for ( ::std::vector< void* >::iterator aDisposeLoop = m_pImpl->aListeners.begin(); if ( m_pImpl->aListeners.empty() )
aDisposeLoop != m_pImpl->aListeners.end(); return;
++aDisposeLoop
)
{
OEventListenerImpl* pListenerImpl = static_cast< OEventListenerImpl* >(*aDisposeLoop);
if (pListenerImpl->getComponent().get() == _rxComp.get())
{
::std::vector< void* >::iterator aPrevious(aDisposeLoop);
--aPrevious;
::std::vector< void* >::iterator dispose = m_pImpl->aListeners.begin();
do
{
OEventListenerImpl* pListenerImpl = static_cast< OEventListenerImpl* >( *dispose );
if ( pListenerImpl->getComponent().get() == _rxComp.get() )
{
pListenerImpl->dispose(); pListenerImpl->dispose();
pListenerImpl->release(); pListenerImpl->release();
m_pImpl->aListeners.erase(aDisposeLoop); dispose = m_pImpl->aListeners.erase( dispose );
aDisposeLoop = aPrevious;
} }
else
++dispose;
} }
while ( dispose != m_pImpl->aListeners.end() );
} }
//--------------------------------------------------------------------- //---------------------------------------------------------------------
@@ -221,11 +220,3 @@ namespace utl
//......................................................................... //.........................................................................
} // namespace utl } // namespace utl
//......................................................................... //.........................................................................
/*************************************************************************
* history:
* $Log: not supported by cvs2svn $
*
* Revision 1.0 19.04.01 16:26:16 fs
************************************************************************/