summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjan iversen <jani@documentfoundation.org>2016-03-15 19:33:33 +0000
committerjan iversen <jani@documentfoundation.org>2016-03-15 19:37:01 +0000
commit96a0a4384fa95fb9f7bdd5d008eaf05d75151c71 (patch)
treef4840520849140431d776f5984be70fc812d8db4
parent750fcdef6551f069badb802649a665e147e69083 (diff)
Revert "fix memory leak in headless backend"
This reverts commit eaaca6eaf26b0976f1c06f583a8aa35ee1c1b857. Causing tinderbox problems and reverted before making the 5.1.2 tag Change-Id: I987d1c5c839f020da150753f9a997a6824c1af67 Reviewed-on: https://gerrit.libreoffice.org/23286 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
-rw-r--r--vcl/headless/svpinst.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 12ef4e5263ca..0d765c19fa5c 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -150,12 +150,8 @@ void SvpSalInstance::deregisterFrame( SalFrame* pFrame )
std::list< SalUserEvent >::iterator it = m_aUserEvents.begin();
do
{
- if( it->m_pFrame == pFrame )
+ if( it->m_pFrame == pFrame )
{
- if (it->m_nEvent == SALEVENT_USEREVENT)
- {
- delete static_cast<ImplSVEvent *>(it->m_pData);
- }
it = m_aUserEvents.erase( it );
}
else