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

Resolves: fdo#60144 only delete *unposted* SfxRequests accumulated during lock

Browse Source 
When the dispatched is locked, SfxRequests accumulate in aReqArr for later
dispatch when unlocked via Post

The pointers are typically deleted in Post, so only if we never get around to
posting them do we delete the unposted requests.

regression from 528aba3a9c

Change-Id: I4c214791d356ce0e5401a87b968b53e4866f6174
This commit is contained in:
Caolán McNamara
2013-02-05 09:53:24 +00:00
parent 117b3242db
commit 1385896fe7
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sfx2/source/control/dispatch.cxx
View File

@@ -60,12 +60,12 @@
#include <rtl/strbuf.hxx>
#include <deque>
#include <boost/ptr_container/ptr_vector.hpp>
#include <vector>
DBG_NAME(SfxDispatcherFlush)
DBG_NAME(SfxDispatcherFillState)
typedef boost::ptr_vector<SfxRequest> SfxRequestPtrArray;
typedef std::vector<SfxRequest*> SfxRequestPtrArray;
DECL_PTRSTACK(SfxShellStack_Impl, SfxShell*, 8, 4 );
@@ -110,7 +110,17 @@ struct SfxObjectBars_Impl
struct SfxDispatcher_Impl
{
SfxRequestPtrArray aReqArr;
//When the dispatched is locked, SfxRequests accumulate in aReqArr for
//later dispatch when unlocked via Post
//
//The pointers are typically deleted in Post, only if we never get around
//to posting them do we delete the unposted requests.
SfxRequestPtrArray aReqArr;
~SfxDispatcher_Impl()
{
for (SfxRequestPtrArray::iterator aI = aReqArr.begin(), aEnd = aReqArr.end(); aI != aEnd; ++aI)
delete *aI;
}
const SfxSlotServer* pCachedServ1; // last called message
const SfxSlotServer* pCachedServ2; // penultimate called Message
SfxShellStack_Impl aStack; // active functionality
@@ -2149,7 +2159,7 @@ void SfxDispatcher::Lock( sal_Bool bLock )
if ( !bLock )
{
for(size_t i = 0; i < pImp->aReqArr.size(); ++i)
pImp->xPoster->Post(&pImp->aReqArr[i]);
pImp->xPoster->Post(pImp->aReqArr[i]);
pImp->aReqArr.clear();
}
}