diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/gdi/gfxlink.cxx | 28 | ||||
| -rw-r--r-- | vcl/source/gdi/impgraph.cxx | 52 |
2 files changed, 52 insertions, 28 deletions
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 26356a3c8088..df8563f761d4 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gfxlink.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: ka $ $Date: 2000-11-07 17:09:05 $ + * last change: $Author: ka $ $Date: 2001-01-25 15:50:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -341,13 +341,17 @@ ImpSwap::ImpSwap( BYTE* pData, ULONG nDataSize ) : aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } - catch( ::com::sun::star::ucb::CommandAbortedException& ) + catch( const ::com::sun::star::ucb::ContentCreationException& ) { - DBG_ERRORFILE( "CommandAbortedException" ); + DBG_ERROR( "ContentCreationException" ); } - catch( ... ) + catch( const ::com::sun::star::uno::RuntimeException& ) { - DBG_ERRORFILE( "Any other exception" ); + DBG_ERROR( "RuntimeException" ); + } + catch( const ::com::sun::star::ucb::CommandAbortedException& ) + { + DBG_ERROR( "CommandAbortedException" ); } maURL = INetURLObject(); @@ -371,13 +375,17 @@ ImpSwap::~ImpSwap() aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } - catch( ::com::sun::star::ucb::CommandAbortedException& ) + catch( const ::com::sun::star::ucb::ContentCreationException& ) + { + DBG_ERROR( "ContentCreationException" ); + } + catch( const ::com::sun::star::uno::RuntimeException& ) { - DBG_ERRORFILE( "CommandAbortedException" ); + DBG_ERROR( "RuntimeException" ); } - catch( ... ) + catch( const ::com::sun::star::ucb::CommandAbortedException& ) { - DBG_ERRORFILE( "Any other exception" ); + DBG_ERROR( "CommandAbortedException" ); } } } diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 4f440a1d4dfa..b928df8c9c27 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impgraph.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: ka $ $Date: 2000-11-10 15:53:38 $ + * last change: $Author: ka $ $Date: 2001-01-25 15:50:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -403,13 +403,17 @@ void ImpGraphic::ImplClear() aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } - catch( ::com::sun::star::ucb::CommandAbortedException& ) + catch( const ::com::sun::star::ucb::ContentCreationException& ) { - DBG_ERRORFILE( "CommandAbortedException" ); + DBG_ERROR( "ContentCreationException" ); } - catch( ... ) + catch( const ::com::sun::star::uno::RuntimeException& ) { - DBG_ERRORFILE( "Any other exception" ); + DBG_ERROR( "RuntimeException" ); + } + catch( const ::com::sun::star::ucb::CommandAbortedException& ) + { + DBG_ERROR( "CommandAbortedException" ); } delete mpSwapFile; @@ -1039,14 +1043,18 @@ BOOL ImpGraphic::ImplReadEmbedded( SvStream& rIStm, BOOL bSwap ) aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } - catch( ::com::sun::star::ucb::CommandAbortedException& ) + catch( const ::com::sun::star::ucb::ContentCreationException& ) { - DBG_ERRORFILE( "CommandAbortedException" ); + DBG_ERROR( "ContentCreationException" ); } - catch( ... ) + catch( const ::com::sun::star::uno::RuntimeException& ) { - DBG_ERRORFILE( "Any other exception" ); + DBG_ERROR( "RuntimeException" ); } + catch( const ::com::sun::star::ucb::CommandAbortedException& ) + { + DBG_ERROR( "CommandAbortedException" ); + } } } @@ -1220,13 +1228,17 @@ BOOL ImpGraphic::ImplSwapOut() aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } - catch( ::com::sun::star::ucb::CommandAbortedException& ) + catch( const ::com::sun::star::ucb::ContentCreationException& ) { - DBG_ERRORFILE( "CommandAbortedException" ); + DBG_ERROR( "ContentCreationException" ); } - catch( ... ) + catch( const ::com::sun::star::uno::RuntimeException& ) { - DBG_ERRORFILE( "Any other exception" ); + DBG_ERROR( "RuntimeException" ); + } + catch( const ::com::sun::star::ucb::CommandAbortedException& ) + { + DBG_ERROR( "CommandAbortedException" ); } } @@ -1318,13 +1330,17 @@ BOOL ImpGraphic::ImplSwapIn() aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } - catch( ::com::sun::star::ucb::CommandAbortedException& ) + catch( const ::com::sun::star::ucb::ContentCreationException& ) + { + DBG_ERROR( "ContentCreationException" ); + } + catch( const ::com::sun::star::uno::RuntimeException& ) { - DBG_ERRORFILE( "CommandAbortedException" ); + DBG_ERROR( "RuntimeException" ); } - catch( ... ) + catch( const ::com::sun::star::ucb::CommandAbortedException& ) { - DBG_ERRORFILE( "Any other exception" ); + DBG_ERROR( "CommandAbortedException" ); } delete mpSwapFile; |