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 | d4a4d9fa29fca1b50d85fc21b66707655c265890 (patch) | |
| tree | cae8dba9b5342053ab43d5ef09a002143e6a4410 | |
| parent | 1e67d77270c9ea210969908adaf0a9c3ff353476 (diff) | |
Resolves: rhbz#693265 fix crash from unhandled exception
| -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 3b6d9a4202..6fdb16376d 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 ) { |