From 8e9a7cac42d554402a6ead3a83ae8b7defc9247b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 10 Mar 2016 19:21:15 +0100 Subject: No more need for jfw_freeJavaInfo Change-Id: I2426a76936b4099a243ce8c102da867e7868aac3 --- cui/source/options/optjava.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cui') diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 57e4dedd20da..fadea8823022 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -214,7 +214,7 @@ void SvxJavaOptionsPage::dispose() for ( pIter = m_aAddedInfos.begin(); pIter != m_aAddedInfos.end(); ++pIter ) { JavaInfo* pInfo = *pIter; - jfw_freeJavaInfo( pInfo ); + delete pInfo; } m_aAddedInfos.clear(); @@ -442,7 +442,7 @@ void SvxJavaOptionsPage::ClearJavaInfo() for ( sal_Int32 i = 0; i < m_nInfoSize; ++i ) { JavaInfo* pInfo = *parInfo++; - jfw_freeJavaInfo( pInfo ); + delete pInfo; } rtl_freeMemory( m_parJavaInfo ); @@ -508,7 +508,7 @@ void SvxJavaOptionsPage::LoadJREs() } } - jfw_freeJavaInfo( pSelectedJava ); + delete pSelectedJava; #else (void) this; #endif @@ -602,7 +602,7 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder ) nPos = m_pJavaList->GetEntryCount() - 1; } else - jfw_freeJavaInfo( pInfo ); + delete pInfo; SvTreeListEntry* pEntry = m_pJavaList->GetEntry( nPos ); m_pJavaList->Select( pEntry ); @@ -722,7 +722,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) bModified = true; } } - jfw_freeJavaInfo( pSelectedJava ); + delete pSelectedJava; break; } } -- cgit