diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-02 16:56:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-02 16:57:57 +0100 |
| commit | 7fc89a55bffe61aac5c67044bf6eb7ed3808eef1 (patch) | |
| tree | 99cae85fc322cdce199448dc05b4cd78b297c570 /vcl | |
| parent | 1d7a60c006228ca17f4d9854fc7962c69cc247b0 (diff) | |
Resolves: rhbz#693265 fix crash from unhandled exception
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/impgraph.cxx | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index bd457f3fda22..2ce2452220d0 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -1077,7 +1077,14 @@ sal_Bool ImpGraphic::ImplReadEmbedded( SvStream& rIStm, sal_Bool bSwap ) if( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() ) { - SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); + SvStream* pOStm = NULL; + try + { + pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); + } + catch( const ::com::sun::star::uno::Exception& ) + { + } if( pOStm ) { @@ -1282,8 +1289,14 @@ sal_Bool ImpGraphic::ImplSwapOut() if( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ).getLength() ) { - SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); - + SvStream* pOStm = NULL; + try + { + pOStm = ::utl::UcbStreamHelper::CreateStream( aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); + } + catch( const ::com::sun::star::uno::Exception& ) + { + } if( pOStm ) { pOStm->SetVersion( SOFFICE_FILEFORMAT_50 ); @@ -1382,7 +1395,14 @@ sal_Bool ImpGraphic::ImplSwapIn() if( aSwapURL.Len() ) { - SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); + SvStream* pIStm = NULL; + try + { + pIStm = ::utl::UcbStreamHelper::CreateStream( aSwapURL, STREAM_READWRITE | STREAM_SHARE_DENYWRITE ); + } + catch( const ::com::sun::star::uno::Exception& ) + { + } if( pIStm ) { |