sfx2/source/control/dispatch.cxx | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 153afd7bf078b4d6992720186df987867f47acf1
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 5 09:53:24 2013 +0000
Resolves: fdo#60144 only delete *unposted* SfxRequests accumulated during
lock
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 528aba3a9cf91da5ce70c6d631d7b82e203f8086
Change-Id: I4c214791d356ce0e5401a87b968b53e4866f6174
(cherry picked from commit 1385896fe760fe61b19a682cb7dc7fdf31d31490)
Reviewed-on: https://gerrit.libreoffice.org/1991
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 975b834..6ec85ea 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -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();
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
