diff options
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchycontent.cxx | 9 | ||||
-rw-r--r-- | ucb/source/ucp/hierarchy/hierarchycontent.hxx | 10 | ||||
-rw-r--r-- | ucb/source/ucp/package/pkgcontent.cxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/package/pkgcontent.hxx | 10 |
4 files changed, 20 insertions, 15 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 0c9181ad7184..409083592a1e 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -2,9 +2,9 @@ * * $RCSfile: hierarchycontent.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: kso $ $Date: 2001-04-05 09:48:49 $ + * last change: $Author: kso $ $Date: 2001-04-19 14:55:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,9 +92,6 @@ #ifndef _COM_SUN_STAR_UCB_INSERTCOMMANDARGUMENT_HPP_ #include <com/sun/star/ucb/InsertCommandArgument.hpp> #endif -#ifndef _COM_SUN_STAR_UCB_INTERACTIVEBADTRANSFRERURLEXCEPTION_HPP_ -#include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp> -#endif #ifndef _COM_SUN_STAR_UCB_OPENCOMMANDARGUMENT2_HPP_ #include <com/sun/star/ucb/OpenCommandArgument2.hpp> #endif @@ -1452,7 +1449,7 @@ void HierarchyContent::destroy( sal_Bool bDeletePhysical ) void HierarchyContent::transfer( const TransferInfo& rInfo, const Reference< XCommandEnvironment > & xEnv ) - throw( CommandAbortedException ) + throw( CommandAbortedException, InteractiveBadTransferURLException ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index 08cf74fc0b02..9fb80ca8f7a2 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -2,9 +2,9 @@ * * $RCSfile: hierarchycontent.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: kso $ $Date: 2001-03-27 14:08:50 $ + * last change: $Author: kso $ $Date: 2001-04-19 14:55:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,6 +64,9 @@ #include <list> +#ifndef _COM_SUN_STAR_UCB_INTERACTIVEBADTRANSFRERURLEXCEPTION_HPP_ +#include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp> +#endif #ifndef _COM_SUN_STAR_UCB_XCONTENTCREATOR_HPP_ #include <com/sun/star/ucb/XContentCreator.hpp> #endif @@ -216,7 +219,8 @@ private: void transfer( const ::com::sun::star::ucb::TransferInfo& rInfo, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::ucb::CommandAbortedException ); + throw( ::com::sun::star::ucb::CommandAbortedException, + ::com::sun::star::ucb::InteractiveBadTransferURLException ); public: // Create existing content. Fail, if not already exists. diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 83860bcdd0ba..c06789bceb05 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -2,9 +2,9 @@ * * $RCSfile: pkgcontent.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: kso $ $Date: 2001-04-05 09:48:30 $ + * last change: $Author: kso $ $Date: 2001-04-19 14:59:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1369,7 +1369,7 @@ void Content::destroy( sal_Bool bDeletePhysical ) //========================================================================= void Content::transfer( const TransferInfo& rInfo, const Reference< XCommandEnvironment > & xEnv ) - throw( CommandAbortedException ) + throw( CommandAbortedException, InteractiveBadTransferURLException ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx index b41b1da0ab09..414d44c450c6 100644 --- a/ucb/source/ucp/package/pkgcontent.hxx +++ b/ucb/source/ucp/package/pkgcontent.hxx @@ -2,9 +2,9 @@ * * $RCSfile: pkgcontent.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: kso $ $Date: 2001-03-27 14:08:51 $ + * last change: $Author: kso $ $Date: 2001-04-19 14:59:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,6 +67,9 @@ #ifndef _VOS_REF_HXX_ #include <vos/ref.hxx> #endif +#ifndef _COM_SUN_STAR_UCB_INTERACTIVEBADTRANSFRERURLEXCEPTION_HPP_ +#include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp> +#endif #ifndef _COM_SUN_STAR_UCB_XCONTENTCREATOR_HPP_ #include <com/sun/star/ucb/XContentCreator.hpp> #endif @@ -269,7 +272,8 @@ private: void transfer( const ::com::sun::star::ucb::TransferInfo& rInfo, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::ucb::CommandAbortedException ); + throw( ::com::sun::star::ucb::CommandAbortedException, + ::com::sun::star::ucb::InteractiveBadTransferURLException ); ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > getInputStream(); |