diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx index 3a175017708e..35a350d26dd8 100644 --- a/vcl/source/gdi/gfxlink.cxx +++ b/vcl/source/gdi/gfxlink.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gfxlink.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:05:37 $ + * last change: $Author: pl $ $Date: 2000-09-21 14:59:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,6 +68,10 @@ #include "gfxlink.hxx" #include "cvtgrf.hxx" +#ifndef _COM_SUN_STAR_UCB_COMMANDABORTEDEXCEPTION_HPP_ +#include +#endif + // ----------- // - GfxLink - // ----------- @@ -101,7 +105,7 @@ GfxLink::GfxLink( const String& rPath, GfxLinkType nType ) aCnt.getPropertyValue( ::rtl::OUString::createFromAscii( "Size" ) ) >>= nFileSize; } - catch( ::com::sun::star::ucb::CommandAbortedException& ) + catch( ::com::sun::star::ucb::CommandAbortedException& rE ) { DBG_ERRORFILE( "CommandAbortedException" ); } @@ -370,7 +374,7 @@ 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( ::com::sun::star::ucb::CommandAbortedException& rE ) { DBG_ERRORFILE( "CommandAbortedException" ); } @@ -399,7 +403,7 @@ ImpSwap::~ImpSwap() aCnt.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), ::com::sun::star::uno::makeAny( sal_Bool( sal_True ) ) ); } - catch( ::com::sun::star::ucb::CommandAbortedException& ) + catch( ::com::sun::star::ucb::CommandAbortedException& rE ) { DBG_ERRORFILE( "CommandAbortedException" ); } diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index a53739ec6041..83c8b9ec9ffe 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impgraph.cxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 17:05:37 $ + * last change: $Author: pl $ $Date: 2000-09-21 14:59:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -105,6 +105,10 @@ #include #endif +#ifndef _COM_SUN_STAR_UCB_COMMANDABORTEDEXCEPTION_HPP_ +#include +#endif + // ----------- // - Defines - // ----------- @@ -396,7 +400,7 @@ 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( ::com::sun::star::ucb::CommandAbortedException& rE ) { DBG_ERRORFILE( "CommandAbortedException" ); } @@ -1030,7 +1034,7 @@ 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( ::com::sun::star::ucb::CommandAbortedException& rE ) { DBG_ERRORFILE( "CommandAbortedException" ); } @@ -1204,7 +1208,7 @@ 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( ::com::sun::star::ucb::CommandAbortedException& rE ) { DBG_ERRORFILE( "CommandAbortedException" ); } @@ -1289,7 +1293,7 @@ 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( ::com::sun::star::ucb::CommandAbortedException& rE ) { DBG_ERRORFILE( "CommandAbortedException" ); }