diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-04-16 00:22:16 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-17 12:00:04 +0000 |
| commit | 2a3e221c8807789afcbbe9ea5eae3c3fc90a473c (patch) | |
| tree | 1a5106d90f3bc979908294a90ea81e036da7e86f | |
| parent | a0656ed3386a071ee43440ee870a90d7a1fe7fa7 (diff) | |
Fix a memory leak
The stream should be freed eventually in any case.
Change-Id: I5432b48de5641adc7a13a852fea49adc18bf963b
Reviewed-on: https://gerrit.libreoffice.org/9016
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | framework/source/uielement/imagebuttontoolbarcontroller.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 733b3223d4bb..7c385f270215 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -40,6 +40,7 @@ #include <vcl/graphicfilter.hxx> #include <vcl/toolbox.hxx> #include <svtools/miscopt.hxx> +#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::awt; @@ -159,7 +160,7 @@ void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star bool ImageButtonToolbarController::ReadImageFromURL( bool bBigImage, const OUString& aImageURL, Image& aImage ) { - SvStream* pStream = utl::UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ ); + boost::scoped_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ )); if ( pStream && ( pStream->GetErrorCode() == 0 )) { // Use graphic class to also support more graphic formats (bmp,png,...) @@ -183,7 +184,6 @@ bool ImageButtonToolbarController::ReadImageFromURL( bool bBigImage, const OUStr } } - delete pStream; return false; } |