diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-28 12:43:30 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-28 19:25:58 +0100 |
| commit | e9d0ad432aea1987c7cb37264908c53a9cf206b7 (patch) | |
| tree | c809edf4972c347a83924b4b970c21bf80f92f7c /writerfilter | |
| parent | 4cd048d98ff258abc6ce036cb715d2c577128fb0 (diff) | |
RtfFilter::filter: don't leak pIn
Change-Id: I2510cd7faa48c0287498bdbc2511e29dbc62860a
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/filter/RtfFilter.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index cd55a8577320..186b904116c4 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -25,7 +25,7 @@ #include <rtftok/RTFDocument.hxx> #include <com/sun/star/io/WrongFormatException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> -#include <osl/diagnose.h> +#include <memory> #include <unotools/localfilehelper.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/streamwrap.hxx> @@ -77,10 +77,9 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip OUString aOutStr; if (!bIsNewDoc && pEnv && utl::LocalFileHelper::ConvertPhysicalNameToURL(OUString::fromUtf8(pEnv), aOutStr)) { - SvStream* pOut = utl::UcbStreamHelper::CreateStream(aOutStr, STREAM_WRITE); - SvStream* pIn = utl::UcbStreamHelper::CreateStream(xInputStream); + std::unique_ptr<SvStream> pOut(utl::UcbStreamHelper::CreateStream(aOutStr, STREAM_WRITE)); + std::unique_ptr<SvStream> pIn(utl::UcbStreamHelper::CreateStream(xInputStream)); pOut->WriteStream(*pIn); - delete pOut; return true; } @@ -109,7 +108,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip pDocument->resolve(*pStream); bResult = true; sal_uInt32 nEndTime = osl_getGlobalTimer(); - SAL_INFO("writerfilter.profile", OSL_THIS_FUNC << " finished in " << nEndTime - nStartTime << " ms"); + SAL_INFO("writerfilter.profile", "RtfFilter::filter: finished in " << nEndTime - nStartTime << " ms"); } catch (const io::WrongFormatException& e) { |