From 1d2c58302dfb2a0bc2408c1eba3c687dc85d4018 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Thu, 4 Aug 2011 22:45:56 -0400 Subject: Found one inconsistency between deque and uno::Sequence usages. ListenerType vs ScriptType. Also, deque supports clear(). --- comphelper/source/eventattachermgr/eventattachermgr.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 0caf08619d..57f1300ee0 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -643,7 +643,7 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex ) ::std::deque< AttachedObject_Impl > aList = (*aIt).aObjList; ::std::for_each(aList.begin(), aList.end(), DetachObject(*this, nIndex)); #ifdef DEQUE_OK - (*aIt).aEventList = ::std::deque< ScriptEventDescriptor >(); + (*aIt).aEventList.clear(); #else (*aIt).aEventList.realloc( 0 ); #endif @@ -751,7 +751,7 @@ void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference try { xAdapter = xAttacher->attachSingleEventListener( rCurObj.xTarget, xAll, - rCurObj.aHelper, (*aEvtIt).ScriptType, + rCurObj.aHelper, (*aEvtIt).ListenerType, (*aEvtIt).AddListenerParam, (*aEvtIt).EventMethod ); } catch( Exception& ) -- cgit v1.2.3