[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/headless
jan iversen
jani at documentfoundation.org
Tue Mar 15 19:37:26 UTC 2016
vcl/headless/svpinst.cxx | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit 96a0a4384fa95fb9f7bdd5d008eaf05d75151c71
Author: jan iversen <jani at documentfoundation.org>
Date: Tue Mar 15 19:33:33 2016 +0000
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 at documentfoundation.org>
Tested-by: jan iversen <jani at documentfoundation.org>
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 12ef4e5..0d765c1 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
More information about the Libreoffice-commits
mailing list