summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ucb/source/ucp/webdav-neon/DAVSession.hxx41
-rw-r--r--ucb/source/ucp/webdav-neon/NeonSession.cxx48
-rw-r--r--ucb/source/ucp/webdav-neon/NeonSession.hxx48
3 files changed, 68 insertions, 69 deletions
diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx
index 95ca28f5c42d..4cc0aa7b181f 100644
--- a/ucb/source/ucp/webdav-neon/DAVSession.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx
@@ -34,7 +34,6 @@
#include <rtl/ustring.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
-#include "DAVException.hxx"
#include "DAVProperties.hxx"
#include "DAVResource.hxx"
#include "DAVSessionFactory.hxx"
@@ -80,7 +79,7 @@ public:
virtual void OPTIONS( const OUString & inPath,
DAVCapabilities & outCapabilities,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
// allprop & named
virtual void PROPFIND( const OUString & inPath,
@@ -88,43 +87,43 @@ public:
const std::vector< OUString > & inPropertyNames,
std::vector< DAVResource > & ioResources,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
// propnames
virtual void PROPFIND( const OUString & inPath,
const Depth inDepth,
std::vector< DAVResourceInfo > & ioResInfo,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void PROPPATCH( const OUString & inPath,
const std::vector< ProppatchValue > & inValues,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void HEAD( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
GET( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void GET( const OUString & inPath,
com::sun::star::uno::Reference<
com::sun::star::io::XOutputStream >& o,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
GET( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void
GET( const OUString & inPath,
@@ -132,13 +131,13 @@ public:
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void PUT( const OUString & inPath,
const com::sun::star::uno::Reference<
com::sun::star::io::XInputStream >& s,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
POST( const OUString & inPath,
@@ -147,7 +146,7 @@ public:
const com::sun::star::uno::Reference<
com::sun::star::io::XInputStream > & inInputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) = 0;
+ throw ( std::exception ) = 0;
virtual void POST( const OUString & inPath,
const OUString & rContentType,
@@ -157,46 +156,46 @@ public:
com::sun::star::uno::Reference<
com::sun::star::io::XOutputStream > & oOutputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) = 0;
+ throw ( std::exception ) = 0;
virtual void MKCOL( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void COPY( const OUString & inSource,
const OUString & inDestination,
const DAVRequestEnvironment & rEnv,
sal_Bool inOverwrite = false )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void MOVE( const OUString & inSource,
const OUString & inDestination,
const DAVRequestEnvironment & rEnv,
sal_Bool inOverwrite = false )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
virtual void DESTROY( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
// set new lock.
virtual void LOCK( const OUString & inPath,
com::sun::star::ucb::Lock & inLock,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) = 0;
+ throw ( std::exception ) = 0;
// refresh existing lock.
virtual sal_Int64 LOCK( const OUString & inPath,
sal_Int64 nTimeout,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) = 0;
+ throw ( std::exception ) = 0;
virtual void UNLOCK( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) = 0;
+ throw ( std::exception ) = 0;
virtual void abort()
- throw( DAVException ) = 0;
+ throw( std::exception ) = 0;
protected:
rtl::Reference< DAVSessionFactory > m_xFactory;
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx
index 42f476d32621..e481d6a40cb5 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx
@@ -589,7 +589,7 @@ NeonSession::NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFa
const OUString& inUri,
const uno::Sequence< beans::NamedValue >& rFlags,
const ucbhelper::InternetProxyDecider & rProxyDecider )
- throw ( DAVException )
+ throw ( std::exception )
: DAVSession( rSessionFactory )
, m_nProxyPort( 0 )
, m_aFlags( rFlags )
@@ -617,7 +617,7 @@ NeonSession::~NeonSession( )
}
void NeonSession::Init( const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
m_aEnv = rEnv;
@@ -625,7 +625,7 @@ void NeonSession::Init( const DAVRequestEnvironment & rEnv )
}
void NeonSession::Init()
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -826,7 +826,7 @@ sal_Bool NeonSession::UsesProxy()
void NeonSession::OPTIONS( const OUString & inPath,
DAVCapabilities & outCapabilities,
const DAVRequestEnvironment & rEnv )
- throw( DAVException )
+ throw( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -852,7 +852,7 @@ void NeonSession::PROPFIND( const OUString & inPath,
const std::vector< OUString > & inPropNames,
std::vector< DAVResource > & ioResources,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -874,7 +874,7 @@ void NeonSession::PROPFIND( const OUString & inPath,
const Depth inDepth,
std::vector< DAVResourceInfo > & ioResInfo,
const DAVRequestEnvironment & rEnv )
- throw( DAVException )
+ throw( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -894,7 +894,7 @@ void NeonSession::PROPFIND( const OUString & inPath,
void NeonSession::PROPPATCH( const OUString & inPath,
const std::vector< ProppatchValue > & inValues,
const DAVRequestEnvironment & rEnv )
- throw( DAVException )
+ throw( std::exception )
{
/* @@@ Which standard live properties can be set by the client?
This is a known WebDAV RFC issue ( verified: 04/10/2001 )
@@ -1023,7 +1023,7 @@ void NeonSession::HEAD( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw( DAVException )
+ throw( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1042,7 +1042,7 @@ void NeonSession::HEAD( const OUString & inPath,
uno::Reference< io::XInputStream >
NeonSession::GET( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1065,7 +1065,7 @@ NeonSession::GET( const OUString & inPath,
void NeonSession::GET( const OUString & inPath,
uno::Reference< io::XOutputStream > & ioOutputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1087,7 +1087,7 @@ NeonSession::GET( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1115,7 +1115,7 @@ void NeonSession::GET( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1138,7 +1138,7 @@ void NeonSession::GET( const OUString & inPath,
void NeonSession::PUT( const OUString & inPath,
const uno::Reference< io::XInputStream > & inInputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1164,7 +1164,7 @@ NeonSession::POST( const OUString & inPath,
const OUString & rReferer,
const uno::Reference< io::XInputStream > & inInputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1197,7 +1197,7 @@ void NeonSession::POST( const OUString & inPath,
const uno::Reference< io::XInputStream > & inInputStream,
uno::Reference< io::XOutputStream > & oOutputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1223,7 +1223,7 @@ void NeonSession::POST( const OUString & inPath,
void NeonSession::MKCOL( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1240,7 +1240,7 @@ void NeonSession::COPY( const OUString & inSourceURL,
const OUString & inDestinationURL,
const DAVRequestEnvironment & rEnv,
sal_Bool inOverWrite )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1266,7 +1266,7 @@ void NeonSession::MOVE( const OUString & inSourceURL,
const OUString & inDestinationURL,
const DAVRequestEnvironment & rEnv,
sal_Bool inOverWrite )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1288,7 +1288,7 @@ void NeonSession::MOVE( const OUString & inSourceURL,
void NeonSession::DESTROY( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1334,7 +1334,7 @@ namespace
void NeonSession::LOCK( const OUString & inPath,
ucb::Lock & rLock,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1427,7 +1427,7 @@ void NeonSession::LOCK( const OUString & inPath,
sal_Int64 NeonSession::LOCK( const OUString & inPath,
sal_Int64 nTimeout,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1493,7 +1493,7 @@ bool NeonSession::LOCK( NeonLock * pLock,
void NeonSession::UNLOCK( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1545,7 +1545,7 @@ bool NeonSession::UNLOCK( NeonLock * pLock )
}
void NeonSession::abort()
- throw ( DAVException )
+ throw ( std::exception )
{
SAL_INFO("ucb.ucp.webdav", "neon commands cannot be aborted");
}
@@ -1654,7 +1654,7 @@ bool NeonSession::removeExpiredLocktoken( const OUString & inURL,
void NeonSession::HandleError( int nError,
const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException )
+ throw ( std::exception )
{
m_aEnv = DAVRequestEnvironment();
diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx
index 905b002b4a04..9d9fc0f5eda0 100644
--- a/ucb/source/ucp/webdav-neon/NeonSession.hxx
+++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx
@@ -75,7 +75,7 @@ public:
const OUString& inUri,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags,
const ucbhelper::InternetProxyDecider & rProxyDecider )
- throw ( DAVException );
+ throw ( std::exception );
// DAVSession methods
virtual sal_Bool CanUse( const OUString & inPath,
@@ -90,7 +90,7 @@ public:
OPTIONS( const OUString & inPath,
DAVCapabilities & outCapabilities,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
// allprop & named
virtual void
@@ -99,7 +99,7 @@ public:
const std::vector< OUString > & inPropNames,
std::vector< DAVResource > & ioResources,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
// propnames
virtual void
@@ -107,39 +107,39 @@ public:
const Depth inDepth,
std::vector< DAVResourceInfo >& ioResInfo,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
PROPPATCH( const OUString & inPath,
const std::vector< ProppatchValue > & inValues,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
HEAD( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
GET( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
GET( const OUString & inPath,
com::sun::star::uno::Reference<
com::sun::star::io::XOutputStream > & ioOutputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
GET( const OUString & inPath,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
GET( const OUString & inPath,
@@ -148,14 +148,14 @@ public:
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
PUT( const OUString & inPath,
const com::sun::star::uno::Reference<
com::sun::star::io::XInputStream > & inInputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream >
POST( const OUString & inPath,
@@ -164,7 +164,7 @@ public:
const com::sun::star::uno::Reference<
com::sun::star::io::XInputStream > & inInputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
POST( const OUString & inPath,
@@ -175,50 +175,50 @@ public:
com::sun::star::uno::Reference<
com::sun::star::io::XOutputStream > & oOutputStream,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
MKCOL( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
COPY( const OUString & inSourceURL,
const OUString & inDestinationURL,
const DAVRequestEnvironment & rEnv,
sal_Bool inOverWrite )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void
MOVE( const OUString & inSourceURL,
const OUString & inDestinationURL,
const DAVRequestEnvironment & rEnv,
sal_Bool inOverWrite )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void DESTROY( const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
// set new lock.
virtual void LOCK( const OUString & inURL,
com::sun::star::ucb::Lock & inLock,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
// refresh existing lock.
virtual sal_Int64 LOCK( const OUString & inURL,
sal_Int64 nTimeout,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
virtual void UNLOCK( const OUString & inURL,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
// helpers
virtual void abort()
- throw ( DAVException ) SAL_OVERRIDE;
+ throw ( std::exception ) SAL_OVERRIDE;
const OUString & getHostName() const { return m_aHostName; }
@@ -233,16 +233,16 @@ private:
friend class NeonLockStore;
void Init( void )
- throw ( DAVException );
+ throw ( std::exception );
void Init( const DAVRequestEnvironment & rEnv )
- throw ( DAVException );
+ throw ( std::exception );
// ret: true => retry request.
void HandleError( int nError,
const OUString & inPath,
const DAVRequestEnvironment & rEnv )
- throw ( DAVException );
+ throw ( std::exception );
const ucbhelper::InternetProxyServer & getProxySettings() const;